[113121] single jar generic server plugins
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml
index b7fd8a0..7045227 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -26,6 +26,7 @@
id="org.eclipse.jst.server.generic.core"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml
index c77dff6..dcf3377 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -30,7 +30,8 @@
id="org.eclipse.jst.server.generic.ui"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.eclipse.jst.server.ui.infopop"
diff --git a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
index 45db8e0..4d1689d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.generic.core; singleton:=true
Bundle-Version: 1.0.0
-Bundle-ClassPath: genericserver.jar
Bundle-Activator: org.eclipse.jst.server.generic.core.internal.CorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.generic.core/build.properties b/plugins/org.eclipse.jst.server.generic.core/build.properties
index be61c36..f37ab88 100644
--- a/plugins/org.eclipse.jst.server.generic.core/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.core/build.properties
@@ -7,9 +7,9 @@
# Contributors: Gorkem Ercan - initial API and implementation
#
###################################################################################################
-source.genericserver.jar = src/
-output.genericserver.jar = bin/
-bin.includes = genericserver.jar,\
+source.. = src/
+output.. = bin/
+bin.includes = .,\
servers/,\
xsd/ServerTypeDefinitionSchema.xsd,\
META-INF/,\
diff --git a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
index ae91398..5e9db2c 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.generic.ui; singleton:=true
Bundle-Version: 1.0.0
-Bundle-ClassPath: genericui.jar
Bundle-Activator: org.eclipse.jst.server.generic.ui.internal.GenericUiPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.generic.ui/build.properties b/plugins/org.eclipse.jst.server.generic.ui/build.properties
index a53a546..eb9ec43 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/build.properties
@@ -7,10 +7,10 @@
# Contributors: Gorkem Ercan - initial API and implementation
#
###################################################################################################
-source.genericui.jar = src/
-output.genericui.jar = bin/
+source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
- genericui.jar,\
+ .,\
icons/,\
plugin.properties,\
META-INF/,\
