This commit was manufactured by cvs2svn to create tag 'R1_0_2'.
diff --git a/features/org.eclipse.jst.server_adapters.feature/feature.xml b/features/org.eclipse.jst.server_adapters.feature/feature.xml
index eaf8f63..465d24e 100644
--- a/features/org.eclipse.jst.server_adapters.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.feature/feature.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jst.server_adapters.feature"
- label="org.eclipse.jst.server_adapters.feature"
- version="1.0.100.qualifier">
+ label="JST Server Adapter Feature"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
<description>
%description
@@ -11,10 +12,15 @@
<license url="license.html">
%license
</license>
+
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
<requires>
- <import feature="org.eclipse.jst.server_core.feature" version="1.0.0" match="equivalent"/>
- <import feature="org.eclipse.jst.server_ui.feature" version="1.0.0" match="equivalent"/>
+ <import feature="org.eclipse.jst.server_core.feature" version="1.0.2" match="equivalent"/>
+ <import feature="org.eclipse.jst.server_ui.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/eclipse_update_120.jpg
index 17bb8e3..bfdf708 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
index 72bf2c0..f8de7b2 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
@@ -1,24 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- primary="false"
- label="org.eclipse.jst.server_adapters.feature.source"
- id="org.eclipse.jst.server_adapters.feature.source"
- version="1.0.0">
- <description>
- %description
- </description>
- <copyright url="http://www.example.com/copyright">
- %copyright
- </copyright>
- <license url="license.html">%license</license>
-
- <includes
+ id="org.eclipse.jst.server_adapters.feature.source"
+ label="JST Server Adapter Feature Source"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="license.html">
+ %license
+ </license>
+
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
+ <includes
id="org.eclipse.jst.server_ui.feature.source"
version="0.0.0"/>
- <plugin
+
+ <plugin
id="org.eclipse.jst.server_adapters.feature.source"
download-size="0"
install-size="0"
- version="0.0.0"/>
-
+ version="0.0.0"/>
+
</feature>
diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/about.properties
index 88a06c5..3d46de4 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
#
# Do not translate any values surrounded by {}
-blurb=Web Standard Tools SDK\n\
+blurb=J2EE Standard Tools - Server Adapters\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/eclipse32.gif
index 0282f5d..e6ad7cc 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/eclipse32.gif
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/plugin.properties
index 0e83dbb..798a828 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName=Web Standard Tools SDK - WST XML Component
+pluginName=J2EE Standard Tools - Server Adapters Source
providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml
index 3e25db5..827dbed 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jst.server_core.feature"
- label="org.eclipse.jst.server_core.feature"
- version="1.0.100.qualifier">
+ label="JST Server Core Feature"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
<description>
%description
@@ -12,12 +13,17 @@
%license
</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
<requires>
- <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
- <import feature="org.eclipse.rcp" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.jdt" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.wst.server_core.feature" version="1.0.0" match="equivalent"/>
+ <import feature="org.eclipse.platform" version="3.1.2" match="equivalent"/>
+ <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
+ <import feature="org.eclipse.rcp" version="3.1.2" match="equivalent"/>
+ <import feature="org.eclipse.jdt" version="3.1.2" match="equivalent"/>
+ <import feature="org.eclipse.wst.server_core.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
index 17bb8e3..bfdf708 100644
--- a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml
new file mode 100644
index 0000000..53c7369
--- /dev/null
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.jst.server_core.feature.source"
+ label="JST Server Core Feature Source"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="license.html">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.jst.server_core.feature.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/about.properties
index 88a06c5..428fa37 100644
--- a/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
#
# Do not translate any values surrounded by {}
-blurb=Web Standard Tools SDK\n\
+blurb=J2EE Standard Tools - Server Core\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/eclipse32.gif
index 0282f5d..e6ad7cc 100644
--- a/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/plugin.properties
index 165af04..73826cd 100644
--- a/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName=Web Standard Tools SDK - Common Component
+pluginName=J2EE Standard Tools - Server Core Source
providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.server_sdk.feature/feature.xml b/features/org.eclipse.jst.server_sdk.feature/feature.xml
index f06c59f..80d5e91 100644
--- a/features/org.eclipse.jst.server_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.server_sdk.feature/feature.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jst.server_sdk.feature"
- label="org.eclipse.jst.server_sdk.feature"
- version="1.0.100.qualifier">
+ label="JST Server Feature SDK"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
<description>
%description
@@ -12,6 +13,11 @@
%license
</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
<includes
id="org.eclipse.jst.server_adapters.feature.source"
version="0.0.0"/>
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml
index d0b9fac..9194563 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jst.server_ui.feature"
- label="org.eclipse.jst.server_ui.feature"
- version="1.0.100.qualifier">
+ label="JST Server UI Feature"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
<description>
%description
@@ -11,13 +12,18 @@
<license url="license.html">
%license
</license>
+
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
<includes
id="org.eclipse.jst.server_userdoc.feature"
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.jst.server_core.feature" version="1.0.0"/>
+ <import feature="org.eclipse.jst.server_core.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
index 17bb8e3..bfdf708 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
index c346cce..64adbe8 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
@@ -1,24 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- primary="false"
- label="org.eclipse.jst.server_ui.feature.source"
- id="org.eclipse.jst.server_ui.feature.source"
- version="1.0.0">
- <description>
- %description
- </description>
- <copyright url="http://www.example.com/copyright">
- %copyright
- </copyright>
- <license url="license.html">%license</license>
-
- <includes
+ id="org.eclipse.jst.server_ui.feature.source"
+ label="JST Server UI Feature"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="license.html">
+ %license
+ </license>
+
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
+ <includes
id="org.eclipse.jst.server_core.feature.source"
version="0.0.0"/>
- <plugin
+
+ <plugin
id="org.eclipse.jst.server_ui.feature.source"
download-size="0"
install-size="0"
- version="0.0.0"/>
-
+ version="0.0.0"/>
+
</feature>
diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/about.properties
index 88a06c5..21bfc9d 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
#
# Do not translate any values surrounded by {}
-blurb=Web Standard Tools SDK\n\
+blurb=J2EE Standard Tools - Server UI\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
index 0282f5d..e6ad7cc 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/plugin.properties
index 0e83dbb..4218828 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName=Web Standard Tools SDK - WST XML Component
+pluginName=J2EE Standard Tools - Server UI Source
providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.server_userdoc.feature/feature.xml b/features/org.eclipse.jst.server_userdoc.feature/feature.xml
index 6bdd01e..7bed6fd 100644
--- a/features/org.eclipse.jst.server_userdoc.feature/feature.xml
+++ b/features/org.eclipse.jst.server_userdoc.feature/feature.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jst.server_userdoc.feature"
- label="org.eclipse.jst.server_userdoc.feature"
- version="1.0.100.qualifier">
+ label="JST Server Feature User Documentation"
+ version="1.0.2.qualifier"
+ provider-name="Eclipse.org">
<description>
%description
@@ -11,6 +12,11 @@
<license url="license.html">
%license
</license>
+
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
<plugin
id="org.eclipse.jst.server.ui.doc.user"
diff --git a/features/org.eclipse.wst.server_core.feature/feature.xml b/features/org.eclipse.wst.server_core.feature/feature.xml
index 326454e..a115958 100644
--- a/features/org.eclipse.wst.server_core.feature/feature.xml
+++ b/features/org.eclipse.wst.server_core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature"
label="org.eclipse.wst.server_core.feature"
- version="1.0.100.qualifier">
+ version="1.0.2.qualifier">
<description>
%description
@@ -11,10 +11,13 @@
<license url="license.html">
%license
</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
<requires>
- <import feature="org.eclipse.rcp" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
+ <import feature="org.eclipse.rcp" version="3.1.1" match="equivalent"/>
+ <import feature="org.eclipse.platform" version="3.1.1" match="equivalent"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
index 17bb8e3..bfdf708 100644
--- a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml
new file mode 100644
index 0000000..2bfb349
--- /dev/null
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.wst.server_core.feature.source"
+ label="%featureName"
+ version="1.0.2.qualifier"
+ provider-name="%providerName">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="license.html">
+ %license
+ </license>
+
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
+
+ <plugin
+ id="org.eclipse.wst.server_core.feature.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/about.properties
index 88a06c5..748125f 100644
--- a/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
#
# Do not translate any values surrounded by {}
-blurb=Web Standard Tools SDK\n\
+blurb=Web Standard Tools - Server Core\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/eclipse32.gif
index 0282f5d..e6ad7cc 100644
--- a/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/plugin.properties
index 165af04..9e27359 100644
--- a/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName=Web Standard Tools SDK - Common Component
+pluginName=Web Standard Tools - Server Core Source
providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.server_sdk.feature/feature.xml b/features/org.eclipse.wst.server_sdk.feature/feature.xml
index c687495..16e77f8 100644
--- a/features/org.eclipse.wst.server_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.server_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_sdk.feature"
label="org.eclipse.wst.server_sdk.feature"
- version="1.0.100.qualifier">
+ version="1.0.2.qualifier">
<description>
%description
@@ -12,6 +12,11 @@
%license
</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
<includes
id="org.eclipse.wst.server_ui.feature.source"
version="0.0.0"/>
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml
index 20faa51..25c8759 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -1,8 +1,8 @@
<?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.100.qualifier">
+ label="WST Server UI Feature"
+ version="1.0.2.qualifier">
<description>
%description
@@ -12,12 +12,17 @@
%license
</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
+
<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" match="equivalent"/>
+ <import feature="org.eclipse.wst.server_core.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
index 17bb8e3..bfdf708 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
index 1d7bb40..309082f 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
primary="false"
- label="org.eclipse.wst.server_ui.feature.source"
+ label="Source for WST Server UI Feature"
id="org.eclipse.wst.server_ui.feature.source"
- version="1.0.0">
+ version="1.0.2.qualifier">
<description>
%description
</description>
- <copyright url="http://www.example.com/copyright">
+ <copyright>
%copyright
</copyright>
<license url="license.html">%license</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
<includes
id="org.eclipse.wst.server_core.feature.source"
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.properties
index 88a06c5..6a0782b 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
#
# Do not translate any values surrounded by {}
-blurb=Web Standard Tools SDK\n\
+blurb=Web Standard Tools - Server UI\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
index 0282f5d..e6ad7cc 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/plugin.properties
index 3a79c8a..f82b59a 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName=Web Standard Tools SDK - WST Server Component
+pluginName=Web Standard Tools - Server UI Source
providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.server_userdoc.feature/feature.xml b/features/org.eclipse.wst.server_userdoc.feature/feature.xml
index ad60c4c..b9b6786 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.server_userdoc.feature/feature.xml
@@ -1,8 +1,8 @@
<?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.100.qualifier">
+ label="User Documentation for WST Server Feature"
+ version="1.0.2.qualifier">
<description>
%description
@@ -11,6 +11,9 @@
<license url="license.html">
%license
</license>
+ <url>
+ <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
<plugin
id="org.eclipse.wst.server.ui.doc.user"
diff --git a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
index d7fd706..4ea4481 100644
--- a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.core.internal.JavaServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.cvsignore b/plugins/org.eclipse.jst.server.generic.modules/.cvsignore
deleted file mode 100644
index 42654c1..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-commonmodules.jar
-org.eclipse.jst.server.generic.modules_1.0.0.jar
-temp.folder
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.project b/plugins/org.eclipse.jst.server.generic.modules/.project
deleted file mode 100644
index af14ba8..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.project
+++ /dev/null
@@ -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>
diff --git a/plugins/org.eclipse.jst.server.pde/.classpath b/plugins/org.eclipse.jst.server.pde/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.jst.server.pde/.classpath
+++ /dev/null
@@ -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>
diff --git a/plugins/org.eclipse.jst.server.pde/.cvsignore b/plugins/org.eclipse.jst.server.pde/.cvsignore
deleted file mode 100644
index ddb0a2d..0000000
--- a/plugins/org.eclipse.jst.server.pde/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.settings
diff --git a/plugins/org.eclipse.jst.server.pde/.project b/plugins/org.eclipse.jst.server.pde/.project
deleted file mode 100644
index 7a788cc..0000000
--- a/plugins/org.eclipse.jst.server.pde/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.pde</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>
diff --git a/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
deleted file mode 100644
index 26945f9..0000000
--- a/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Generic server PDE Template
-Bundle-SymbolicName: org.eclipse.jst.server.generic.pde; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.server.generic.pde.ServerPdePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.pde.ui,
- org.eclipse.pde.core
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.server.pde/about.html b/plugins/org.eclipse.jst.server.pde/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.server.pde/about.html
+++ /dev/null
@@ -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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.pde/build.properties b/plugins/org.eclipse.jst.server.pde/build.properties
deleted file mode 100644
index 1393183..0000000
--- a/plugins/org.eclipse.jst.server.pde/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: Gorkem Ercan - initial API and implementation
-#
-###################################################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- templates_3.0/,\
- icons/,\
- plugin.properties,\
- about.html
-src.includes = src/
diff --git a/plugins/org.eclipse.jst.server.pde/build.xml b/plugins/org.eclipse.jst.server.pde/build.xml
deleted file mode 100644
index c17f101..0000000
--- a/plugins/org.eclipse.jst.server.pde/build.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.jst.server.generic.pde" default="build.jars" basedir=".">
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <!-- Compiler settings. -->
- <property name="javacFailOnError" value="false"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="true"/>
- <property name="javacSource" value="1.3"/>
- <property name="javacTarget" value="1.2"/>
- <property name="compilerArg" value=""/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
-
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.jst.server.generic.pde">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
- </target>
-
- <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jst.server.generic.pde for an update site.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <zip destfile="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.jar" basedir="${temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" filesonly="false" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.jst.server.generic.pde @dot.">
- <delete dir="${temp.folder}/@dot.bin"/>
- <mkdir dir="${temp.folder}/@dot.bin"/>
- <!-- compile the source code -->
- <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}" >
- <compilerarg line="${compilerArg}"/>
- <classpath>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.runtime_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.osgi_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.help_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.swt_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jface_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.commands_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.workbench_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/@dot"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.expressions_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.resources_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.resources.win32_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.configurator_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ant.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.variables_3.1.0.jar"/>
- <pathelement path="../org.eclipse.pde.ui/eclipse3/target-0.7/eclipse/plugins/org.eclipse.pde.ui_3.1.0.jar"/>
- <pathelement path="../org.eclipse.pde.ui/org.eclipse.pde.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.ide_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.win32_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.views_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.core.win32_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.forms_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jface.text_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.text_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.editors_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.filebuffers_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.debug.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.debug.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.console_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.team.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.debug.ui_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.debug_3.1.0/jdi.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.debug_3.1.0/jdimodel.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.debug_3.1.0/tools.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.launching_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.search_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.compare_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ltk.core.refactoring_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ltk.ui.refactoring_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.pde_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.pde.core_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.pde.build_3.1.0/pdebuild.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-antlr.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-bcel.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-bsf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-log4j.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-oro.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-regexp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-resolver.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-commons-logging.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-commons-net.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-icontract.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jai.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-javamail.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jdepend.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jsch.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-junit.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-launcher.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-netrexx.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-nodeps.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-starteam.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-stylebook.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-swing.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-trax.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-vaj.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-weblogic.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-xalan1.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-xslp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-antlr.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-bcel.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-bsf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-log4j.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-oro.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-regexp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-resolver.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-commons-logging.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-commons-net.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-icontract.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jai.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-javamail.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jdepend.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jmf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jsch.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-junit.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-launcher.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-netrexx.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-nodeps.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-starteam.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-stylebook.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-swing.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-trax.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-vaj.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-weblogic.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-xalan1.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-xslp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/@dot"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.junit_3.8.1/junit.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ant.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.externaltools_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.junit_3.1.0/junitsupport.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.junit.runtime_3.1.0/junitruntime.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.intro_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.cheatsheets_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.help.base_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.lucene_1.4.3/lucene-1.4.3.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.lucene_1.4.3/parser.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.help.appserver_3.1.0.jar"/>
- </classpath>
- <src path="src/" />
- </javac>
- <!-- Copy necessary resources -->
- <copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*,null" />
- </copy>
- <mkdir dir="${build.result.folder}"/>
- <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
- <fileset dir="${temp.folder}/@dot.bin" />
- </copy>
- <delete dir="${temp.folder}/@dot.bin"/>
- </target>
-
- <target name="src.zip" depends="init" unless="src.zip">
- <mkdir dir="${build.result.folder}"/>
- <zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
- <fileset dir="src/" includes="**/*.java" />
- </zip>
- </target>
-
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jst.server.generic.pde.">
- <available property="@dot" file="${build.result.folder}/@dot"/>
- <antcall target="@dot"/>
- </target>
-
- <target name="build.sources" depends="init">
- <available property="src.zip" file="${build.result.folder}/src.zip"/>
- <antcall target="src.zip"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0"/>
- <copy todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}/@dot" includes="**" />
- </copy>
- <copy todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="META-INF/,null,plugin.xml,templates_3.0/,icons/,plugin.properties,build.properties" />
- </copy>
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0"/>
- <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="false" overwrite="false"/>
- <copy todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="false" overwrite="false">
- <fileset dir="${basedir}" includes="src/" />
- </copy>
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0"/>
- <copy file="${temp.folder}/@dot.bin.log" todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="false" overwrite="false"/>
- </target>
-
- <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jst.server.generic.pde of all the zips, jars and logs created.">
- <delete dir="${build.result.folder}/@dot"/>
- <delete file="${build.result.folder}/src.zip"/>
- <delete file="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.jar"/>
- <delete file="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.zip"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
- <eclipse.convertPath fileSystemPath="D:/_bge/workspaces/workspace/org.eclipse.jst.server.generic.pde" property="resourcePath"/>
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
- </target>
-
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jst.server.generic.pde.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="build.sources"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
- </delete>
- <zip destfile="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-</project>
diff --git a/plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif b/plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
deleted file mode 100644
index 1cfd11a..0000000
--- a/plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.pde/plugin.properties b/plugins/org.eclipse.jst.server.pde/plugin.properties
deleted file mode 100644
index 4959a56..0000000
--- a/plugins/org.eclipse.jst.server.pde/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: Gorkem Ercan - initial API and implementation
-#
-###################################################################################################
-pluginName= Generic server PDE Template
-providerName=Eclipse.org
-template.genericServer.name=Generic Server Plugin Wizard
-template.genericServer.description=\
-<p>This wizard creates a simple generic server plug-in. \
-The .serverdef file and the build.xml file for ANT based publishing are created. \
-Created files are the same files used for JBoss 3.2.3 in Generic Examples. \
-</p>\
-<p><b>Extension Used</b></p>\
-<li>org.eclipse.jst.server.generic.core.serverdefinition</li> \
-<li>org.eclipse.wst.server.core.runtimeTargetHandlers</li> \
-<li>org.eclipse.wst.server.ui.serverImages</li> \
-<li>org.eclipse.wst.server.ui.wizardFragments</li> \
-<li>org.eclipse.wst.server.core.serverTypes</li> \
-<li>org.eclipse.wst.server.core.runtimeTypes</li>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.pde/plugin.xml b/plugins/org.eclipse.jst.server.pde/plugin.xml
deleted file mode 100644
index bd18a48..0000000
--- a/plugins/org.eclipse.jst.server.pde/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.pde.ui.pluginContent">
- <wizard
- category="WTP"
- class="org.eclipse.jst.server.generic.pde.internal.GenericServerPluginNewWizard"
- icon="icons/obj16/wiz_new_server_plugin.gif"
- id="org.eclipse.jst.server.generic.pde.genericServer"
- java="true"
- name="%template.genericServer.name"
- rcp="false"
- ui-content="true">
- <description>
- %template.genericServer.description
- </description>
-
- </wizard>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
deleted file mode 100644
index c1d8770..0000000
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ServerPdePlugin extends AbstractUIPlugin {
-
- //The shared instance.
- private static ServerPdePlugin plugin;
-
- /**
- * The constructor.
- */
- public ServerPdePlugin() {
- plugin = this;
- }
-
- /**
- * 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);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static ServerPdePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.jst.server.generic.pde", path);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
deleted file mode 100644
index 0cda4ac..0000000
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde.internal;
-
-
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-/**
- * New Generic server plug-in wizard.
- * @author Gorkem Ercan
- *
- */
-public class GenericServerPluginNewWizard extends NewPluginTemplateWizard {
-
- public ITemplateSection[] createTemplateSections(){
- return new ITemplateSection[] {new GenericServerTemplate()};
- }
-
- public void init(IFieldData data) {
- super.init(data);
- setWindowTitle(Messages.windowTitleWizard);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
deleted file mode 100644
index 922ac38..0000000
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde.internal;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.server.generic.pde.ServerPdePlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelFactory;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.wizards.templates.PluginReference;
-import org.eclipse.pde.ui.templates.OptionTemplateSection;
-import org.eclipse.pde.ui.templates.TemplateOption;
-/**
- * Simple generic server plug-in template
- *
- * @author Gorkem Ercan
- *
- */
-public class GenericServerTemplate extends OptionTemplateSection {
-
- private static final String KEY_SERVER_VERSION = "server_version"; //$NON-NLS-1$
- private static final String KEY_SERVER_START_BEFORE_PUBLISH = "server_start_before_publish"; //$NON-NLS-1$
- private static final String KEY_SERVER_LAUNCHTYPE = "server_launchtype"; //$NON-NLS-1$
- private static final String KEY_SERVER_VENDOR = "server_vendor"; //$NON-NLS-1$
- private static final String KEY_SERVER_DESCRIPTION = "server_description"; //$NON-NLS-1$
- private static final String KEY_SERVER_NAME = "server_name"; //$NON-NLS-1$
- private static final String[][] launchOpts = {{"java",Messages.labelJavaLaunchConfiguration},{"external",Messages.labelExternalLaunchConfiguration}}; //$NON-NLS-1$ //$NON-NLS-3$
-
- private TemplateOption fServerNameOption;
- private TemplateOption fServerDescriptionOption;
- private TemplateOption fServerVendorOption;
- private TemplateOption fServerVersionOption;
- private TemplateOption fLaunchTypeOption;
- private TemplateOption fStartBeforPublishOption;
-
- public GenericServerTemplate() {
- setPageCount(1);
- createOptions();
- }
-
-
- private void createOptions(){
-
- fServerNameOption= addOption(KEY_SERVER_NAME,Messages.labelServerName,"your server's name",0); //$NON-NLS-2$
- fServerDescriptionOption = addOption(KEY_SERVER_DESCRIPTION,"Description","User description of your server",0); //$NON-NLS-1$ //$NON-NLS-2$
- fServerVendorOption= addOption(KEY_SERVER_VENDOR,Messages.labelServerVendor,"Server vendor' s name",0); //$NON-NLS-2$
- fServerVersionOption= addOption(KEY_SERVER_VERSION,Messages.labelServerVesion,"0",0); //$NON-NLS-2$
- fLaunchTypeOption= addOption(KEY_SERVER_LAUNCHTYPE,Messages.labelLaunchType,launchOpts,"java",0); //$NON-NLS-2$
- fStartBeforPublishOption= addOption(KEY_SERVER_START_BEFORE_PUBLISH,Messages.labelStartBeforePublish,false,0);
-
- fServerNameOption.setRequired(true);
- fServerDescriptionOption.setRequired(true);
- fServerVendorOption.setRequired(true);
- fServerVersionOption.setRequired(true);
- }
-
- public String getSectionId() {
- return "genericserver"; //$NON-NLS-1$
- }
-
- protected void updateModel(IProgressMonitor monitor) throws CoreException{
- IPluginBase plugin = model.getPluginBase();
- IPluginModelFactory factory = model.getPluginFactory();
- addRuntimeType(plugin, factory);
- addServerType(plugin, factory);
- addWizardFragment(plugin, factory);
- addServerImage(plugin, factory);
- addRuntimeTargetHandler(plugin, factory);
- addServerDefinition(plugin, factory);
- }
-
- private void addServerDefinition(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension definitionExtension = createExtension("org.eclipse.jst.server.generic.core.serverdefinition",true); //$NON-NLS-1$
- IPluginElement serverDef = factory.createElement(definitionExtension);
- serverDef.setName("serverdefinition"); //$NON-NLS-1$
- serverDef.setAttribute("id",getRuntimeId()); //$NON-NLS-1$
- serverDef.setAttribute("definitionfile","/servers/"+getStringOption(KEY_SERVER_NAME)+".serverdef"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- definitionExtension.add(serverDef);
- if(!definitionExtension.isInTheModel())
- plugin.add(definitionExtension);
- }
-
-
- private void addRuntimeTargetHandler(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension handlerExtension = createExtension("org.eclipse.wst.server.core.runtimeTargetHandlers",true); //$NON-NLS-1$
- IPluginElement handler= factory.createElement(handlerExtension);
- handler.setName("runtimeTargetHandler"); //$NON-NLS-1$
- handler.setAttribute("id",getNamespace()+".runtimeTarget"); //$NON-NLS-1$ //$NON-NLS-2$
- handler.setAttribute("runtimeTypeIds",getRuntimeId()); //$NON-NLS-1$
- handler.setAttribute("class","org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler"); //$NON-NLS-1$ //$NON-NLS-2$
- handlerExtension.add(handler);
- if(!handlerExtension.isInTheModel())
- plugin.add(handlerExtension);
- }
-
-
- private void addServerImage(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension imageExtension = createExtension("org.eclipse.wst.server.ui.serverImages",true); //$NON-NLS-1$
- IPluginElement serverImage = factory.createElement(imageExtension);
- serverImage.setName("image"); //$NON-NLS-1$
- serverImage.setAttribute("id",getNamespace()+".serverImage"); //$NON-NLS-1$ //$NON-NLS-2$
- serverImage.setAttribute("icon","icons/server.gif"); //$NON-NLS-1$ //$NON-NLS-2$
- serverImage.setAttribute("typeIds",getServerId()); //$NON-NLS-1$
- imageExtension.add(serverImage);
-
- IPluginElement runtimeImage = factory.createElement(imageExtension);
- runtimeImage.setName("image"); //$NON-NLS-1$
- runtimeImage.setAttribute("id",getNamespace()+".runtimeImage"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeImage.setAttribute("icon","icons/server.gif"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeImage.setAttribute("typeIds",getRuntimeId()); //$NON-NLS-1$
- imageExtension.add(runtimeImage);
- if(!imageExtension.isInTheModel())
- plugin.add(imageExtension);
- }
-
-
- private void addWizardFragment(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension wizardExtension = createExtension("org.eclipse.wst.server.ui.wizardFragments",true); //$NON-NLS-1$
- IPluginElement runtimeWiz = factory.createElement(wizardExtension);
- runtimeWiz.setName("fragment"); //$NON-NLS-1$
- runtimeWiz.setAttribute("id",getNamespace()+".runtimeWizard"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeWiz.setAttribute("class","org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeWiz.setAttribute("typeIds",getRuntimeId()); //$NON-NLS-1$
- wizardExtension.add(runtimeWiz);
- if(!wizardExtension.isInTheModel())
- plugin.add(wizardExtension);
-
- IPluginElement serverWiz = factory.createElement(wizardExtension);
- serverWiz.setName("fragment"); //$NON-NLS-1$
- serverWiz.setAttribute("id",getNamespace()+".serverWizard"); //$NON-NLS-1$ //$NON-NLS-2$
- serverWiz.setAttribute("class","org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"); //$NON-NLS-1$ //$NON-NLS-2$
- serverWiz.setAttribute("typeIds",getServerId()); //$NON-NLS-1$
- wizardExtension.add(serverWiz);
- }
-
-
- private void addServerType(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension serverExtension =createExtension("org.eclipse.wst.server.core.serverTypes",true); //$NON-NLS-1$
- IPluginElement serverType = factory.createElement(serverExtension);
- serverType.setName("serverType"); //$NON-NLS-1$
- serverType.setAttribute("runtime","true"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("class","org.eclipse.jst.server.generic.core.internal.GenericServer"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("id",getServerId()); //$NON-NLS-1$
- serverType.setAttribute("initialState","stopped"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("supportsRemoteHosts","false"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("runtimeTypeId",getRuntimeId()); //$NON-NLS-1$
- serverType.setAttribute("description",getStringOption(KEY_SERVER_DESCRIPTION)); //$NON-NLS-1$
- serverType.setAttribute("launchConfigId",getSelectedConfigType()); //$NON-NLS-1$
- serverType.setAttribute("behaviourClass",getSelectedBehaviourClass()); //$NON-NLS-1$
- serverType.setAttribute("name",getStringOption(KEY_SERVER_NAME)); //$NON-NLS-1$
- serverType.setAttribute("startTimeout","75000"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("stopTimeout","30000"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("hasConfiguration","false"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("launchModes","run,debug"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("startBeforePublish", Boolean.toString(getBooleanOption(KEY_SERVER_START_BEFORE_PUBLISH))); //$NON-NLS-1$
- serverExtension.add(serverType);
- if(!serverExtension.isInTheModel())
- plugin.add(serverExtension);
- }
-
-
- private void addRuntimeType(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension extension =createExtension("org.eclipse.wst.server.core.runtimeTypes",true); //$NON-NLS-1$
- IPluginElement runtimeType = factory.createElement(extension);
- runtimeType.setName("runtimeType"); //$NON-NLS-1$
- runtimeType.setAttribute("id",getRuntimeId()); //$NON-NLS-1$
- runtimeType.setAttribute("name",getStringOption(KEY_SERVER_NAME)); //$NON-NLS-1$
- runtimeType.setAttribute("description",getStringOption(KEY_SERVER_DESCRIPTION)); //$NON-NLS-1$
- runtimeType.setAttribute("vendor",getStringOption(KEY_SERVER_VENDOR)); //$NON-NLS-1$
- runtimeType.setAttribute("version",getStringOption(KEY_SERVER_VERSION)); //$NON-NLS-1$
- runtimeType.setAttribute("class","org.eclipse.jst.server.generic.core.internal.GenericServerRuntime"); //$NON-NLS-1$ //$NON-NLS-2$
-
- IPluginElement moduleType = factory.createElement(runtimeType);
- moduleType.setName("moduleType"); //$NON-NLS-1$
- moduleType.setAttribute("types","jst.web"); //$NON-NLS-1$ //$NON-NLS-2$
- moduleType.setAttribute("versions","1.2, 1.3"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeType.add(moduleType);
-
- extension.add(runtimeType);
- if(!extension.isInTheModel())
- plugin.add(extension);
- }
-
- private String getRuntimeId(){
- return getNamespace()+".runtime"; //$NON-NLS-1$
- }
-
- private String getServerId(){
- return getNamespace()+".server"; //$NON-NLS-1$
- }
- private String getNamespace()
- {
- return model.getPluginBase().getId();
- }
- private String getSelectedBehaviourClass() {
- if(isExternalSelected())
- return "org.eclipse.jst.server.generic.core.internal.ExternalServerBehaviour"; //$NON-NLS-1$
- return "org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"; //$NON-NLS-1$
- }
-
- private boolean isExternalSelected(){
- String selectedType = getStringOption(KEY_SERVER_LAUNCHTYPE);
- return "external".equals(selectedType); //$NON-NLS-1$
- }
-
- private String getSelectedConfigType(){
- if(isExternalSelected())
- return "org.eclipse.jst.server.generic.core.ExternalLaunchConfigurationType"; //$NON-NLS-1$
- return "org.eclipse.jst.server.generic.core.launchConfigurationType"; //$NON-NLS-1$
- }
-
- protected ResourceBundle getPluginResourceBundle(){
- return null;
- }
-
- public String[] getNewFiles(){
- return new String[]{"icons/", "server/","buildfiles/"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- public String getUsedExtensionPoint(){
- return null;
- }
-
- public void validateOptions(TemplateOption changed){
- if(changed.isRequired() && changed.isEmpty()){
- flagMissingRequiredOption(changed);
- return;
- }
- TemplateOption[] options = getOptions(0);
- for (int i = 0; i < options.length; i++) {
- if(options[i].isRequired() && options[i].isEmpty()){
- flagMissingRequiredOption(options[i]);
- return;
- }
- }
- resetPageState();
- }
-
-
-
- public void addPages(Wizard wizard) {
- WizardPage page = createPage(0);
- page.setTitle(Messages.pageTitle);
- page.setDescription(Messages.pageDescription);
- wizard.addPage(page);
- markPagesAdded();
- }
-
-
-
- protected URL getInstallURL() {
- return ServerPdePlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
- */
- public IPluginReference[] getDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[4];
- dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
- dep[1] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
- dep[2] = new PluginReference("org.eclipse.jst.server.generic.core", null, 0); //$NON-NLS-1$
- dep[3] = new PluginReference("org.eclipse.jst.server.generic.ui", null, 0); //$NON-NLS-1$
- return dep;
- }
-
- public Object getValue(String variable) {
- return super.getValue(variable);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
deleted file mode 100644
index 2f357ea..0000000
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.server.generic.pde.internal.messages"; //$NON-NLS-1$
-
- private Messages() {
- }
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- public static String labelJavaLaunchConfiguration;
-
- public static String labelExternalLaunchConfiguration;
-
- public static String labelServerName;
-
- public static String labelServerVendor;
-
- public static String labelServerVesion;
-
- public static String labelLaunchType;
-
- public static String labelStartBeforePublish;
-
- public static String pageTitle;
-
- public static String pageDescription;
-
- public static String windowTitleWizard;
-}
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
deleted file mode 100644
index 5890ce9..0000000
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: Gorkem Ercan - initial API and implementation
-#
-###################################################################################################
-labelJavaLaunchConfiguration=Java launch cofiguration
-labelExternalLaunchConfiguration=External launch configuration
-labelServerName=Server Name
-labelServerVendor=Server Vendor
-labelServerVesion=Server Version
-labelLaunchType=Launch type
-labelStartBeforePublish=Start Before publish
-pageTitle=Generic Server Plug-in
-pageDescription=Create a new Generic server plug-in
-windowTitleWizard=New Generic Server plug-in
diff --git a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml b/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
deleted file mode 100644
index f720ca4..0000000
--- a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<project name="deployextension" default="deploy.j2ee.web" basedir=".">
- <target name="deploy.j2ee.web">
- <jar destfile="${project.working.dir}/${module.name}.war">
- <zipfileset dir="${module.dir}">
- <include name="**/*.*"/>
- <exclude name="**/*.war"/>
- </zipfileset>
- </jar>
- <move file="${project.working.dir}/${module.name}.war" todir="${server.publish.dir}"/>
- </target>
-
- <target name="deploy.j2ee.ejb">
- <jar destfile="${project.working.dir}/${module.name}.jar">
- <zipfileset dir="${module.dir}">
- <include name="**/*.*"/>
- <exclude name="**/*.java"/>
- </zipfileset>
- </jar>
- <move file="${project.working.dir}/${module.name}.jar" todir="${server.publish.dir}"/>
- </target>
- <target name="deploy.j2ee.ear">
- <jar destfile="${project.working.dir}/${module.name}.ear">
- <zipfileset dir="${module.dir}">
- <include name="**/*.*"/>
- <exclude name="**/*.java"/>
- </zipfileset>
- </jar>
- <move file="${project.working.dir}/${module.name}.ear" todir="${server.publish.dir}"/>
- </target>
-
- <target name="undeploy.j2ee.web">
- <delete file="${server.publish.dir}/${module.name}.war"> </delete>
- </target>
- <target name="undeploy.j2ee.ejb">
- <delete file="${server.publish.dir}/${module.name}.jar"> </delete>
- </target>
- <target name="undeploy.j2ee.ear">
- <delete file="${server.publish.dir}/${module.name}.ear"> </delete>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif b/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
deleted file mode 100644
index b51ae39..0000000
--- a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef b/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
deleted file mode 100644
index c22872a..0000000
--- a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ServerRuntime
- xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd "
- name="JBOSS 3.2.3" version="v3.2.3">
-<property id="serverRootDirectory"
- label="%ApplicationServerDirectory"
- type="directory"
- context="runtime"
- default="/your_server_root/appservers/jboss-3.2.3" />
-<property id="serverAddress"
- label="%serverAddress"
- type="string"
- context="server"
- default="127.0.0.1" />
-<property id="port"
- label="%serverPort"
- type="string"
- context="server"
- default="8080" />
-<property id="serverConfig"
- label="%jboss323serverConfig"
- type="string"
- context="server"
- default="default" />
-<property id="classPath"
- label="%serverclassPath"
- type="directory"
- context="runtime"
- default="/your_server_root/appservers/jboss-3.2.3" />
-
- <port>
- <no>$${port}</no>
- <name>Http</name>
- <protocol>http</protocol>
- </port>
-
- <module>
- <type>j2ee.web</type>
- <publishDir>$${serverRootDirectory}/server/$${serverConfig}/deploy</publishDir>
- <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
- </module>
- <module>
- <type>j2ee.ejb</type>
- <publishDir>$${serverRootDirectory}/server/$${serverConfig}/deploy</publishDir>
- <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
- </module>
- <module>
- <type>j2ee.ear</type>
- <publishDir>$${serverRootDirectory}/server/$${serverConfig}/deploy</publishDir>
- <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
- </module>
-
- <project>
- <classpathReference>jboss.project</classpathReference>
- </project>
-
- <start>
- <mainClass>org.jboss.Main</mainClass>
- <workingDirectory>$${serverRootDirectory}/bin</workingDirectory>
- <programArguments>-c $${serverConfig}</programArguments>
- <vmParameters></vmParameters>
- <classpathReference>jboss</classpathReference>
- </start>
-
- <stop>
- <mainClass>org.jboss.Shutdown</mainClass>
- <workingDirectory>$${serverRootDirectory}/bin</workingDirectory>
- <programArguments>-S</programArguments>
- <vmParameters></vmParameters>
- <classpathReference>jboss</classpathReference>
- </stop>
- <publisher id="org.eclipse.jst.server.generic.antpublisher">
- <publisherdata>
- <dataname>build.file</dataname>
- <datavalue>/buildfiles/jboss323.xml</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.publish.j2ee.web</dataname>
- <datavalue>deploy.j2ee.web</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.publish.j2ee.ejb</dataname>
- <datavalue>deploy.j2ee.ejb</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.unpublish.j2ee.web</dataname>
- <datavalue>undeploy.j2ee.web</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.unpublish.j2ee.ejb</dataname>
- <datavalue>undeploy.j2ee.ejb</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.publish.j2ee.ear</dataname>
- <datavalue>deploy.j2ee.ear</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.unpublish.j2ee.ear</dataname>
- <datavalue>undeploy.j2ee.ear</datavalue>
- </publisherdata>
- </publisher>
-
- <classpath id="jboss" >
- <archive path="$${classPath}/bin/run.jar" />
- <archive path="$${classPath}/bin/shutdown.jar" />
- <archive path="$${classPath}/client/jboss-j2ee.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/javax.servlet.jar" />
- <archive path="$${classPath}/lib/jboss-boot.jar" />
- <archive path="$${classPath}/lib/jboss-system.jar" />
- <archive path="$${classPath}/lib/jboss-jmx.jar" />
- <archive path="$${classPath}/lib/jboss-common.jar" />
- <archive path="$${classPath}/lib/concurrent.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jboss.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jnpserver.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jpl-pattern.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jpl-util.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jboss-transaction.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/bcel.jar" />
- <archive path="$${classPath}/lib/jdom.jar" />
- <archive path="$${classPath}/lib/xercesImpl.jar" />
- <archive path="$${classPath}/lib/xml-apis.jar" />
- <archive path="$${classPath}/lib/gnu-regexp.jar" />
- <archive path="$${classPath}/lib/getopt.jar" />
- </classpath>
-
- <classpath id="jboss.project" >
- <archive path="$${classPath}/client/jboss-j2ee.jar" />
- <archive path="$${classPath}/server/default/lib/javax.servlet.jar" />
- <archive path="$${classPath}/server/default/lib/activation.jar" />
- <archive path="$${classPath}/server/default/lib/mail.jar" />
- </classpath>
- <jndiConnection>
- <providerUrl>jnp://$${serverAddress}:1099</providerUrl>
- <initialContextFactory>org.jnp.interfaces.NamingContextFactory</initialContextFactory>
- <jndiProperty>
- <name></name>
- <value></value>
- </jndiProperty>
- </jndiConnection>
-</tns:ServerRuntime>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
index b29209d..52acbba 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.java
index 643d752..6edda3b 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.java
@@ -22,6 +22,7 @@
public static String errorInstallDirTrailingSlash;
public static String errorJRE;
public static String warningJRE;
+ public static String warningCantReadConfig;
public static String target32runtime;
public static String target40runtime;
public static String target41runtime;
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.properties b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.properties
index 46548e6..959f13e 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.properties
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Messages.properties
@@ -92,6 +92,7 @@
errorCouldNotLoadContextXml=Could not load the context configuration for the {0} context due to a syntax error or other exception.
warningJRE=Tomcat requires a Java SDK in order to compile JSP files. Ensure that the JRE preference settings point to an SDK install location.
+warningCantReadConfig=Cannot read the Tomcat configuration.
# Actions (used in undo/redo menus)
serverEditorActionSetSecure=set security
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java
index c796744..4da2f39 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java
@@ -165,7 +165,7 @@
}
return list;
}
-
+
/**
* @see TomcatConfiguration#load(IPath, IProgressMonitor)
*/
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
index 41a3b5d..2119a31 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
@@ -128,6 +128,16 @@
if (!found)
return new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, Messages.warningJRE, null);
+ File f = getRuntime().getLocation().append("conf").toFile();
+ File[] conf = f.listFiles();
+ if (conf != null) {
+ int size = conf.length;
+ for (int i = 0; i < size; i++) {
+ if (!f.canRead())
+ return new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, Messages.warningCantReadConfig, null);
+ }
+ }
+
return Status.OK_STATUS;
}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
index f4e9595..9fb89ae 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
@@ -87,7 +87,7 @@
return configuration;
}
- public void importConfiguration(IRuntime runtime, IProgressMonitor monitor) {
+ public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
if (runtime == null) {
configuration = null;
return;
@@ -111,6 +111,7 @@
} catch (CoreException ce) {
// ignore
configuration = null;
+ throw ce;
}
}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java
index d73cfdc..e343134 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java
@@ -11,6 +11,7 @@
package org.eclipse.jst.server.tomcat.core.internal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.core.resources.IFolder;
@@ -36,9 +37,10 @@
* @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
- IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
+ List classpaths = new ArrayList();
+ classpaths.addAll(Arrays.asList(JavaRuntime.computeUnresolvedSourceLookupPath(configuration)));
List sourcefolderList = new ArrayList();
-
+
IServer server = ServerUtil.getServer(configuration);
if (server != null) {
//IPath basePath = ((TomcatServerBehaviour)server.getAdapter(TomcatServerBehaviour.class)).getRuntimeBaseDirectory();
@@ -48,7 +50,6 @@
for (int i = 0; i < modules.length; i++) {
IProject project = modules[i].getProject();
if (project != null) {
-
IFolder moduleFolder = project.getFolder(modules[i].getName());
if (moduleFolder.exists()) {
sourcefolderList.add(new FolderSourceContainer(moduleFolder, true));
@@ -72,20 +73,16 @@
IJavaProject[] projects = new IJavaProject[size];
list.toArray(projects);
- int size2 = entries.length;
- //int size3 = pathList.size();
- IRuntimeClasspathEntry[] entries2 = new IRuntimeClasspathEntry[size + size2];
- System.arraycopy(entries, 0, entries2, 0, size2);
-
for (int i = 0; i < size; i++)
- entries2[size2 + i] = JavaRuntime.newProjectRuntimeClasspathEntry(projects[i]);
+ classpaths.addAll(Arrays.asList(JavaRuntime.computeUnresolvedRuntimeClasspath(projects[i])));
- //for (int i = 0; i < size3; i++)
+ // for (int i = 0; i < size3; i++)
// entries2[size + size2 + i] = JavaRuntime.newArchiveRuntimeClasspathEntry((IPath) pathList.get(i));
-
- entries = entries2;
}
-
+
+ IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[classpaths.size()];
+ classpaths.toArray(entries);
+
IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
ISourceContainer[] sourceContainers = JavaRuntime.getSourceContainers(resolved);
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
index 7b3b314..5a15c18 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -20,5 +20,6 @@
org.eclipse.wst.server.core,
org.eclipse.wst.server.ui,
org.eclipse.jst.server.core,
+ org.eclipse.jst.server.ui,
org.eclipse.jst.server.tomcat.core
Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
index cfeda5c..f8e6675 100644
--- a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.ui.internal.JavaServerUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.ui.internal;x-internal:=true
+Export-Package: org.eclipse.jst.server.ui.internal;x-internal:=true,
+ org.eclipse.jst.server.ui.internal.cactus;x-internal:=true
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core,
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
index e878842..8ccc642 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.internet.monitor.core.internal;x-friends:="org.eclipse.wst.internet.monitor.ui",
org.eclipse.wst.internet.monitor.core.internal.http;x-friends:="org.eclipse.wst.internet.monitor.ui",
- org.eclipse.wst.internet.monitor.core.internal.provisional
+ org.eclipse.wst.internet.monitor.core.internal.provisional;x-internal:=true
Require-Bundle: org.eclipse.core.runtime
Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
index 4469ec3..689a128 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.internet.monitor.ui.internal;x-internal:=true,
- org.eclipse.wst.internet.monitor.ui.internal.provisional,
+ org.eclipse.wst.internet.monitor.ui.internal.provisional;x-internal:=true,
org.eclipse.wst.internet.monitor.ui.internal.view;x-internal:=true,
org.eclipse.wst.internet.monitor.ui.internal.viewers;x-internal:=true
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
index 3aa3329..c169581 100644
--- a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.wst.server.core.internal.ServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.server.core,
org.eclipse.wst.server.core.internal;x-friends:="org.eclipse.wst.server.ui",
- org.eclipse.wst.server.core.internal.provisional,
+ org.eclipse.wst.server.core.internal.provisional;x-internal:=true,
org.eclipse.wst.server.core.model,
org.eclipse.wst.server.core.util
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableRuntime.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableRuntime.java
index 741a77a..66431ec 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableRuntime.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableRuntime.java
@@ -18,18 +18,10 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.update.core.ISite;
-import org.eclipse.update.core.ISiteWithMirrors;
-import org.eclipse.update.core.IURLEntry;
-import org.eclipse.update.core.SiteManager;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.update.core.*;
import org.eclipse.update.standalone.InstallCommand;
import org.osgi.framework.Bundle;
/**
@@ -123,28 +115,43 @@
installRuntimeJob.schedule();
}
- public static String getMirror(String fromSite, IProgressMonitor monitor) {
- // if the site is a site containing mirrors, set the fromSite to the first
- // mirror site since many mirror list generators will sort the mirrors to closest
- // geographic location
- String mirrorSite = null;
+ public static ISite getSite(String fromSite, IProgressMonitor monitor) {
try {
URL siteURL = new URL(fromSite);
- ISite site = SiteManager.getSite(siteURL, monitor);
- if (site != null && site instanceof ISiteWithMirrors) {
+ return SiteManager.getSite(siteURL, monitor);
+ } catch (MalformedURLException e) {
+ Trace.trace(Trace.WARNING, "Could not parse site", e);
+ } catch (CoreException e) {
+ Trace.trace(Trace.WARNING, "Could not parse site", e);
+ } catch (Exception e) {
+ Trace.trace(Trace.WARNING, "Could not parse site", e);
+ }
+ return null;
+ }
+
+ public static String getMirror(String fromSite, ISite site) {
+ if (site != null) {
+ String mirrorSite = getMirror(site);
+ if (mirrorSite != null)
+ return mirrorSite;
+ }
+ return fromSite;
+ }
+
+ public static String getMirror(ISite site) {
+ // if the site is a site containing mirrors, set the fromSite to the
+ // first mirror site since many mirror list generators will sort the mirrors
+ // to closest geographic location
+ if (site != null && site instanceof ISiteWithMirrors) {
+ try {
IURLEntry[] urlEntries = ((ISiteWithMirrors) site).getMirrorSiteEntries();
if (urlEntries.length > 0)
- mirrorSite = urlEntries[0].getURL().toExternalForm();
+ return urlEntries[0].getURL().toExternalForm();
+ } catch (CoreException e) {
+ Trace.trace(Trace.WARNING, "Could not find mirror site", e);
}
- } catch (MalformedURLException e) {
- Trace.trace(Trace.WARNING, "Could not find mirror site", e);
- } catch (CoreException e) {
- Trace.trace(Trace.WARNING, "Could not find mirror site", e);
}
-
- if (mirrorSite != null)
- return mirrorSite;
- return fromSite;
+ return null;
}
/*
@@ -158,7 +165,8 @@
if (featureId == null || featureVersion == null || fromSite == null)
return;
- fromSite = getMirror(fromSite, monitor);
+ ISite site = getSite(fromSite, monitor);
+ fromSite = getMirror(fromSite, site);
// download and install plugins
Bundle bundle = Platform.getBundle(getBundleId());
@@ -166,11 +174,15 @@
try {
monitor.setTaskName("Installing feature");
InstallCommand command = new InstallCommand(featureId, featureVersion, fromSite, null, "false");
- command.run(monitor);
+ boolean b = command.run(monitor);
+ if (!b)
+ throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
+ Messages.errorInstallingServerFeature, null));
command.applyChangesNow();
} catch (Exception e) {
Trace.trace(Trace.SEVERE, "Error installing feature", e);
- return;
+ throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
+ NLS.bind(Messages.errorInstallingServer, e.getLocalizedMessage()), e));
}
}
@@ -203,7 +215,9 @@
}
zin.close();
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error installing feature", e);
+ Trace.trace(Trace.SEVERE, "Error unzipping runtime", e);
+ throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
+ NLS.bind(Messages.errorInstallingServer, e.getLocalizedMessage()), e));
}
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableServer.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableServer.java
index d716f6d..09637da 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableServer.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableServer.java
@@ -13,6 +13,13 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.PluginVersionIdentifier;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.update.core.ISite;
+import org.eclipse.update.core.ISiteFeatureReference;
+import org.eclipse.update.core.VersionedIdentifier;
import org.eclipse.update.standalone.InstallCommand;
/**
*
@@ -121,14 +128,21 @@
if (featureId == null || featureVersion == null || fromSite == null)
return;
- fromSite = InstallableRuntime.getMirror(fromSite, monitor);
+ ISite site = InstallableRuntime.getSite(fromSite, monitor);
+ fromSite = InstallableRuntime.getMirror(fromSite, site);
+ featureVersion = getLatestVersion(site, featureVersion, featureId);
try {
InstallCommand command = new InstallCommand(featureId, featureVersion, fromSite, null, "false");
- command.run(monitor);
+ boolean b = command.run(monitor);
+ if (!b)
+ throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
+ Messages.errorInstallingServerFeature, null));
//command.applyChangesNow();
} catch (Exception e) {
Trace.trace(Trace.SEVERE, "Error installing feature", e);
+ throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
+ NLS.bind(Messages.errorInstallingServer, e.getLocalizedMessage()), e));
}
try {
@@ -138,6 +152,31 @@
}
}
+ public static String getLatestVersion(ISite site, String version, String featureId) {
+ String latestVersion = null;
+
+ try {
+ PluginVersionIdentifier pvi = new PluginVersionIdentifier(version);
+ ISiteFeatureReference[] features = site.getFeatureReferences();
+
+ for (int i = 0; i < features.length; i++) {
+ if (features[i].getName().equals(featureId)) {
+ VersionedIdentifier vi = features[i].getVersionedIdentifier();
+ if (vi.getVersion().isGreaterThan(pvi)) {
+ latestVersion = vi.getIdentifier();
+ pvi = new PluginVersionIdentifier(latestVersion);
+ }
+ }
+ }
+ } catch (Exception e) {
+ Trace.trace(Trace.SEVERE, "Error searching for latest feature version", e);
+ }
+
+ if (latestVersion == null)
+ return version;
+ return latestVersion;
+ }
+
public String toString() {
return "InstallableServer[" + getId() + ", " + getName() + "]";
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.java
index 13e7b33..3152345 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.java
@@ -51,6 +51,8 @@
public static String errorStartTimeout;
public static String errorStartFailed;
public static String errorModuleRestartFailed;
+ public static String errorInstallingServer;
+ public static String errorInstallingServerFeature;
public static String canRestartModuleOk;
public static String errorRestartModule;
public static String canStartErrorState;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.properties b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.properties
index 425bb01..5d9730a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.properties
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.properties
@@ -45,6 +45,8 @@
errorStartTimeout=Timeout waiting for {0} to start. Server did not start after {1}s.
errorStartFailed=Server {0} failed to start.
errorCannotAddModule=The server does not support version {1} of the {0} specification.
+errorInstallingServer=Error occurred installing server: {0}
+errorInstallingServerFeature=Could not download and install update feature.
# Default server creation names
# {0} will be replaced by a number if the given name is already being used
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
index 2cfd7c3..7a86c38 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
@@ -370,10 +370,10 @@
Trace.trace(Trace.RESOURCES, "Deregistering runtime: " + runtime.getName());
if (runtime.equals(getDefaultRuntime()))
setDefaultRuntime(null);
-
- ((Runtime)runtime).dispose();
- fireRuntimeEvent(runtime, EVENT_REMOVED);
+
runtimes.remove(runtime);
+ fireRuntimeEvent(runtime, EVENT_REMOVED);
+ ((Runtime)runtime).dispose();
}
/**
@@ -389,10 +389,10 @@
((Server) server).deleteLaunchConfigurations();
ServerPlugin.getInstance().removeTempDirectory(server.getId());
-
- ((Server)server).dispose();
- fireServerEvent(server, EVENT_REMOVED);
+
servers.remove(server);
+ fireServerEvent(server, EVENT_REMOVED);
+ ((Server)server).dispose();
}
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/RestartServerJob.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/RestartServerJob.java
index 499d3ec..f9e0de1 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/RestartServerJob.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/RestartServerJob.java
@@ -43,6 +43,9 @@
// block util the restart is completed
while (!isRestartCompleted) {
+ if (monitor.isCanceled())
+ return Status.CANCEL_STATUS;
+
try {
Thread.sleep(250);
} catch (InterruptedException e) {
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
index fd9e3a0..0a096dc 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
@@ -4,7 +4,7 @@
* 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
**********************************************************************/
@@ -126,6 +126,9 @@
Trace.trace(Trace.FINEST, "Auto-publish thread publishing " + Server.this);
+ if (getServerState() != IServer.STATE_STARTED)
+ return;
+
PublishServerJob publishJob = new PublishServerJob(Server.this, IServer.PUBLISH_AUTO, false);
publishJob.schedule();
}
@@ -485,12 +488,12 @@
if (getServerState() != IServer.STATE_STOPPED && behaviourDelegate != null)
behaviourDelegate.handleResourceChange();
- if (getServerState() != IServer.STATE_STOPPED)
+ if (getServerState() == IServer.STATE_STARTED)
autoPublish();
Trace.trace(Trace.FINEST, "< handleDeployableProjectChange()");
}
-
+
protected void stopAutoPublish() {
if (autoPublishThread == null)
return;
@@ -1024,10 +1027,10 @@
if (getServerType() == null || !getServerType().supportsLaunchMode(mode2))
return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, Messages.errorLaunchMode, null);
-
+
return Status.OK_STATUS;
}
-
+
public ILaunch getExistingLaunch() {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
@@ -1055,24 +1058,28 @@
try {
getBehaviourDelegate(monitor).setupLaunchConfiguration(workingCopy, monitor);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error calling delegate setLaunchDefaults() " + toString(), e);
+ Trace.trace(Trace.SEVERE, "Error calling delegate setupLaunchConfiguration() " + toString(), e);
}
}
/**
* Return the launch configuration for this server. If one does not exist, it
- * will be created if "create" is true, and otherwise will return null.
+ * will be created if "create" is true, and otherwise will return <code>null</code>.
+ * Will return <code>null</code> if this server type has no associated launch
+ * configuration type (i.e. the server cannot be started).
*
* @param create <code>true</code> if a new launch configuration should be
* created if there are none already
* @param monitor a progress monitor, or <code>null</code> if progress
* reporting and cancellation are not desired
- * @return the launch configuration, no <code>null</code> if there was no
+ * @return the launch configuration, or <code>null</code> if there was no
* existing launch configuration and <code>create</code> was false
* @throws CoreException
*/
public ILaunchConfiguration getLaunchConfiguration(boolean create, IProgressMonitor monitor) throws CoreException {
ILaunchConfigurationType launchConfigType = ((ServerType) getServerType()).getLaunchConfigurationType();
+ if (launchConfigType == null)
+ return null;
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
ILaunchConfiguration[] launchConfigs = null;
@@ -1904,18 +1911,19 @@
//restartNeeded = wc.restartNeeded;
serverType = wc.serverType;
modules = wc.modules;
-
+
// can never modify the following properties via the working copy
//serverState = wc.serverState;
delegate = wc.delegate;
- autoPublish();
+ if (getServerState() == IServer.STATE_STARTED)
+ autoPublish();
}
protected void saveState(IMemento memento) {
if (serverType != null)
memento.putString("server-type", serverType.getId());
-
+
if (configuration != null)
memento.putString(CONFIGURATION_ID, configuration.getFullPath().toString());
else
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPublishInfo.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPublishInfo.java
index 2b7ad3c..1cc083a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPublishInfo.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPublishInfo.java
@@ -4,7 +4,7 @@
* 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
**********************************************************************/
@@ -320,7 +320,8 @@
if (module == null)
return false;
- return getModulePublishInfo(module).hasDelta(module);
+ return hasModulePublishInfo(module)
+ && getModulePublishInfo(module).hasDelta(module);
}
protected static boolean hasDelta(IModuleResource[] original, IModuleResource[] current) {
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerType.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerType.java
index 28ba83f..fae2fea 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerType.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerType.java
@@ -193,7 +193,7 @@
// TODO
if (swc.getServerType().hasServerConfiguration())
- swc.importConfiguration(runtime, null);
+ swc.importRuntimeConfiguration(runtime, null);
return swc;
}
@@ -261,7 +261,7 @@
swc.setDefaults(monitor);
if (swc.getServerType().hasServerConfiguration())
- swc.importConfiguration(runtime, null);
+ swc.importRuntimeConfiguration(runtime, null);
return swc;
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerWorkingCopy.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerWorkingCopy.java
index 96ee4aa..00d6229 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerWorkingCopy.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerWorkingCopy.java
@@ -581,11 +581,38 @@
return Platform.getAdapterManager().loadAdapter(this, adapter.getName());
}
+ /**
+ * Import the server configuration from the given runtime.
+ *
+ * @param runtime2
+ * @param monitor
+ * @deprecated should use importRuntimeConfiguration() instead
+ */
public void importConfiguration(IRuntime runtime2, IProgressMonitor monitor) {
try {
getWorkingCopyDelegate(monitor).importConfiguration(runtime2, monitor);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error calling delegate setLaunchDefaults() " + toString(), e);
+ Trace.trace(Trace.SEVERE, "Error calling delegate importConfiguration() " + toString(), e);
+ }
+ }
+
+ /**
+ * Import the server configuration from the given runtime.
+ *
+ * @param runtime2 a server runtime
+ * @param monitor a progress monitor, or <code>null</code> if progress
+ * reporting and cancellation are not desired
+ * @throws CoreException if there is any problem importing the configuration
+ * from the runtime
+ */
+ public void importRuntimeConfiguration(IRuntime runtime2, IProgressMonitor monitor) throws CoreException {
+ try {
+ getWorkingCopyDelegate(monitor).importRuntimeConfiguration(runtime2, monitor);
+ } catch (CoreException ce) {
+ Trace.trace(Trace.SEVERE, "CoreException calling delegate importConfiguration() " + toString(), ce);
+ throw ce;
+ } catch (Exception e) {
+ Trace.trace(Trace.SEVERE, "Error calling delegate importConfiguration() " + toString(), e);
}
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java
index cddd7e2..90cdc9d 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java
@@ -365,8 +365,28 @@
* @param runtime a server runtime
* @param monitor a progress monitor, or <code>null</code> if progress
* reporting and cancellation are not desired
+ * @deprecated should use importRuntimeConfiguration (which can throw a
+ * CoreException) instead
*/
public void importConfiguration(IRuntime runtime, IProgressMonitor monitor) {
+ try {
+ importRuntimeConfiguration(runtime, monitor);
+ } catch (CoreException ce) {
+ // ignore
+ }
+ }
+
+ /**
+ * This method is called to import the server configuration from the given
+ * runtime.
+ *
+ * @param runtime a server runtime
+ * @param monitor a progress monitor, or <code>null</code> if progress
+ * reporting and cancellation are not desired
+ * @throws CoreException if there is any problem importing the configuration
+ * from the runtime
+ */
+ public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
// do nothing
}
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
index 38ac222..5f25636 100644
--- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,11 +10,13 @@
org.eclipse.wst.server.ui.editor,
org.eclipse.wst.server.ui.internal;x-internal:=true,
org.eclipse.wst.server.ui.internal.actions;x-internal:=true,
+ org.eclipse.wst.server.ui.internal.audio;x-internal:=true,
org.eclipse.wst.server.ui.internal.command;x-internal:=true,
org.eclipse.wst.server.ui.internal.editor;x-internal:=true,
org.eclipse.wst.server.ui.internal.provisional;x-internal:=true,
org.eclipse.wst.server.ui.internal.view.servers;x-internal:=true,
org.eclipse.wst.server.ui.internal.viewers;x-internal:=true,
+ org.eclipse.wst.server.ui.internal.webbrowser;x-internal:=true,
org.eclipse.wst.server.ui.internal.wizard;x-internal:=true,
org.eclipse.wst.server.ui.internal.wizard.fragment;x-internal:=true,
org.eclipse.wst.server.ui.internal.wizard.page;x-internal:=true,
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/LaunchClientJob.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/LaunchClientJob.java
index 4513bef..bd2c76b 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/LaunchClientJob.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/LaunchClientJob.java
@@ -41,7 +41,6 @@
*/
protected IStatus run(IProgressMonitor monitor) {
Trace.trace(Trace.FINER, "LaunchClient job");
- IStatus status = Status.OK_STATUS;
// wait for up to 5 minutes
final Server server = (Server) getServer();
@@ -49,7 +48,8 @@
int count = ServerPreferences.getInstance().getModuleStartTimeout();
while (state == IServer.STATE_STARTING && count > 0) {
if (monitor.isCanceled())
- return status;
+ return Status.CANCEL_STATUS;
+
try {
Thread.sleep(2000);
} catch (Exception e) {
@@ -62,10 +62,10 @@
Trace.trace(Trace.FINER, "LaunchClient job 2 " + state);
if (monitor.isCanceled())
- return status;
+ return Status.CANCEL_STATUS;
if (state == IServer.STATE_STARTING)
- return status;
+ return Status.OK_STATUS;
Trace.trace(Trace.FINER, "LaunchClient job 3");
@@ -82,6 +82,6 @@
}
});
Trace.trace(Trace.FINER, "LaunchClient job 4");
- return status;
+ return Status.OK_STATUS;
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
index 475da09..4f8bc03 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
@@ -115,7 +115,7 @@
actionModifyModules=Add and Remove Projects...
actionModifyModulesToolTip=Add and remove projects
actionRestartModule=Restart {0}
-actionUpdateStatus=Refresh Status
+actionUpdateStatus=Initialize Server Status
actionMoveServerToMetadata=Move to Metadata
actionMoveServerToWorkspace=Move to Workspace
@@ -190,7 +190,7 @@
prefMachineSpeedAverage=Normal
prefMachineSpeedFast=Short
prefMachineSpeedVeryFast=Shorter
-prefSyncStartup=S&ynchronize servers on startup
+prefSyncStartup=S&ynchronize servers on workbench startup
prefSaveEditorsGroup=Save dirty editors before starting server
prefSaveEditorsNever=&Never
@@ -198,7 +198,7 @@
prefSaveEditorsAutosave=Auto-sav&e
# Project properties preferences
-prefProjectDescription=Set the runtime target and the default server for the project.
+prefProjectDescription=Set the default server used by Run on Server for this project. To change the server runtime targetted by this project go to the Project Facets page.
prefProject=Project:
prefProjectDefaultServer=De&fault server:
prefProjectNotModule=This project cannot be deployed to a server.
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
index de4fe39..0a62b3d 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
@@ -334,8 +334,7 @@
// open action
if (server != null) {
menu.add(new OpenAction(server));
- if (server.getServerState() == IServer.STATE_UNKNOWN)
- menu.add(new UpdateStatusAction(server));
+ menu.add(new UpdateStatusAction(server));
menu.add(new Separator());
if (module == null)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/UpdateStatusAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/UpdateStatusAction.java
index 371e329..5d0f546 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/UpdateStatusAction.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/UpdateStatusAction.java
@@ -28,6 +28,8 @@
public UpdateStatusAction(IServer server) {
super(Messages.actionUpdateStatus);
this.server = server;
+ if (server.getServerState() != IServer.STATE_UNKNOWN)
+ setEnabled(false);
}
/**
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTypeComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTypeComposite.java
index ab05734..79455fc 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTypeComposite.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTypeComposite.java
@@ -78,9 +78,9 @@
}
}
- public void setHost(boolean newHost) {
+ public boolean setHost(boolean newHost) {
if (isLocalhost == newHost)
- return;
+ return false;
isLocalhost = newHost;
ISelection sel = treeViewer.getSelection();
@@ -88,6 +88,7 @@
treeViewer.refresh();
//treeViewer.expandToLevel(2);
treeViewer.setSelection(sel, true);
+ return true;
}
public void setIncludeIncompatibleVersions(boolean b) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/WizardTaskUtil.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/WizardTaskUtil.java
index 07c1044..d844c40 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/WizardTaskUtil.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/WizardTaskUtil.java
@@ -99,9 +99,9 @@
workingCopy = server.createWorkingCopy();
workingCopy.setRuntime(runtime);
- if (workingCopy.getServerType().hasServerConfiguration()) {
- ((ServerWorkingCopy)workingCopy).importConfiguration(runtime, null);
- }
+ if (workingCopy.getServerType().hasServerConfiguration())
+ ((ServerWorkingCopy)workingCopy).importRuntimeConfiguration(runtime, null);
+
taskModel.putObject(TaskModel.TASK_SERVER, workingCopy);
}
}
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java
index ac3502e..7b793cc 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java
@@ -15,6 +15,7 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.*;
import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
@@ -102,10 +103,14 @@
IServerAttributes server = (IServerAttributes) getTaskModel().getObject(TaskModel.TASK_SERVER);
if (server != null) {
- // createConfiguration(server);
if (server.getServerType().hasServerConfiguration() && server instanceof ServerWorkingCopy) {
ServerWorkingCopy swc = (ServerWorkingCopy) server;
- swc.importConfiguration(runtime, null);
+ try {
+ if (swc != null && runtime != null && runtime.getLocation() != null && !runtime.getLocation().isEmpty())
+ swc.importRuntimeConfiguration(runtime, null);
+ } catch (CoreException ce) {
+ // ignore
+ }
}
WizardFragment sub = getWizardFragment(server.getServerType().getId());
if (sub != null)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ElementCreationCache.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ElementCreationCache.java
index 985961e..0262fdc 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ElementCreationCache.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ElementCreationCache.java
@@ -40,25 +40,25 @@
* Return the key to use for the given factory.
*
* @param type the server type
- * @param host the server host
+ * @param isLocalhost true if the server is local
* @return the key
*/
- protected String getKey(IServerType type, String host) {
- return type.getId() + "|" + host + "|";
+ protected String getKey(IServerType type, boolean isLocalhost) {
+ return type.getId() + "|" + isLocalhost + "|";
}
/**
* Returns a server.
*
* @param type
- * @param host a hostname or IP
+ * @param isLocalhost true if the server is local
* @param monitor a progress monitor
* @return a server working copy
* @throws CoreException if anything goes wrong
*/
- public IServerWorkingCopy getServer(IServerType type, String host, IProgressMonitor monitor) throws CoreException {
+ public IServerWorkingCopy getServer(IServerType type, boolean isLocalhost, IProgressMonitor monitor) throws CoreException {
try {
- IServerWorkingCopy server = getCachedServer(type, host);
+ IServerWorkingCopy server = getCachedServer(type, isLocalhost);
if (server != null)
return server;
} catch (Exception e) {
@@ -71,7 +71,7 @@
// file = ServerUtil.getUnusedServerFile(WizardUtil.getServerProject(), type);
IServerWorkingCopy server = type.createServer(null, file, (IRuntime)null, monitor);
- elementCache.put(getKey(type, host), server);
+ elementCache.put(getKey(type, isLocalhost), server);
return server;
} catch (CoreException ce) {
throw ce;
@@ -82,12 +82,12 @@
* Returns a cached server resource.
*
* @param type the server type
- * @param host a hostname or IP
+ * @param isLocalhost true if the server is local
* @return a working copy
*/
- public IServerWorkingCopy getCachedServer(IServerType type, String host) {
+ public IServerWorkingCopy getCachedServer(IServerType type, boolean isLocalhost) {
try {
- IServerWorkingCopy server = (IServerWorkingCopy) elementCache.get(getKey(type, host));
+ IServerWorkingCopy server = (IServerWorkingCopy) elementCache.get(getKey(type, isLocalhost));
if (server != null)
return server;
} catch (Exception e) {
@@ -96,4 +96,18 @@
return null;
}
+
+ /**
+ * Clears a cached server resource.
+ *
+ * @param type the server type
+ * @param isLocalhost true if the server is local
+ */
+ public void clearCachedServer(IServerType type, boolean isLocalhost) {
+ try {
+ elementCache.remove(getKey(type, isLocalhost));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
index d4e4056..8960aca 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
@@ -91,7 +91,7 @@
this.listener = listener;
this.moduleType = moduleType;
-
+
createControl();
wizard.setMessage("", IMessageProvider.ERROR); //$NON-NLS-1$
}
@@ -133,11 +133,7 @@
runtimeCombo.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
try {
- runtime = runtimes[runtimeCombo.getSelectionIndex()];
- if (server != null) {
- server.setRuntime(runtime);
- listener.runtimeSelected(runtime);
- }
+ setRuntime(runtimes[runtimeCombo.getSelectionIndex()]);
} catch (Exception ex) {
// ignore
}
@@ -152,8 +148,8 @@
runtimeButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
if (showPreferencePage()) {
+ runtime = null;
IServerType serverType = serverTypeComposite.getSelectedServerType();
- updateRuntimes(serverType);
updateRuntimeCombo(serverType);
}
}
@@ -172,19 +168,23 @@
this.host = host;
if (serverTypeComposite == null)
return;
+
+ boolean changed = false;
if (host == null) {
- serverTypeComposite.setHost(true);
+ changed = serverTypeComposite.setHost(true);
} else if (SocketUtil.isLocalhost(host))
- serverTypeComposite.setHost(true);
+ changed = serverTypeComposite.setHost(true);
else
- serverTypeComposite.setHost(false);
- handleTypeSelection(serverTypeComposite.getSelectedServerType());
- if (server != null) {
+ changed = serverTypeComposite.setHost(false);
+
+ if (changed)
+ handleTypeSelection(serverTypeComposite.getSelectedServerType());
+ else if (server != null) {
server.setHost(host);
ServerUtil.setServerDefaultName(server);
}
}
-
+
/**
* Return the current editable element.
*/
@@ -194,11 +194,14 @@
if (serverType == null)
return;
- server = cache.getCachedServer(serverType, host);
+ final boolean isLocalhost = SocketUtil.isLocalhost(host);
+
+ server = cache.getCachedServer(serverType, isLocalhost);
if (server != null) {
server.setHost(host);
ServerUtil.setServerDefaultName(server);
runtime = server.getRuntime();
+ listener.runtimeSelected(runtime);
return;
}
@@ -210,25 +213,25 @@
monitor = ProgressUtil.getMonitorFor(monitor);
int ticks = 200;
monitor.beginTask(NLS.bind(Messages.loadingTask, serverType.getName()), ticks);
-
- server = cache.getServer(serverType, host, ProgressUtil.getSubMonitorFor(monitor, 200));
+
+ server = cache.getServer(serverType, isLocalhost, ProgressUtil.getSubMonitorFor(monitor, 200));
if (server != null) {
server.setHost(host);
ServerUtil.setServerDefaultName(server);
-
+
if (serverType.hasRuntime() && server.getRuntime() == null) {
runtime = null;
updateRuntimes(serverType);
- runtime = getDefaultRuntime();
- server.setRuntime(runtime);
+ setRuntime(getDefaultRuntime());
- if (server.getServerType().hasServerConfiguration()) {
- ((ServerWorkingCopy)server).importConfiguration(runtime, null);
- }
+ if (server.getServerType().hasServerConfiguration() && !runtime.getLocation().isEmpty())
+ ((ServerWorkingCopy)server).importRuntimeConfiguration(runtime, null);
}
+ ((ServerWorkingCopy)server).setDefaults(monitor);
}
} catch (CoreException cex) {
ce[0] = cex;
+ cache.clearCachedServer(serverType, isLocalhost);
} catch (Throwable t) {
Trace.trace(Trace.SEVERE, "Error creating element", t); //$NON-NLS-1$
} finally {
@@ -242,9 +245,11 @@
Trace.trace(Trace.SEVERE, "Error with runnable", e); //$NON-NLS-1$
}
- if (ce[0] != null)
+ if (ce[0] != null) {
+ server = null;
+ runtime = null;
wizard.setMessage(ce[0].getLocalizedMessage(), IMessageProvider.ERROR);
- else if (server == null)
+ } else if (server == null)
wizard.setMessage(Messages.wizErrorServerCreationError, IMessageProvider.ERROR);
}
@@ -275,17 +280,17 @@
runtimes = ServerUIPlugin.getRuntimes(runtimeType);
newRuntime = null;
- if (server != null && SocketUtil.isLocalhost(server.getHost()) && runtimes != null) {
+ if (server != null && runtimes != null) {
List runtimes2 = new ArrayList();
int size = runtimes.length;
for (int i = 0; i < size; i++) {
IRuntime runtime2 = runtimes[i];
- if (!runtime2.isStub())
+ if (!SocketUtil.isLocalhost(server.getHost()) || !runtime2.isStub())
runtimes2.add(runtime2);
}
runtimes = new IRuntime[runtimes2.size()];
runtimes2.toArray(runtimes);
- if (runtimes2.size() > 0)
+ if (runtimes.length > 0)
return;
}
@@ -302,7 +307,7 @@
}
protected void updateRuntimeCombo(IServerType serverType) {
- if (serverType == null || !serverType.hasRuntime()) {
+ if (serverType == null || !serverType.hasRuntime() || server == null) {
if (runtimeLabel != null) {
runtimeLabel.setEnabled(false);
runtimeCombo.setItems(new String[0]);
@@ -313,9 +318,7 @@
runtimeButton.setVisible(false);
}
runtimes = new IRuntime[0];
- runtime = null;
- if (server != null)
- server.setRuntime(null);
+ setRuntime(null);
return;
}
@@ -330,10 +333,9 @@
items[i] = runtimes[i].getName();
}
- if (runtime == null) {
- runtime = getDefaultRuntime();
- server.setRuntime(runtime);
- }
+ if (runtime == null)
+ setRuntime(getDefaultRuntime());
+
if (runtimeCombo != null) {
runtimeCombo.setItems(items);
if (runtimes.length > 0) {
@@ -344,7 +346,7 @@
}
if (sel < 0) {
sel = 0;
- server.setRuntime(runtimes[0]);
+ setRuntime(runtimes[0]);
}
runtimeCombo.select(sel);
@@ -361,6 +363,13 @@
}
}
+ protected void setRuntime(IRuntime runtime2) {
+ runtime = runtime2;
+ if (server != null)
+ server.setRuntime(runtime);
+ listener.runtimeSelected(runtime);
+ }
+
/**
* Handle the server type selection.
*/
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
index 348b95c..fa4d7fb 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
@@ -281,7 +281,7 @@
hostComp.setLayoutData(data);
return hostComp;
}
-
+
protected void createAutoComposite(Composite comp) {
detectComp2 = new Composite(comp, SWT.NONE);
GridLayout layout = new GridLayout();
