Bug 531352 - deprecate Axis 1.x bundles, but include them in pom reactor and update site

Signed-off-by: nickboldt <nboldt@redhat.com>

16 files changed, 29 insertions, 18 deletions

diff --git a/core/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
index cc40245a5..9d81b6501 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 1.0.550.qualifier
+Bundle-Version: 1.0.551.qualifier
 Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/core/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
index 89fddd435..4e4d844fe 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
+++ b/core/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
@@ -12,7 +12,7 @@
 #
 # Messages in plugin.xml.
 #
-PLUGIN_NAME=Web service Axis Consumption Core
+PLUGIN_NAME=Web service Axis Consumption Core (Deprecated)
 PLUGIN_PROVIDER=Eclipse Web Tools Platform
 
 xpWSDDContentType = Axis Web Service Deployment Descriptor
diff --git a/core/bundles/org.eclipse.jst.ws.axis.consumption.core/pom.xml b/core/bundles/org.eclipse.jst.ws.axis.consumption.core/pom.xml
index cee56b8c6..807c2a7e5 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.consumption.core/pom.xml
+++ b/core/bundles/org.eclipse.jst.ws.axis.consumption.core/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.jst.ws.axis.consumption.core</artifactId>

-  <version>1.0.550-SNAPSHOT</version>

+  <version>1.0.551-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
index bf8ae3eb5..22e01774b 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 1.0.900.qualifier
+Bundle-Version: 1.0.901.qualifier
 Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties b/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
index 320bc0f49..6fdbc60aa 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ b/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
@@ -12,7 +12,7 @@
 #
 # Messages in plugin.xml.
 #
-PLUGIN_NAME=Webservice Axis Consumption UI
+PLUGIN_NAME=Webservice Axis Consumption UI (Deprecated)
 PLUGIN_PROVIDER=Eclipse Web Tools Platform
 
 WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
diff --git a/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/pom.xml b/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/pom.xml
index 725f0a9b4..aa5d7716f 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/pom.xml
+++ b/core/bundles/org.eclipse.jst.ws.axis.consumption.ui/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.jst.ws.axis.consumption.ui</artifactId>

-  <version>1.0.900-SNAPSHOT</version>

+  <version>1.0.901-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/core/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
index 58e19683d..04b6d7cb4 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 1.0.900.qualifier
+Bundle-Version: 1.0.901.qualifier
 Bundle-Activator: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/core/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
index b18a79660..869d291f2 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ b/core/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
@@ -12,10 +12,10 @@
 #
 # Messages in plugin.xml.
 #
-PLUGIN_NAME=Webservice Axis Creation UI
+PLUGIN_NAME=Webservice Axis Creation UI (Deprecated)
 PLUGIN_PROVIDER=Eclipse Web Tools Platform
 
-LABEL_RUNTIME_AXIS_11=Apache Axis
+LABEL_RUNTIME_AXIS_11=Apache Axis (Deprecated)
 DESC_RUNTIME_AXIS_11=Apache Axis
 
 #
diff --git a/core/bundles/org.eclipse.jst.ws.axis.creation.ui/pom.xml b/core/bundles/org.eclipse.jst.ws.axis.creation.ui/pom.xml
index fe6bbbfc3..24c4a4d37 100644
--- a/core/bundles/org.eclipse.jst.ws.axis.creation.ui/pom.xml
+++ b/core/bundles/org.eclipse.jst.ws.axis.creation.ui/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.jst.ws.axis.creation.ui</artifactId>

-  <version>1.0.900-SNAPSHOT</version>

+  <version>1.0.901-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
index a670eca33..ff56574de 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
@@ -24,8 +24,9 @@
       <import plugin="org.eclipse.jst.validation.test"/>
       <import plugin="org.eclipse.jst.ws.tests"/>
       <import plugin="org.eclipse.jst.ws.tests.performance"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.core.tests"/>
       <import plugin="org.eclipse.jst.ejb.ui.tests"/>
-   </requires>
 
+      <!-- deprecated axis 1.x bundles -->
+      <import plugin="org.eclipse.jst.ws.axis.consumption.core.tests"/>
+   </requires>
 </feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index 02a432161..6dbfcfae3 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -25,12 +25,9 @@
       <import feature="org.eclipse.jst.enterprise_core.feature"/>
       <import plugin="org.eclipse.jst.ws"/>
       <import plugin="org.eclipse.jst.j2ee.ui"/>
-      <import plugin="org.eclipse.jst.ws.axis.creation.ui"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.ui"/>
       <import plugin="org.eclipse.jst.j2ee.jca.ui"/>
       <import plugin="org.eclipse.jst.j2ee.navigator.ui"/>
       <import plugin="org.eclipse.jst.j2ee.webservice.ui"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.core"/>
       <import plugin="org.eclipse.jst.servlet.ui"/>
       <import plugin="org.eclipse.jst.ws.ui"/>
       <import plugin="org.eclipse.jst.ws.uddiregistry"/>
@@ -54,5 +51,10 @@
       <import plugin="org.eclipse.jst.ejb.ui.infopop"/>
       <import plugin="org.eclipse.jst.ws.jaxrs.core"/>
       <import plugin="org.eclipse.jst.ws.jaxrs.ui"/>
+
+      <!-- deprecated axis 1.x bundles -->
+      <import plugin="org.eclipse.jst.ws.axis.consumption.core"/>
+      <import plugin="org.eclipse.jst.ws.axis.consumption.ui"/>
+      <import plugin="org.eclipse.jst.ws.axis.creation.ui"/>
    </requires>
 </feature>
diff --git a/core/pom.xml b/core/pom.xml
index 9034ff3bf..7a6f02d4e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,9 +31,12 @@
 
   <modules>
     <module>bundles/org.eclipse.jst.ws</module>
+
+    <!-- deprecated axis 1.x bundles -->
     <module>bundles/org.eclipse.jst.ws.axis.consumption.core</module>
     <module>bundles/org.eclipse.jst.ws.axis.consumption.ui</module>
     <module>bundles/org.eclipse.jst.ws.axis.creation.ui</module>
+
     <module>bundles/org.eclipse.jst.ws.consumption</module>
     <module>bundles/org.eclipse.jst.ws.consumption.ui</module>
     <module>bundles/org.eclipse.jst.ws.creation.ejb.ui</module>
@@ -71,7 +74,9 @@
     <module>docs/org.eclipse.wst.ws.infopop</module>
     <module>docs/org.eclipse.wst.wsi.ui.doc.user</module>
 
+      <!-- deprecated axis 1.x bundles -->
     <module>tests/org.eclipse.jst.ws.axis.consumption.core.tests</module>
+
     <module>tests/org.eclipse.jst.ws.tests</module>
     <module>tests/org.eclipse.jst.ws.tests.performance</module>
     <module>tests/org.eclipse.wst.wsdl.tests</module>
diff --git a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
index 1d64c8d24..438d2f24d 100644
--- a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core.tests
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
diff --git a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties
index 8ccd9189b..4ff0aae08 100644
--- a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties
+++ b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties
@@ -15,5 +15,5 @@
 #
 # Messages in plugin.xml.
 #
-PLUGIN_NAME=JST Web Services Axis Consumption Core Test
+PLUGIN_NAME=JST Web Services Axis Consumption Core Test (Deprecated)
 PLUGIN_PROVIDER=Eclipse Web Tools Platform
diff --git a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/pom.xml b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/pom.xml
index a7263e0e7..d2837255f 100644
--- a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/pom.xml
+++ b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.jst.ws.axis.consumption.core.tests</artifactId>

-  <version>1.0.200-SNAPSHOT</version>

+  <version>1.0.201-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/site/category.xml b/site/category.xml
index 8c6b02057..e648e4bd8 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -39,10 +39,13 @@
   <!-- missing junit4, comment out for now <bundle id="org.eclipse.wst.ws.service.policy.test"/> -->
   <bundle id="org.eclipse.jst.ws"/>
   <bundle id="org.eclipse.jst.ws.annotations.core"/>
+
+  <!-- deprecated axis 1.x bundles -->
   <bundle id="org.eclipse.jst.ws.axis.consumption.core"/>
   <bundle id="org.eclipse.jst.ws.axis.consumption.core.tests"/>
   <bundle id="org.eclipse.jst.ws.axis.consumption.ui"/>
   <bundle id="org.eclipse.jst.ws.axis.creation.ui"/>
+
   <bundle id="org.eclipse.jst.ws.axis.infopop"/>
   <bundle id="org.eclipse.jst.ws.axis.ui.doc.user"/>
   <bundle id="org.eclipse.jst.ws.axis2.consumption.core"/>