You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/09/16 17:49:13 UTC

svn commit: r997802 [2/3] - in /servicemix/smx4/features/trunk: assembly/ assembly/src/main/distribution/text/etc/ assembly/src/main/filtered-resources/ assembly/src/main/filtered-resources/etc/ branding/ camel/ camel/servicemix-camel/ cxf/ cxf/cxf-bin...

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Thu Sep 16 15:49:11 2010
@@ -21,10 +21,10 @@
     <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
     <feature name="connector" version="${version}">
         <feature version="${aries.transaction.version}">transaction</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle> 
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle> 
         <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>                                 
         <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
         <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
@@ -34,42 +34,42 @@
     <feature name="cxf" version="${cxf.version}">
 		<feature>transaction</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
         <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj.impl.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
         <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2api.version}</bundle>
         <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-${jaxrs.api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-${jaxrs-api.version}/${servicemix.specs.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
+    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom.version}</bundle>
         <bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
         <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
     </feature>
     <feature name="cxf-osgi" version="${version}">
@@ -78,9 +78,9 @@
     </feature>
     <feature name="cxf-jaxrs" version="${version}">
         <feature version="${version}">cxf-osgi</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
         <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
     </feature>
     <feature name="cxf-nmr" version="${version}">
         <feature version="${cxf.version}">cxf</feature>
@@ -88,17 +88,14 @@
         <bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.nmr/${version}</bundle>
         <bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
     </feature>
-    
-
     <feature name="camel-nmr" version="${version}">
         <feature version="${camel.version}">camel</feature>
         <feature version="${servicemix.nmr.version}">nmr</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
     </feature>
-    
     <feature name="camel-activemq" version="${version}">
         <feature version="${activemq.version}">activemq</feature>
         <feature version="${camel.version}">camel-jms</feature>
@@ -121,7 +118,7 @@
     <feature name="examples-cxf-jaxrs" version="${version}">
         <feature version="${version}">cxf-jaxrs</feature>
         <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
     </feature>
     <feature name="examples-cxf-nmr" version="${version}">
@@ -151,8 +148,8 @@
         <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
     </feature>
     <feature name="examples-cxf-wsdl-first-osgi-package" version="${version}">
-        <feature version="${servicemix-cxf-bc-version}">servicemix-cxf-bc</feature>
-        <feature version="${servicemix-cxf-se-version}">servicemix-cxf-se</feature>
+        <feature version="${servicemix-cxf-bc.version}">servicemix-cxf-bc</feature>
+        <feature version="${servicemix-cxf-se.version}">servicemix-cxf-se</feature>
         <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/${version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/${version}</bundle>
@@ -167,167 +164,169 @@
     <feature name="examples-cxf-ws-rm" version="${version}">
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
     </feature>
+    
     <!--
       -
       -  JBI Components
       -
-      -->
-    <feature name="servicemix-shared" version="${servicemix-shared-version}">
+    -->
+      
+    <feature name="servicemix-shared" version="${servicemix-shared.version}">
         <feature version="${servicemix.nmr.version}">jbi</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
         <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix-shared-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix-shared.version}</bundle>
     </feature>
-    <feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <feature version="${cxf.version}">cxf</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
         <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>        
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix-cxf-bc-version}</bundle>
-    </feature>
-    <feature name="servicemix-file" version="${servicemix-file-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix-file-version}</bundle>
-    </feature>
-    <feature name="servicemix-ftp" version="${servicemix-ftp-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons-net.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp-version}</bundle>
-    </feature>
-    <feature name="servicemix-http" version="${servicemix-http-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>        
+        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix-cxf-bc.version}</bundle>
+    </feature>
+    <feature name="servicemix-file" version="${servicemix-file.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix-file.version}</bundle>
+    </feature>
+    <feature name="servicemix-ftp" version="${servicemix-ftp.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons-net.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp.version}</bundle>
+    </feature>
+    <feature name="servicemix-http" version="${servicemix-http.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http.version}</bundle>
     </feature>
-    <feature name="servicemix-jms" version="${servicemix-jms-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-jms" version="${servicemix-jms.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
         <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
         <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix-jms-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix-jms.version}</bundle>
     </feature>
-    <feature name="servicemix-mail" version="${servicemix-mail-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-mail" version="${servicemix-mail.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
         <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail.version}</bundle>
     </feature>
-    <feature name="servicemix-bean" version="${servicemix-bean-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean-version}</bundle>
+    <feature name="servicemix-bean" version="${servicemix-bean.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean.version}</bundle>
     </feature>
-    <feature name="servicemix-camel" version="${servicemix-camel-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-camel" version="${servicemix-camel.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <feature version="${camel.version}">camel</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix-camel-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix-camel.version}</bundle>
     </feature>
-    <feature name="servicemix-drools" version="${servicemix-drools-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt.core.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix-drools-version}</bundle>
+    <feature name="servicemix-drools" version="${servicemix-drools.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt-core.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix-drools.version}</bundle>
     </feature>
-    <feature name="servicemix-cxf-se" version="${servicemix-cxf-se-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-cxf-se" version="${servicemix-cxf-se.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <feature version="${cxf.version}">cxf</feature>
         <bundle>mvn:org.apache.cxf/cxf-rt-bindings-jbi/${cxf.version}</bundle>
         <bundle>mvn:org.apache.cxf/cxf-rt-transports-jbi/${cxf.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix-cxf-se-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix-cxf-se.version}</bundle>
     </feature>
-    <feature name="servicemix-eip" version="${servicemix-eip-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix-eip-version}</bundle>
-    </feature>
-    <feature name="servicemix-osworkflow" version="${servicemix-osworkflow-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscore/${oscore.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.propertyset/${propertyset.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.osworkflow/${osworkflow.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix-osworkflow-version}</bundle>
-    </feature>
-    <feature name="servicemix-quartz" version="${servicemix-quartz-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.version}</bundle>
+    <feature name="servicemix-eip" version="${servicemix-eip.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix-eip.version}</bundle>
+    </feature>
+    <feature name="servicemix-osworkflow" version="${servicemix-osworkflow.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
+    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscore/${oscore.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.propertyset/${propertyset.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.osworkflow/${osworkflow.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix-osworkflow.version}</bundle>
+    </feature>
+    <feature name="servicemix-quartz" version="${servicemix-quartz.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
         <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix-quartz-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix-quartz.version}</bundle>
     </feature>
-    <feature name="servicemix-scripting" version="${servicemix-scripting-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-scripting" version="${servicemix-scripting.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.groovy/${groovy.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.groovy/${groovy.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby.bundle.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix-scripting-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix-scripting.version}</bundle>
     </feature>
-    <feature name="servicemix-validation" version="${servicemix-validation-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix-validation-version}</bundle>
-    </feature>
-    <feature name="servicemix-saxon" version="${servicemix-saxon-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix-saxon-version}</bundle>
+    <feature name="servicemix-validation" version="${servicemix-validation.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix-validation.version}</bundle>
+    </feature>
+    <feature name="servicemix-saxon" version="${servicemix-saxon.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix-saxon.version}</bundle>
     </feature>
-    <feature name="servicemix-wsn2005" version="${servicemix-wsn2005-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+    <feature name="servicemix-wsn2005" version="${servicemix-wsn2005.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
         <feature version="${activemq.version}">activemq</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005.version}</bundle>
     </feature>
-    <feature name="servicemix-snmp" version="${servicemix-snmp-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix-snmp-version}</bundle>
-    </feature>
-    <feature name="servicemix-vfs" version="${servicemix-vfs-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix-vfs-version}</bundle>
-    </feature>
-    <feature name="servicemix-smpp" version="${servicemix-smpp-version}">
-        <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix-smpp-version}</bundle>
-    </feature>
-    <feature name="servicemix-exec" version="${servicemix-exec-version}">
-         <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-         <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix-exec-version}</bundle>
+    <feature name="servicemix-snmp" version="${servicemix-snmp.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix-snmp.version}</bundle>
+    </feature>
+    <feature name="servicemix-vfs" version="${servicemix-vfs.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix-vfs.version}</bundle>
+    </feature>
+    <feature name="servicemix-smpp" version="${servicemix-smpp.version}">
+        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix-smpp.version}</bundle>
+    </feature>
+    <feature name="servicemix-exec" version="${servicemix-exec.version}">
+         <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+         <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix-exec.version}</bundle>
     </feature>
     
     <!-- Default broker configuration -->

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml Thu Sep 16 15:49:11 2010
@@ -19,13 +19,13 @@
 <features>
     <feature name="openjpa" version="${openjpa.version}">
         <feature>transaction</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/2.0.0_1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa.bundle.version}</bundle>
         <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
         <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
         <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
@@ -37,19 +37,19 @@
         <feature>spring-dm</feature>
         <feature>jbi</feature>
         <feature version="${openjpa.version}">openjpa</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxen/${jaxen.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxen/${jaxen.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
         <bundle>mvn:org.tranql/tranql-connector/${tranql.version}</bundle>
         <bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
         <bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
     </feature>
 </features>

Modified: servicemix/smx4/features/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/branding/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/branding/pom.xml (original)
+++ servicemix/smx4/features/trunk/branding/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,7 +30,7 @@
     <artifactId>org.apache.servicemix.features.branding</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Branding Support</name>
+    <name>Apache ServiceMix :: Features :: Branding Support</name>
 
     <build>
         <resources>

Modified: servicemix/smx4/features/trunk/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>camel</artifactId>
     <packaging>pom</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Features :: Camel</name>
+    <name>Apache ServiceMix :: Features :: Camel Support</name>
 
     <repositories>
       <repository>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>org.apache.servicemix.camel.component</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Camel Component</name>
+    <name>Apache ServiceMix :: Features :: Camel Support :: Component</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,7 +30,7 @@
     <artifactId>org.apache.servicemix.cxf.binding.nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix CXF Binding for NMR</name>
+    <name>Apache ServiceMix :: Features :: CXF Support :: Binding For NMR</name>
 
     <dependencies>
         <dependency>
@@ -58,12 +58,12 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
-            <version>${geronimo.annotation.version}</version>
+            <version>${geronimo-annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>${depends.maven.plugin.version}</version>
+                <version>${depends-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>

Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,7 +30,7 @@
     <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix CXF Transport for NMR</name>
+    <name>Apache ServiceMix :: Features :: CXF Support :: Transport For NMR</name>
 
     <dependencies>
         <dependency>
@@ -46,17 +46,17 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
-            <version>${geronimo.annotation.version}</version>
+            <version>${geronimo-annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>${geronimo.servlet.version}</version>
+            <version>${geronimo-servlet.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
@@ -111,7 +111,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>${depends.maven.plugin.version}</version>
+                <version>${depends-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>

Modified: servicemix/smx4/features/trunk/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,7 +30,7 @@
     <artifactId>cxf</artifactId>
     <packaging>pom</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix CXF Support</name>
+    <name>Apache ServiceMix :: Features :: CXF Support</name>
 
     <modules>
         <module>cxf-transport-nmr</module>

Modified: servicemix/smx4/features/trunk/deps/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/deps/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/deps/pom.xml (original)
+++ servicemix/smx4/features/trunk/deps/pom.xml Thu Sep 16 15:49:11 2010
@@ -38,18 +38,18 @@
   <artifactId>org.apache.servicemix.features.deps</artifactId>
   <packaging>pom</packaging>
   <version>4.3.0-SNAPSHOT</version>
-  <name>Apache ServiceMix Dependencies</name>
+  <name>Apache ServiceMix :: Features :: Dependencies</name>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
-      <version>${antlr2.version}</version>
+      <version>${antlr2.bundle.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-      <version>${commons-pool.version}</version>
+      <version>${commons-pool.bundle.version}</version>
     </dependency>
   </dependencies>
 

Modified: servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,23 +30,23 @@
     <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
     <artifactId>bridge-camel-sa</artifactId>
     <packaging>jbi-service-assembly</packaging>
-    <name>ServiceMix :: Examples :: Bridge :: Camel :: SA</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: SA</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
             <artifactId>bridge-http-su</artifactId>
-            <version>4.3.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
             <artifactId>bridge-camel-su</artifactId>
-            <version>4.3.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
             <artifactId>bridge-jms-su</artifactId>
-            <version>4.3.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge-camel/bridge-camel-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,7 +30,8 @@
     <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
     <artifactId>bridge-camel-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Examples :: Bridge :: Camel :: SU</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: Camel SU</name>
+    
     <properties>
       <componentName>servicemix-camel</componentName>
     </properties>

Modified: servicemix/smx4/features/trunk/examples/bridge-camel/bridge-http-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge-camel/bridge-http-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge-camel/bridge-http-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge-camel/bridge-http-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,13 +30,13 @@
     <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
     <artifactId>bridge-http-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge Camel:: HTTP</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: HTTP SU</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-http</artifactId>
-            <version>${servicemix-http-version}</version>
+            <version>${servicemix-http.version}</version>
         </dependency>
     </dependencies>
 
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge-camel/bridge-jms-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge-camel/bridge-jms-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge-camel/bridge-jms-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge-camel/bridge-jms-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,13 +30,13 @@
     <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
     <artifactId>bridge-jms-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge Camel:: JMS</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: JMS SU</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jms</artifactId>
-            <version>${servicemix-jms-version}</version>
+            <version>${servicemix-jms.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-            <version>1.0.1</version>
+            <version>${geronimo-j2ee-management.version}</version>
         </dependency>
     </dependencies>
 
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge-camel/client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge-camel/client/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge-camel/client/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge-camel/client/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
     <artifactId>bridge-camel-client</artifactId>
-    <name>ServiceMix :: Samples :: Bridge :: Camel :: Client</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: Client</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/bridge-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge-camel/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge-camel/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.examples</groupId>
     <artifactId>bridge-camel</artifactId>
-    <name>ServiceMix :: Examples :: Bridge :: Camel</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel</name>
     <packaging>pom</packaging>
     
     <modules>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven.assembly.version}</version>
+                <version>${maven-assembly-plugin.version}</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>

Modified: servicemix/smx4/features/trunk/examples/bridge/bridge-eip-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/bridge-eip-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/bridge-eip-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/bridge-eip-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,13 +30,13 @@
     <groupId>org.apache.servicemix.examples.bridge</groupId>
     <artifactId>bridge-eip-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: EIP</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: EIP SU</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-eip</artifactId>
-            <version>${servicemix-eip-version}</version>
+            <version>${servicemix-eip.version}</version>
         </dependency>
     </dependencies>
 
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge/bridge-http-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/bridge-http-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/bridge-http-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/bridge-http-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,13 +30,13 @@
     <groupId>org.apache.servicemix.examples.bridge</groupId>
     <artifactId>bridge-http-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: HTTP</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: HTTP SU</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-http</artifactId>
-            <version>${servicemix-http-version}</version>
+            <version>${servicemix-http.version}</version>
         </dependency>
     </dependencies>
 
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge/bridge-jms-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/bridge-jms-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/bridge-jms-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/bridge-jms-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,13 +30,13 @@
     <groupId>org.apache.servicemix.examples.bridge</groupId>
     <artifactId>bridge-jms-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: JMS</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: JMS SU</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jms</artifactId>
-            <version>${servicemix-jms-version}</version>
+            <version>${servicemix-jms.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-            <version>1.0.1</version>
+            <version>${geronimo-j2ee-management.version}</version>
         </dependency>
     </dependencies>
 
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge/bridge-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/bridge-sa/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/bridge-sa/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/bridge-sa/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,7 +30,7 @@
     <groupId>org.apache.servicemix.examples.bridge</groupId>
     <artifactId>bridge-sa</artifactId>
     <packaging>jbi-service-assembly</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: SA</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: SA</name>
 
     <dependencies>
         <dependency>
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge/bridge-xslt-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/bridge-xslt-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/bridge-xslt-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/bridge-xslt-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -30,13 +30,13 @@
     <groupId>org.apache.servicemix.examples.bridge</groupId>
     <artifactId>bridge-xslt-su</artifactId>
     <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: XSLT</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: XSLT SU</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-saxon</artifactId>
-            <version>${servicemix-saxon-version}</version>
+            <version>${servicemix-saxon.version}</version>
         </dependency>
     </dependencies>
 
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/bridge/client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/client/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/client/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/client/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.examples.bridge</groupId>
     <artifactId>bridge-client</artifactId>
-    <name>ServiceMix :: Samples :: Bridge :: Client</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: Client</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/bridge/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.examples</groupId>
     <artifactId>bridge</artifactId>
-    <name>ServiceMix :: Samples :: Bridge</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Bridge</name>
     <packaging>pom</packaging>
     
     <modules>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>camel-nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: Camel NMR</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Camel NMR</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>camel-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: Camel OSGi</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Camel OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml Thu Sep 16 15:49:11 2010
@@ -27,13 +27,13 @@
   <groupId>org.apache.servicemix.examples.camel</groupId>
   <artifactId>camel-sa</artifactId>
   <packaging>jbi-service-assembly</packaging>
-  <name>ServiceMix :: Samples :: Camel :: SA</name>
+  <name>Apache ServiceMix :: Features :: Examples :: Camel :: SA</name>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-camel</artifactId>
-      <version>${servicemix-camel-version}</version>      
+      <version>${servicemix-camel.version}</version>      
     </dependency> 
     <dependency>
       <groupId>org.apache.servicemix.examples.camel</groupId>
@@ -46,11 +46,8 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-jbi-plugin-version}</version> 
+        <version>${jbi-maven-plugin.version}</version> 
         <extensions>true</extensions>
-        <configuration>
-          <type>service-assembly</type>         
-        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml Thu Sep 16 15:49:11 2010
@@ -27,7 +27,7 @@
   <groupId>org.apache.servicemix.examples.camel</groupId>
   <artifactId>camel-simple-su</artifactId>
   <packaging>jbi-service-unit</packaging>
-  <name>ServiceMix :: Samples :: Camel :: Simple SU</name>
+  <name>Apache ServiceMix :: Features :: Examples :: Camel :: Camel Simple SU</name>
   <properties>
      <componentName>servicemix-camel</componentName>
   </properties>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-camel</artifactId>      
-      <version>${servicemix-camel-version}</version>     
+      <version>${servicemix-camel.version}</version>     
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-jbi-plugin-version}</version>
+        <version>${jbi-maven-plugin.version}</version>
         <extensions>true</extensions>
       </plugin> 
     </plugins>

Modified: servicemix/smx4/features/trunk/examples/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel/pom.xml Thu Sep 16 15:49:11 2010
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.servicemix.examples</groupId>
     <artifactId>camel</artifactId>
-    <name>ServiceMix :: Samples :: Camel</name>
+    <name>Apache ServiceMix :: Features :: Examples :: Camel</name>
     <packaging>pom</packaging>
     
     <modules>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-jbi-plugin-version}</version>
+                <version>${jbi-maven-plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>cxf-camel-nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF-Camel NMR</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF-Camel NMR</name>
 
     <dependencies>
         <dependency>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,13 +31,13 @@
     <artifactId>cxf-jaxrs</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF JAX-RS OSGI</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF JAX-RS OSGI</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
-            <version>1.3.0</version>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
@@ -48,7 +48,7 @@
        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-            <version>${commons-httpclient.version}</version>
+            <version>${commons-httpclient.bundle.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,13 +31,13 @@
     <artifactId>cxf-nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF NMR</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF NMR</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,13 +31,13 @@
     <artifactId>cxf-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF OSGi</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF OSGi</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>cxf-ws-addressing</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF WS-ADDRESSING OSGI</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF WS-Addressing OSGI</name>
 
     <dependencies>
         <dependency>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,13 +31,13 @@
     <artifactId>cxf-ws-rm</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF WS-RM</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF WS-RM OSGi</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml Thu Sep 16 15:49:11 2010
@@ -31,7 +31,7 @@
     <artifactId>cxf-ws-security-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.3.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF WS SECURITY OSGi</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF WS-Security OSGi</name>
 
     
     <dependencies>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>

Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.examples.cxf-wsdl-first-osgi-package</groupId>
     <artifactId>wsdl-first-client</artifactId>
-    <name>ServiceMix :: Samples :: WSDL first :: Client</name>
+    <name>Apache ServiceMix :: Features :: Examples :: WSDL First OSGi Package :: Client</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml Thu Sep 16 15:49:11 2010
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.servicemix.examples</groupId>
     <artifactId>cxf-wsdl-first-osgi-package</artifactId>
-    <name>ServiceMix :: Samples :: CXF WSDL first Osgi Package</name>
+    <name>Apache ServiceMix :: Features :: Examples :: CXF WSDL First OSGi Package</name>
     <packaging>pom</packaging>
     
     <!-- Add ServiceMix repositories for snaphots and releases -->

Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
     <groupId>org.apache.servicemix.examples.cxf-wsdl-first-osgi-package</groupId>
     <artifactId>wsdl-first-cxfbc-bundle</artifactId>
     <packaging>bundle</packaging>
-    <name>ServiceMix :: Samples :: WSDL first :: CXF BC BUNDLE</name>
+    <name>Apache ServiceMix :: Features :: Examples :: WSDL First OSGi Package :: CXF BC Bundle</name>
 
     <dependencies>
         <dependency>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
     <groupId>org.apache.servicemix.examples.cxf-wsdl-first-osgi-package</groupId>
     <artifactId>wsdl-first-cxfse-bundle</artifactId>
     <packaging>bundle</packaging>
-    <name>ServiceMix :: Samples :: WSDL first :: CXF SE BUNDLE</name>
+    <name>Apache ServiceMix :: Features :: Examples :: WSDL First OSGi Package :: CXF SE Bundle</name>
 
     <dependencies>
         <dependency>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
+            <version>${geronimo-ws-metadata.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first/client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first/client/pom.xml?rev=997802&r1=997801&r2=997802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first/client/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first/client/pom.xml Thu Sep 16 15:49:11 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
     <artifactId>wsdl-first-client</artifactId>
-    <name>ServiceMix :: Samples :: WSDL first :: Client</name>
+    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: Client</name>
 
     <dependencies>
         <dependency>