225006 axis2 tools should be opitonal feature
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.consumption.core/.cvsignore
index 7722bc8..26ec56e 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/.cvsignore
@@ -1,2 +1,4 @@
 build.xml
 javaCompiler...args
+@dot
+org.eclipse.jst.ws.axis2.consumption.core_1.0.102.200804020204.jar
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore
index 7722bc8..1164467 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore
@@ -1,2 +1,4 @@
 build.xml
 javaCompiler...args
+@dot
+org.eclipse.jst.ws.axis2.consumption.ui_1.0.101.200804020204.jar
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/.classpath b/bundles/org.eclipse.jst.ws.axis2.core/.classpath
index 304e861..64c5e31 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/.classpath
+++ b/bundles/org.eclipse.jst.ws.axis2.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.core/.cvsignore
index 7722bc8..d519e16 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.axis2.core/.cvsignore
@@ -1,2 +1,4 @@
 build.xml
 javaCompiler...args
+@dot
+org.eclipse.jst.ws.axis2.core_1.0.102.200804020204.jar
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
index 0b78fe3..4a15cf3 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
@@ -34,3 +34,4 @@
  org.eclipse.jst.ws.axis2.core.plugin.messages,
  org.eclipse.jst.ws.axis2.core.utils
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.creation.core/.cvsignore
index 7722bc8..660a5b8 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/.cvsignore
@@ -1,2 +1,4 @@
 build.xml
 javaCompiler...args
+@dot
+org.eclipse.jst.ws.axis2.creation.core_1.0.102.200804020204.jar
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore
index 7722bc8..949926c 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore
@@ -1,2 +1,4 @@
 build.xml
 javaCompiler...args
+@dot
+org.eclipse.jst.ws.axis2.creation.ui_1.0.102.200804020204.jar
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore
index 7722bc8..060adcf 100644
--- a/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore
+++ b/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore
@@ -1,2 +1,4 @@
 build.xml
 javaCompiler...args
+@dot
+org.eclipse.jst.ws.axis2.ui_1.0.201.200804020204.jar
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/.cvsignore b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/.cvsignore
index 5e1193f..b404608 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/.cvsignore
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/.cvsignore
@@ -1,4 +1,2 @@
-org.eclipse.jst.ws.axis.ui.doc.user_1.0.0.jar
-bak
-temp
 build.xml
+org.eclipse.jst.ws.axis2.ui.doc.user_*
diff --git a/features/org.eclipse.jst.ws.axis2tools.feature/.cvsignore b/features/org.eclipse.jst.ws.axis2tools.feature/.cvsignore
new file mode 100644
index 0000000..b1d6d30
--- /dev/null
+++ b/features/org.eclipse.jst.ws.axis2tools.feature/.cvsignore
@@ -0,0 +1,2 @@
+build.xml
+feature.temp.folder
diff --git a/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml b/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml
index b55cc3c..f1ec0f0 100644
--- a/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml
@@ -2,20 +2,27 @@
 <feature
       id="org.eclipse.jst.ws.axis2tools.feature"
       label="Axis2 Tools"
-      version="2.0.0">
+      version="1.0.0.qualifier"
+      provider-name="Eclipse.org">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description>
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      %copyright
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="license.html">
+      %license
    </license>
 
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+   </url>
+
+
    <plugin
          id="org.eclipse.jst.ws.axis2.core"
          download-size="0"
diff --git a/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml
index cdd7156..d74294e 100644
--- a/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml
@@ -2,20 +2,28 @@
 <feature
       id="org.eclipse.jst.ws.axis2tools_sdk.feature"
       label="Feature Feature"
-      version="2.0.0">
+      version="1.0.0.qualifier"      
+      provider-name="Eclipse.org">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description>
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      %copyright
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="license.html">
+      %license
    </license>
 
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+   </url>
+
+
+
    <includes
          id="org.eclipse.jst.ws.axis2tools.feature"
          version="0.0.0"/>