Index: src/main/resources/content.xml
===================================================================
--- src/main/resources/content.xml	(revisione 1381877)
+++ src/main/resources/content.xml	(copia locale)
@@ -84,9 +84,7 @@
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
-          <instruction key='manifest'><![CDATA[
-            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator&#xA;Bundle-RequiredExecutionEnvironment: JavaSE-1.6&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.0.0,4.0.0)&quot;,org.eclipse.osgi.services;bundle-version=&quot;3.2.0&quot;,org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.pde.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.apache.commons.collections;bundle-version=&quot;3.2.0&quot;,org.jdom;bundle-version=&quot;1.0.0&quot;,org.apache.mina.core;bundle-version=&quot;2.0.0&quot;,org.fusesource.jansi;bundle-version=&quot;1.5.0&quot;,sshd-core;bundle-version=&quot;0.5.0&quot;&#xA;Bundle-Name: Eclipse Integration for Apache Karaf&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: info.evanchik.eclipse.karaf.core;singleton:=true&#xA;Bundle-Version: 0.5.3.2011org.aporg.apache.karaf.eik.corelipse.karaf.core,info.evanchik.ecorg.apache.karaf.eik.corenfo.evanchik.eclipse.korg.apache.karaf.eik.core,info.evanchik.eclipse.karaf.core.equinoorg.apache.karaf.eik.cororg.apache.karaf.eik.corese.karaf.core.moorg.apache.karaf.eik.corecore.shell
-          ]]></instruction>
+          <instruction key='manifest'><![CDATA[Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator&#xA;Bundle-RequiredExecutionEnvironment: JavaSE-1.6&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.0.0,4.0.0)&quot;,org.eclipse.osgi.services;bundle-version=&quot;3.2.0&quot;,org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.pde.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.apache.commons.collections;bundle-version=&quot;3.2.0&quot;,org.jdom;bundle-version=&quot;1.0.0&quot;,org.apache.mina.core;bundle-version=&quot;2.0.0&quot;,org.fusesource.jansi;bundle-version=&quot;1.5.0&quot;,sshd-core;bundle-version=&quot;0.5.0&quot;&#xA;Bundle-Name: Eclipse Integration for Apache Karaf&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.apache.karaf.eik.core;singleton:=true&#xA;Bundle-Version: 3.0.0]]></instruction>
         </instructions>
       </touchpointData>
     </unit>
@@ -900,7 +898,7 @@
         <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.workbench' range='3.0.0'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.core' range='3.0.0'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.ui' range='3.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.wtp.feature.feature.jar' range='3.0.0'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.feature' range='3.0.0'>
           <filter>
             (org.eclipse.update.install.features=true)
           </filter>
Index: site.xml
===================================================================
--- site.xml	(revisione 1381877)
+++ site.xml	(copia locale)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.apache.karaf.eik.feature_3.0.0.classifier.jar" id="org.apache.karaf.eik.feature" version="3.0.0.qualifier">
+   <feature url="features/org.apache.karaf.eik.feature_3.0.0.201209160624.jar" id="org.apache.karaf.eik.feature" version="3.0.0.201209160624">
       <category name="Eclipse Integration for Apache Karaf"/>
    </feature>
-   <feature url="features/org.apache.karaf.eik.jmx.feature_3.0.0.qualifier.jar" id="org.apache.karaf.eik.jmx.feature" version="3.0.0.qualifier">
+   <feature url="features/org.apache.karaf.eik.jmx.feature_3.0.0.201209160624.jar" id="org.apache.karaf.eik.jmx.feature" version="3.0.0.201209160624">
       <category name="Eclipse Integration for Apache Karaf"/>
    </feature>
-   <feature url="features/org.apache.karaf.eik.wtp.feature_3.0.0.qualifier.jar" id="org.apache.karaf.eik.wtp.feature" version="3.0.0.qualifier">
+   <feature url="features/org.apache.karaf.eik.wtp.feature_3.0.0.201209160624.jar" id="org.apache.karaf.eik.wtp.feature" version="3.0.0.201209160624">
       <category name="Eclipse Web Tools Platform Integration for Apache Karaf"/>
    </feature>
    <category-def name="Eclipse Integration for Apache Karaf" label="Eclipse Integration for Apache Karaf">
@@ -14,10 +14,5 @@
          Core functionality required to integrate Apache Karaf family of application servers inside the Eclipse IDE.
       </description>
    </category-def>
-   <category-def name="Eclipse Integration for Apache ServiceMix Kernel" label="Eclipse Integration for Apache ServiceMix Kernel">
-      <description>
-         Functionality required to execute application server distributions based on Apache ServiceMix Kernel
-      </description>
-   </category-def>
    <category-def name="Eclipse Web Tools Platform Integration for Apache Karaf" label="Eclipse Web Tools Platform Integration for Apache Karaf"/>
 </site>