Consolidates different versions for Virgo modules into @VIRGO.VERSION@
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.core/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.core/feature.xml
index 5ebcdec..b53f5b1 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.core/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.core"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -26,20 +26,20 @@
          id="org.eclipse.virgo.nano.core"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.api"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.hot"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
 </feature>
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
index 0bfb8c9..9ad99fc 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.kernel.springintegration"
       label="%featureName"
-      version="@KERNEL.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
index 79750df..99e893b 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.eclipse.virgo.kernel"
 	label="%featureName"
-	version="@KERNEL.VERSION@"
+	version="@VIRGO.VERSION@"
 	provider-name="%providerName"
 	image="eclipse_update_120.jpg">
 
@@ -27,70 +27,70 @@
 		id="org.eclipse.virgo.kernel.deployer"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
    <plugin
 		id="org.eclipse.virgo.kernel.equinox.extensions"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="false"/>
 	<plugin
 		id="org.eclipse.virgo.repository"
 		download-size="0"
 		install-size="0"
-		version="@REPOSITORY.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.agent.dm"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.artifact"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.services"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.model"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.osgi"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.userregionfactory"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.kerneldmfragment"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"/>
 
 </feature>
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.management/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.management/feature.xml
index fc36f61..2009f56 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.management/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.management/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	  id="org.eclipse.virgo.management"
 	  label="%featureName"
-	  version="@KERNEL.VERSION@"
+	  version="@VIRGO.VERSION@"
 	  provider-name="%providerName"
 	  image="eclipse_update_120.jpg">
 
@@ -22,7 +22,7 @@
 		id="org.eclipse.virgo.management.fragment"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml
index d823c97..fa21d8c 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.medic"
       label="%featureName"
-      version="@MEDIC.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,26 +22,26 @@
          id="org.eclipse.virgo.medic"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.virgo.medic.core"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackcorefragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackclassicfragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="ch.qos.logback.classic"
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
index 02da194..7b10cdb 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.mbeans"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,14 +22,14 @@
     id="org.eclipse.virgo.util.jmx"
     download-size="0"
     install-size="0"
-    version="@UTIL.VERSION@"
+    version="@VIRGO.VERSION@"
     unpack="false"/>
     
    <plugin
          id="org.eclipse.virgo.nano.management"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml
index 788bcd9..a75bb84 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml
@@ -78,7 +78,7 @@
          id="org.eclipse.virgo.shell.command"
          download-size="0"
          install-size="0"
-         version="@KERNEL.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.core/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.core/feature.xml
index 5ebcdec..b53f5b1 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.core/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.core"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -26,20 +26,20 @@
          id="org.eclipse.virgo.nano.core"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.api"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.hot"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
 </feature>
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.kernel.httpservice/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.kernel.httpservice/feature.xml
index b787fae..3313583 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.kernel.httpservice/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.kernel.httpservice/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	  id="org.eclipse.virgo.kernel.httpservice"
 	  label="%featureName"
-	  version="@KERNEL.VERSION@"
+	  version="@VIRGO.VERSION@"
 	  provider-name="%providerName"
 	  image="eclipse_update_120.jpg">
 
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
index 0bfb8c9..9ad99fc 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.kernel.springintegration"
       label="%featureName"
-      version="@KERNEL.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
index 79750df..99e893b 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.eclipse.virgo.kernel"
 	label="%featureName"
-	version="@KERNEL.VERSION@"
+	version="@VIRGO.VERSION@"
 	provider-name="%providerName"
 	image="eclipse_update_120.jpg">
 
@@ -27,70 +27,70 @@
 		id="org.eclipse.virgo.kernel.deployer"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
    <plugin
 		id="org.eclipse.virgo.kernel.equinox.extensions"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="false"/>
 	<plugin
 		id="org.eclipse.virgo.repository"
 		download-size="0"
 		install-size="0"
-		version="@REPOSITORY.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.agent.dm"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.artifact"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.services"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.model"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.osgi"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.userregionfactory"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.kerneldmfragment"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"/>
 
 </feature>
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
index fc36f61..2009f56 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	  id="org.eclipse.virgo.management"
 	  label="%featureName"
-	  version="@KERNEL.VERSION@"
+	  version="@VIRGO.VERSION@"
 	  provider-name="%providerName"
 	  image="eclipse_update_120.jpg">
 
@@ -22,7 +22,7 @@
 		id="org.eclipse.virgo.management.fragment"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.medic/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.medic/feature.xml
index d823c97..fa21d8c 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.medic/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.medic/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.medic"
       label="%featureName"
-      version="@MEDIC.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,26 +22,26 @@
          id="org.eclipse.virgo.medic"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.virgo.medic.core"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackcorefragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackclassicfragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="ch.qos.logback.classic"
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
index 02da194..7b10cdb 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.mbeans"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,14 +22,14 @@
     id="org.eclipse.virgo.util.jmx"
     download-size="0"
     install-size="0"
-    version="@UTIL.VERSION@"
+    version="@VIRGO.VERSION@"
     unpack="false"/>
     
    <plugin
          id="org.eclipse.virgo.nano.management"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.shell/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.shell/feature.xml
index 788bcd9..a75bb84 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.shell/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.shell/feature.xml
@@ -78,7 +78,7 @@
          id="org.eclipse.virgo.shell.command"
          download-size="0"
          install-size="0"
-         version="@KERNEL.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
index 5ebcdec..b53f5b1 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.core"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -26,20 +26,20 @@
          id="org.eclipse.virgo.nano.core"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.api"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.hot"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
 </feature>
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml
index ac90aa3..91837f9 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.enterprise.derby"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml
index 8775c74..5ee170e 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.enterprise.jsf"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml
index 6b978af..80a2a41 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.enterprise.openejb"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml
index 4a4aeea..e083c4a 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.enterprise.persistence"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml
index a4ee22e..419e2cc 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.enterprise.xbean"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
index c4397ea..43aec4e 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
Binary files differ
diff --git a/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml
index d823c97..fa21d8c 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.medic"
       label="%featureName"
-      version="@MEDIC.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,26 +22,26 @@
          id="org.eclipse.virgo.medic"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.virgo.medic.core"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackcorefragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackclassicfragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="ch.qos.logback.classic"
diff --git a/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
index 13b0558..619cc8b 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.deployer"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -33,7 +33,7 @@
          id="org.eclipse.virgo.nano.deployer"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
 </feature>
diff --git a/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml
index 26f4436..598d243 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.mbeans.controller"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,7 +22,7 @@
          id="org.eclipse.virgo.nano.management.controller"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
index 02da194..7b10cdb 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.mbeans"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,14 +22,14 @@
     id="org.eclipse.virgo.util.jmx"
     download-size="0"
     install-size="0"
-    version="@UTIL.VERSION@"
+    version="@VIRGO.VERSION@"
     unpack="false"/>
     
    <plugin
          id="org.eclipse.virgo.nano.management"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml
index 01a54be..3430884 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.war.deployer"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -26,7 +26,7 @@
          id="org.eclipse.virgo.web.war.deployer"
          download-size="0"
          install-size="0"
-         version="@WEB.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml
index cd79073..bc40ec4 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.services.concurrent"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -23,7 +23,7 @@
         id="org.eclipse.virgo.nano.services.concurrent"
         download-size="0"
         install-size="0"
-        version="@NANO.VERSION@"
+        version="@VIRGO.VERSION@"
         unpack="false"
         autostart="true"/>
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml
index 637560c..00884ed 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.services.ds"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,7 +22,7 @@
         id="org.eclipse.virgo.nano.services.ds"
         download-size="0"
         install-size="0"
-        version="@NANO.VERSION@"
+        version="@VIRGO.VERSION@"
         unpack="false"
         autostart="true"/>
 
diff --git a/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml
index 0a8b503..6de552a 100755
--- a/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.webconsole.deps"
       label="%featureName"
-      version="@MNGMNT.CONSOLE.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,7 +22,7 @@
     id="org.eclipse.virgo.management.console"
     download-size="0"
     install-size="0"
-    version="@MNGMNT.CONSOLE.VERSION@"
+    version="@VIRGO.VERSION@"
     unpack="false"/-->
     
     <plugin
@@ -36,7 +36,7 @@
     id="org.eclipse.virgo.management.fragment"
     download-size="0"
     install-size="0"
-    version="@VIRGO.MNGMNT.FR.VERSION@"
+    version="@VIRGO.VERSION@"
     unpack="false"/>
     
     <plugin
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.core/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.core/feature.xml
index 5ebcdec..b53f5b1 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.core/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.core"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -26,20 +26,20 @@
          id="org.eclipse.virgo.nano.core"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.api"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
     <plugin
          id="org.eclipse.virgo.nano.deployer.hot"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
 </feature>
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
index 0bfb8c9..9ad99fc 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.kernel.springintegration"
       label="%featureName"
-      version="@KERNEL.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
index 79750df..99e893b 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.eclipse.virgo.kernel"
 	label="%featureName"
-	version="@KERNEL.VERSION@"
+	version="@VIRGO.VERSION@"
 	provider-name="%providerName"
 	image="eclipse_update_120.jpg">
 
@@ -27,70 +27,70 @@
 		id="org.eclipse.virgo.kernel.deployer"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
    <plugin
 		id="org.eclipse.virgo.kernel.equinox.extensions"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="false"/>
 	<plugin
 		id="org.eclipse.virgo.repository"
 		download-size="0"
 		install-size="0"
-		version="@REPOSITORY.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.agent.dm"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.artifact"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.services"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.model"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.osgi"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.userregionfactory"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	<plugin
 		id="org.eclipse.virgo.kernel.kerneldmfragment"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"/>
 
 </feature>
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.management/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.management/feature.xml
index fc36f61..2009f56 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.management/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.management/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	  id="org.eclipse.virgo.management"
 	  label="%featureName"
-	  version="@KERNEL.VERSION@"
+	  version="@VIRGO.VERSION@"
 	  provider-name="%providerName"
 	  image="eclipse_update_120.jpg">
 
@@ -22,7 +22,7 @@
 		id="org.eclipse.virgo.management.fragment"
 		download-size="0"
 		install-size="0"
-		version="@KERNEL.VERSION@"
+		version="@VIRGO.VERSION@"
 		unpack="false"
 		autostart="true"/>
 	
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml
index d823c97..fa21d8c 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.medic/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.medic"
       label="%featureName"
-      version="@MEDIC.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,26 +22,26 @@
          id="org.eclipse.virgo.medic"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.virgo.medic.core"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackcorefragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="org.eclipse.virgo.medic.logbackclassicfragment"
          download-size="0"
          install-size="0"
-         version="@MEDIC.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"/>
    <plugin
          id="ch.qos.logback.classic"
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
index 02da194..7b10cdb 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.virgo.nano.mbeans"
       label="%featureName"
-      version="@NANO.VERSION@"
+      version="@VIRGO.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,14 +22,14 @@
     id="org.eclipse.virgo.util.jmx"
     download-size="0"
     install-size="0"
-    version="@UTIL.VERSION@"
+    version="@VIRGO.VERSION@"
     unpack="false"/>
     
    <plugin
          id="org.eclipse.virgo.nano.management"
          download-size="0"
          install-size="0"
-         version="@NANO.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml
index 788bcd9..a75bb84 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.shell/feature.xml
@@ -78,7 +78,7 @@
          id="org.eclipse.virgo.shell.command"
          download-size="0"
          install-size="0"
-         version="@KERNEL.VERSION@"
+         version="@VIRGO.VERSION@"
          unpack="false"
          autostart="true"/>