diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 41d1a2c..d540d31 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -126,7 +126,7 @@
     <files>
         <file>
             <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>system/org/apache/servicemix/features/${artifactId}/${version}</outputDirectory>
+            <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
             <destName>${artifactId}-${version}-features.xml</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index d0f1438..40af783 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -115,7 +115,7 @@
     <files>
         <file>
             <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>system/org/apache/servicemix/features/${artifactId}/${version}</outputDirectory>
+            <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
             <destName>${artifactId}-${version}-features.xml</destName>
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
index e60cd8b..3d4b48c 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
@@ -20,7 +20,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${servicemix.kernel.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix.features/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.features/${version}/xml/features
+featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${servicemix.kernel.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.features/${version}/xml/features
 
 #
 # Comma separated list of features to install at startup
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index a1fae09..a134532 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -65,6 +65,8 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.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.wss4j/${wss4j.version}</bundle>
         <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
     </feature>
     <feature name="cxf-osgi" version="${version}">
@@ -152,8 +154,6 @@
         <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.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.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>
diff --git a/examples/camel-nmr/README.txt b/examples/camel-nmr/README.txt
index ffe8e15..6482baa 100644
--- a/examples/camel-nmr/README.txt
+++ b/examples/camel-nmr/README.txt
@@ -56,7 +56,7 @@
   features/uninstall examples-camel-nmr
 
 As well, you can view the log entries in the ServiceMix log:
-  log d
+  log/d
 
 How does it work?
 -----------------
diff --git a/examples/camel-osgi/README.txt b/examples/camel-osgi/README.txt
index 50f4210..9ecabda 100644
--- a/examples/camel-osgi/README.txt
+++ b/examples/camel-osgi/README.txt
@@ -57,7 +57,7 @@
   features/uninstall examples-camel-osgi
 
 As well, you can view ExampleRouter log entries in the ServiceMix log:
-  log d
+  log/d
 
 You also can update and redeploy properties file which is used by the properties
 placeholder in the beans.xml from console.
diff --git a/examples/camel/README.txt b/examples/camel/README.txt
index d7e9f16..46e2d69 100644
--- a/examples/camel/README.txt
+++ b/examples/camel/README.txt
@@ -37,8 +37,8 @@
 - using the ServiceMix console:
    osgi/install -s mvn:org.apache.servicemix.examples.camel/camel-sa/${version}/zip
 
-When the example is deployed, use 'log d' on the ServiceMix console to see the logged messages
-  Exchange[Message: Hello World!]
+When the example is deployed, use 'log/d' on the ServiceMix console to see the logged messages
+  Exchange[BodyType:String, Body:Hello World!]
   
 For more information on running this example please see:
   http://servicemix.apache.org/camel-example.html
diff --git a/examples/cxf-camel-nmr/README.txt b/examples/cxf-camel-nmr/README.txt
index 433febc..d06d447 100644
--- a/examples/cxf-camel-nmr/README.txt
+++ b/examples/cxf-camel-nmr/README.txt
@@ -51,7 +51,7 @@
   features/uninstall examples-cxf-camel-nmr
 
 You can also examine the ServiceMix log to see the activity:
-  log display
+  log/display
 
 How does it work?
 -----------------
diff --git a/examples/simple/README.txt b/examples/simple/README.txt
index 31260de..e03339b 100644
--- a/examples/simple/README.txt
+++ b/examples/simple/README.txt
@@ -41,9 +41,9 @@
 Hello, I got an input message <?xml version="1.0" encoding="UTF-8" standalone="no"?><timer><name>{http://servicemix.apache.org/examples/groovy}service:endpoint</name><group>DEFAULT</group><fullname>DEFAULT.{http://servicemix.apache.org/examples/groovy}service:endpoint</fullname><description/><fireTime>Fri Aug 08 13:50:16 CEST 2008</fireTime></timer>
 
 
-When the quartz.xml file is copied to the deploy directory, you can use the 'log d' command in the console to see this output in the log files:
+When the quartz.xml file is copied to the deploy directory, you can use the 'log/d' command in the console to see this output in the log files:
 
-14:04:53,709 | INFO  | x-camel-thread-3 | test                             | rg.apache.camel.processor.Logger   88 | Exchange[null]
+14:15:51,202 | INFO  | x-camel-thread-4 | test                             | rg.apache.camel.processor.Logger   88 | Exchange[BodyType:javax.xml.transform.dom.DOMSource, Body:<timer><name>{http://servicemix.apache.org/examples/camel}service:endpoint</name><group>DEFAULT</group><fullname>DEFAULT.{http://servicemix.apache.org/examples/camel}service:endpoint</fullname><description/><fireTime>Mon Mar 23 14:15:51 CST 2009</fireTime></timer>]
 
 
 How does it work?
diff --git a/examples/simple/groovy.xml b/examples/simple/groovy.xml
index 64fd302..da0ea62 100644
--- a/examples/simple/groovy.xml
+++ b/examples/simple/groovy.xml
@@ -35,12 +35,13 @@
 
     <quartz:endpoint service="b:service" endpoint="endpoint" targetService="b:receiver">
        <quartz:trigger>
-          <quartz:simple repeatCount="500" repeatInterval="1000" startDelay="2000" />
+          <quartz:simple name="groovy-trigger" repeatCount="500" repeatInterval="1000" startDelay="2000" />
        </quartz:trigger>
     </quartz:endpoint>
 
     <scripting:endpoint service="b:receiver" endpoint="endpoint" 
                         script="document-name:myscript"
+                        disableOutput="true"
                         language="groovy" />
 	
     <bean id="myscript" class="org.apache.servicemix.document.factory.DocumentFactory">
@@ -57,12 +58,6 @@
            println exchange;       
            def inputMessage = new SourceTransformer().toString(inMessage.getContent());
            println "Hello, I got an input message " + inputMessage;
-           NormalizedMessage out = exchange.createMessage();
-           out.setContent(new StringSource("&lt;response>" + bindings.get("answerGroovy") + "&lt;/response>"));
-           exchange.setMessage(out, "out");
-           println exchange;
-
-           println "Stopping JSR-223 groovy processor";
         </value>
       </property>
     </bean>