Bug 531426 - add 3 plugins, 1 doc plugin, and 2 performance test plugins to the reactor; add plugins + sources to update site
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF
index 91c9bb2..2dee1f1 100644
--- a/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.servertools.doc.isv;singleton:=true
+Bundle-SymbolicName: org.eclipse.server.doc.isv;singleton:=true
Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: %pluginProvider
Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/plugins/org.eclipse.jst.server.pde/pom.xml b/plugins/org.eclipse.jst.server.pde/pom.xml
index 1b782bb..8d458fc 100644
--- a/plugins/org.eclipse.jst.server.pde/pom.xml
+++ b/plugins/org.eclipse.jst.server.pde/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.jst.server.generic.pde</artifactId>
- <version>1.0.101</version>
+ <version>1.0.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/pom.xml b/pom.xml
index 9817566..347e483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,14 +56,19 @@
<module>docs/org.eclipse.jst.server.ui.doc.user</module>
<module>docs/org.eclipse.jst.server.ui.infopop</module>
+ <module>docs/org.eclipse.server.doc.isv</module>
<module>docs/org.eclipse.servertools.doc.isv</module>
<module>docs/org.eclipse.wst.server.ui.doc.user</module>
<module>docs/org.eclipse.wst.server.ui.infopop</module>
<module>plugins/org.eclipse.jst.server.core</module>
<module>plugins/org.eclipse.jst.server.generic.core</module>
+ <module>plugins/org.eclipse.jst.server.generic.jboss</module>
<module>plugins/org.eclipse.jst.server.generic.jonas</module>
+ <module>plugins/org.eclipse.jst.server.generic.oc4j</module>
<module>plugins/org.eclipse.jst.server.generic.ui</module>
+ <module>plugins/org.eclipse.jst.server.websphere.core</module>
+
<module>plugins/org.eclipse.jst.server.preview.adapter</module>
<module>plugins/org.eclipse.jst.server.tomcat.core</module>
<module>plugins/org.eclipse.jst.server.tomcat.ui</module>
@@ -84,6 +89,9 @@
<module>tests/org.eclipse.wst.server.http.core.tests</module>
<module>tests/org.eclipse.wst.server.util.tests</module>
+ <module>tests/org.eclipse.jst.server.tomcat.tests.performance</module>
+ <module>tests/org.eclipse.wst.server.tests.performance</module>
+
<module>site</module>
</modules>
diff --git a/site/category.xml b/site/category.xml
index 778edf0..a17d59c 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -20,18 +20,22 @@
<bundle id="org.eclipse.jst.server.ui.doc.user"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.ui.infopop"><category name="site"/></bundle>
+ <bundle id="org.eclipse.server.doc.isv"><category name="site"/></bundle>
<bundle id="org.eclipse.servertools.doc.isv"><category name="site"/></bundle>
<bundle id="org.eclipse.wst.server.ui.doc.user"><category name="site"/></bundle>
<bundle id="org.eclipse.wst.server.ui.infopop"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.core"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.generic.core"><category name="site"/></bundle>
+ <bundle id="org.eclipse.jst.server.generic.jboss"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.generic.jonas"><category name="site"/></bundle>
+ <bundle id="org.eclipse.jst.server.generic.oc4j"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.generic.ui"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.preview.adapter"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.tomcat.core"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.tomcat.ui"><category name="site"/></bundle>
<bundle id="org.eclipse.jst.server.ui"><category name="site"/></bundle>
+ <bundle id="org.eclipse.jst.server.websphere.core"><category name="site"/></bundle>
<bundle id="org.eclipse.wst.internet.monitor.core"><category name="site"/></bundle>
<bundle id="org.eclipse.wst.internet.monitor.ui"><category name="site"/></bundle>
<bundle id="org.eclipse.wst.server.core"><category name="site"/></bundle>
@@ -47,6 +51,9 @@
<bundle id="org.eclipse.wst.server.http.core.tests"><category name="site"/></bundle>
<bundle id="org.eclipse.wst.server.util.tests"><category name="site"/></bundle>
+ <bundle id="org.eclipse.jst.server.tomcat.tests.performance"><category name="site"/></bundle>
+ <bundle id="org.eclipse.wst.server.tests.performance"><category name="site"/></bundle>
+
<!-- sources - note that sdk.features have no sources because they mostly contain nothing but other features -->
<feature id="org.eclipse.jst.server_adapters.ext.feature.source"/>
@@ -62,18 +69,22 @@
<bundle id="org.eclipse.jst.server.ui.doc.user.source"/>
<bundle id="org.eclipse.jst.server.ui.infopop.source"/>
+ <bundle id="org.eclipse.server.doc.isv.source"/>
<bundle id="org.eclipse.servertools.doc.isv.source"/>
<bundle id="org.eclipse.wst.server.ui.doc.user.source"/>
<bundle id="org.eclipse.wst.server.ui.infopop.source"/>
<bundle id="org.eclipse.jst.server.core.source"/>
<bundle id="org.eclipse.jst.server.generic.core.source"/>
+ <bundle id="org.eclipse.jst.server.generic.jboss.source"/>
<bundle id="org.eclipse.jst.server.generic.jonas.source"/>
+ <bundle id="org.eclipse.jst.server.generic.oc4j.source"/>
<bundle id="org.eclipse.jst.server.generic.ui.source"/>
<bundle id="org.eclipse.jst.server.preview.adapter.source"/>
<bundle id="org.eclipse.jst.server.tomcat.core.source"/>
<bundle id="org.eclipse.jst.server.tomcat.ui.source"/>
<bundle id="org.eclipse.jst.server.ui.source"/>
+ <bundle id="org.eclipse.jst.server.websphere.core.source"/>
<bundle id="org.eclipse.wst.internet.monitor.core.source"/>
<bundle id="org.eclipse.wst.internet.monitor.ui.source"/>
<bundle id="org.eclipse.wst.server.core.source"/>
@@ -89,6 +100,9 @@
<bundle id="org.eclipse.wst.server.http.core.tests.source"/>
<bundle id="org.eclipse.wst.server.util.tests.source"/>
+ <bundle id="org.eclipse.jst.server.tomcat.tests.performance.source"/>
+ <bundle id="org.eclipse.wst.server.tests.performance.source"/>
+
<category-def name="site" label="Web Tools (WTP) Server Tools"><description/></category-def>
</site>
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF
index 5d5c0d3..cd26012 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Export-Package: org.eclipse.jst.server.tomcat.tests.performance.tomcat50
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.junit;bundle-version="[3.8.0,4.0.0)",
+ org.junit;bundle-version="[3.8.0,5.0.0)",
org.eclipse.jdt.launching,
org.eclipse.test.performance,
org.eclipse.wst.server.core,
