Old modules removed
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
deleted file mode 100644
index 0f133fa..0000000
--- a/RELEASE-NOTES
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one or more

- * contributor license agreements.  See the NOTICE file distributed with

- * this work for additional information regarding copyright ownership.

- * The ASF licenses this file to You under the Apache License, Version 2.0

- * (the "License"); you may not use this file except in compliance with

- * the License.  You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-                      Apache ServiceMix 4.5.2

-                  ================================

- Overview

- --------

-

-Apache ServiceMix 4.5.2 is a minor release of the OSGi based ServiceMix ESB platform.  This release picks up new versions of

-Apache Camel and Apache Karaf.  It also contains a few bug fixes.

-

-ServiceMix 4.5.2 includes the following major dependency versions:

-- Apache ActiveMQ 5.7.0 (http://activemq.apache.org)

-- Activiti 5.10 (http://www.activiti.org)

-- Apache Camel 2.10.6 (http://camel.apache.org)

-- Apache CXF 2.6.8 (http://cxf.apache.org)

-- Apache Karaf 2.2.11 (http://karaf.apache.org)

-- Apache ServiceMix NMR 1.6.1

-- Apache ServiceMix JBI Components 2013.01

-

- Changelog

- ---------

-

-Release Notes - ServiceMix 4 - Version 4.5.2

-

-** Bug

-    * [SMX4-1381] - cannot install servicemix-drools feature

-    * [SMX4-1423] - No org.apache.cxf.jaxws.spi.ProviderImpl found 

-    * [SMX4-1424] - Use official org.jruby:jruby lib

-    * [SMX4-1448] - Activiti repository URL missing in Pax URL Maven configuration

-    * [SMX4-1451] - Upgrade to Karaf 2.2.11

-    * [SMX4-1455] - drools install error

-    * [SMX4-1472] - servicemix-camel component should honor the synchronous option 

-    * [SMX4-1486] - Update to Camel 2.10.5

-

-** Improvement

-    * [SMX4-1378] - cxf-nmr trasport should copy the message header  from CXF the Protocol Header

-    * [SMX4-1452] - introduce a throwExceptionOnFailure parameter for camel-nmr producer endpoint

-

-** Task

-    * [SMX4-1453] - Excessive logging in CXF NMR binding and transport

-    * [SMX4-1487] - Release Apache ServiceMix 4.5.2

-

-

-

-                      Apache ServiceMix 4.5.1

-                  ================================

- Overview

- --------

-

-Apache ServiceMix 4.5.1 is a minor release of the OSGi based ServiceMix ESB platform.  This release picks up new versions of

-Apache Camel and Apache CXF.  It also contains a few bug fixes/

-

-ServiceMix 4.5.1 includes the following major dependency versions:

-- Apache ActiveMQ 5.7.0 (http://activemq.apache.org)

-- Activiti 5.10 (http://www.activiti.org)

-- Apache Camel 2.10.4 (http://camel.apache.org)

-- Apache CXF 2.6.6 (http://cxf.apache.org)

-- Apache Karaf 2.2.10 (http://karaf.apache.org)

-- Apache ServiceMix NMR 1.6.0

-- Apache ServiceMix JBI Components 2013.01

-

- Changelog

- ---------

-

-** Bug

-    * [SMX4-1286] - Replace camel-activemq with activemq-camel

-    * [SMX4-1380] - Exception when using CXF/SAAJ in ServiceMix 4.5.0

-    * [SMX4-1399] - incorrect readme.txt files in cxf examples

-    * [SMX4-1401] - cxf-ws-security-blueprint log4j warning + wrong README info

-    * [SMX4-1405] - NMR example is broken

-

-** Task

-    * [SMX4-1318] - upgrade to cxf 2.6.6

-    * [SMX4-1388] - Release Apache ServiceMix 4.5.1

-

-

-                      Apache ServiceMix 4.5.0

-                  ================================

- Overview

- --------

-

-Apache ServiceMix 4.5.0 is a major release of the OSGi based ServiceMix ESB platform.  This release contains many

-bugfixes and feature enhancements over the 4.5.0 release.  New features include support for Activiti and a JMS log

-appender implementation.

-

-ServiceMix 4.5.0 includes the following major dependency upgrades:

-- Apache ActiveMQ 5.7.0 (http://activemq.apache.org)

-- Activiti 5.10 (http://www.activiti.org)

-- Apache Camel 2.10.3 (http://camel.apache.org)

-- Apache CXF 2.6.3 (http://cxf.apache.org)

-- Apache Karaf 2.2.10 (http://karaf.apache.org)

-- Apache ServiceMix NMR 1.6.0

-- Apache ServiceMix JBI Components 2013.01

-

- Changelog

- ---------

-

-** Bug

-    * [SMX4-537] - Startup script (bin/servicemix) misconfigures java.ext.dirs, breaking things like SSL in CXF

-    * [SMX4-784] - activemq:list/activemq:query/activemq:bstat command doesn't work

-    * [SMX4-1013] - Port already in use warning message in JBI assembly

-    * [SMX4-1084] - ServiceMix won't boot when Felix 4.0.x is used

-    * [SMX4-1094] - feature connector can't be load cause aries.version is not defined

-    * [SMX4-1150] - Unable to install examples-cxf-jaxrs feature

-    * [SMX4-1172] - upgrade to cxf 2.6.1

-    * [SMX4-1193] - servicemix-shared feature is not self-contained

-    * [SMX4-1204] - remove unnecessary runtime dependency for camel-nmr component

-    * [SMX4-1206] - JBI configuration present in non-JBI assemblies

-    * [SMX4-1207] - minimal kit by default will install activemq-broker.xml bundle

-    * [SMX4-1258] - servicemix-saxon feature is missing dependencies

-    * [SMX4-1271] - WarDeployer tries to load README file

-    * [SMX4-1272] - Error installing 'connector' and 'activiti' features

-    * [SMX4-1273] - cxf-nmr trasport should copy the message header which value is String as the Protocol Header

-    * [SMX4-1276] - At examples-activiti-camel startup get  has *ERROR* Configuration

-    * [SMX4-1277] - ResourceManager in activemq-broker.xml doesn't recover from TX after crash

-    * [SMX4-1278] - Jetty logging to console

-    * [SMX4-1285] - Activiti camel Test failed Order process lookup.

-    * [SMX4-1287] - nmr toc has broken link

-    * [SMX4-1314] -  CXF NMR transport throws NPE when it handles the fault message

-    * [SMX4-1315] - Can't install servicemix-drools feature

-    * [SMX4-1317] - activemq-broker.xml should be given start-level 50

-    * [SMX4-1342] - Cxf examples that need org.apache.commons.httpclient does not start

-

-** Improvement

-    * [SMX4-1019] - Remove README file from deploy directory to avoid WarDeployer error message on TRACE

-    * [SMX4-1037] - some bundle miss dependency="true" in cxf-jaxrs feature

-    * [SMX4-1107] - Added cxf blueprint examples

-    * [SMX4-1108] - Upgrade CXF version to 2.5.2

-    * [SMX4-1120] - remove some uncessary features

-    * [SMX4-1132] - cxf-ws-security-osgi/blueprint example should use smx/smx by default

-    * [SMX4-1145] - add a new cxf ws-security example which demonstrate how to use signaturePropRefId in OSGi container

-    * [SMX4-1179] - remove unecessary annotations from cxf nmr transport

-    * [SMX4-1187] - Upgrade to XBean 3.11.1

-    * [SMX4-1191] - Add support for Activiti

-    * [SMX4-1224] - remove jetty6 bundle from  kit

-    * [SMX4-1256] - Add Logstash event message format to JMS appender

-    * [SMX4-1262] - remove jre.properties.cxf from SMX distribution

-    * [SMX4-1313] - Add EnableCORSInterceptor for cxf related examples

-    * [SMX4-1316] - add address/endpintName for dispatch process for CXF NMR transport

-    * [SMX4-1319] - use StreamSource but not DOMSource for cxf-nmr-transport

-    * [SMX4-1320] - missing features for cxf-jaxrs-blueprint and cxf-jaxws-blueprint example

-    * [SMX4-1338] - Upgrade to Karaf 2.2.10

-

-** Task

-    * [SMX4-1004] - upgrade to cxf 2.5.1

-    * [SMX4-1005] - upgrade to camel 2.9

-    * [SMX4-1022] - wrap the smack bundle 3.2.1

-    * [SMX4-1032] - add twitter4j-core and twitter4j-stream 2.2.5 bundle

-    * [SMX4-1036] - Create Bundler wrap of saxon 9.3.0.11

-    * [SMX4-1109] - upgrade to wss4j 1.6.5 and xmlsec 1.5.1

-    * [SMX4-1115] - Align jdom version with Camel

-    * [SMX4-1128] - Upgrade to Karaf 2.2.7

-    * [SMX4-1129] - Upgrade to Camel 2.9.2

-    * [SMX4-1130] - Upgrade to CXF 2.5.3

-    * [SMX4-1131] - Upgrade to ActiveMQ 5.6.0

-    * [SMX4-1134] - Upgrade to Camel 2.10.x

-    * [SMX4-1135] - Upgrade to CXF 2.6.x

-    * [SMX4-1146] - AWS SDK 1.3.10 bundle

-    * [SMX4-1194] - Align http client version with Camel

-    * [SMX4-1225] - upgrade to cxf 2.6.2

-    * [SMX4-1227] - upgrade to camel 2.10.1

-    * [SMX4-1228] - upgrade to spring 3.0.7.RELEAS

-    * [SMX4-1241] - upgrade to karaf 2.2.9

-    * [SMX4-1242] - endorse the smx spec api jar

-    * [SMX4-1257] - Release Apache ServiceMix 4.5.0

-    * [SMX4-1263] - upgrade to activemq 5.7.0

-    * [SMX4-1267] - upgrade to cxf 2.6.3

-    * [SMX4-1274] - upgrade to activiti 5.10

-    * [SMX4-1275] - Add Activiti examples to the release

-    * [SMX4-1323] - upgrade to saxon 9.3.0.11

-

-** Wish

-    * [SMX4-944] - Provide a SMX test jar

-

-

-                      Apache ServiceMix 4.4.0

-                  ================================

- Overview

- --------

-

-Apache ServiceMix 4.4.0 is a major release of the OSGi based ServiceMix ESB platform.  This release contains many

-bugfixes and feature enhancements over the 4.3.0 release.  ServiceMix 4.4.0 includes the following major dependency upgrades:

-

-- Apache ActiveMQ 5.5.1 (http://activemq.apache.org)

-- Apache Camel 2.8.3 (http://camel.apache.org)

-- Apache CXF 2.4.4 (http://cxf.apache.org)

-- Apache Karaf 2.2.4 (http://karaf.apache.org)

-- Apache ServiceMix NMR 1.5.0

-- Apache ServiceMix JBI Components 2011.02

-

- Changelog

- ---------

-

-** Sub-task

-    * [SMX4-220] - Extend the help command to display usefull help for all commands available

-    * [SMX4-221] - The option --help on commands doesn't display good enough help

-    * [SMX4-721] - Add complete distribution for offline deployments

-    * [SMX4-884] - Rename existing assembly to apache-servicemix-4.x.0-jbi

-    * [SMX4-885] - Add a basic distribution for new users

-    * [SMX4-955] - Add minimal distribution to allow building any ServiceMix-based distribution

-

-** Bug

-    * [SMX4-206] - Apache ServiceMix 4 binary assembly zip file is not valid

-    * [SMX4-246] - Avoid duplication of config files for NMR and Features assembly build

-    * [SMX4-458] - Command activemq:list, activemq:browse return null

-    * [SMX4-461] - Test failures in SMX4 Features' project on AIX

-    * [SMX4-480] - Files in deploy folder before initial startup are getting deployed before boot features

-    * [SMX4-518] - Camel NMR component WSSecurityTest fails

-    * [SMX4-687] - ServiceMix 4.3.0-fuse-02-00 does not start correctly with fresh unzip on Windows

-    * [SMX4-737] - Components Not Loading Before Routes

-    * [SMX4-751] - Property replacement is broken in camel-blueprint examples

-    * [SMX4-768] - bin/client script missing from Linux distribution

-    * [SMX4-771] - simple example use out-of-date DocumentFactory

-    * [SMX4-774] - artchetypes for servicemix-cxf-code-first-osgi-bundle and servicemix-cxf-code-first-osgi-bundle doesn't work

-    * [SMX4-780] -  omit client script in bin folder

-    * [SMX4-797] - Create OSGi bundle for RJC (Redis Java Client)

-    * [SMX4-804] - ensure some bundle could be installed with OBR resolver

-    * [SMX4-821] - wsdl4j bundle shouldn't import javax.wsdl as itself export it

-    * [SMX4-853] - Simple quartz.xml example caue intermittent exception

-    * [SMX4-867] - the endorsed xml-api jar can't correctly load org.apache.xpath.jaxp.XPathFactoryImpl class

-    * [SMX4-869] - Missing class reference in the log:display output

-    * [SMX4-873] - system bundle should export xerces and xalan package as we already endorse those jar

-    * [SMX4-897] - reuse woodstox feature but not list seperate bundle

-    * [SMX4-907] - BOM marker in camel-osgi Spring XML file not handled well on CI server

-    * [SMX4-922] - Not all content of branding.properties is shown

-    * [SMX4-926] - should add org.ops4j.pax.web.config.file properties to etc/org.ops4j.pax.web.cfg

-    * [SMX4-932] - system.properties miss karaf.admin.role property

-    * [SMX4-940] - ServiceMix features depends on non-existent version of geronimo servlet spec.

-    * [SMX4-948] - Build failure when building with a clean maven repository (unable to determine JBI component)

-    * [SMX4-962] - servicemix xstream 1.4.1 bundle incorrectly refer xstream 1.4

-    * [SMX4-967] - remove saaj feature from add-features-to-repo

-    * [SMX4-968] - distribution kit miss org.apache.karaf.features.obr bundles which cause startup failed

-    * [SMX4-969] - features itests depends on old karaf management jar

-    * [SMX4-980] - rename etc/org.ops4j.pax.web.cfg to etc/org.ops4j.pax.web.cfg.empty.stub

-    * [SMX4-987] - simple/quartz.xml example output doesn't comply with the README

-    * [SMX4-993] - The link to the FuseSource commercial documentation is broken

-    * [SMX4-996] - examples won't build with clean Maven local repo

-

-** Improvement

-    * [SMX4-219] - The help of the shell commands is wrong or not sufficient and needs improvement

-    * [SMX4-446] - Update Feature file of SMX4 to use HTTP feature of karaf and same version of jetty as camel feature file

-    * [SMX4-572] - Cleanup POMs and provide a better build

-    * [SMX4-597] - Use Camel feature

-    * [SMX4-654] - Improve features.xml to leverage OBR improvements in Karaf

-    * [SMX4-659] - Create bundle for jSch 0.1.44

-    * [SMX4-722] - Update POMs to Maven3

-    * [SMX4-727] - Consider dropping commons-logging for standard Java.util.logging

-    * [SMX4-744] - specify camel feature bundle start level less than 60

-    * [SMX4-772] - add configuration stub file for SSL pax-web suport for ease of users

-    * [SMX4-775] - Provide assembly in JAR packaging as well

-    * [SMX4-777] - Upgrade to Jetty 7.3.1.v20110307

-    * [SMX4-778] - Rework the smx4 build to have better dependency handling

-    * [SMX4-787] - Upgrade to ActiveMQ 5.5.1

-    * [SMX4-791] - Make allowCoreThreadTimeOut name consistent across mbeans and properties

-    * [SMX4-792] - Support run as subject for Camel NMR endpoint

-    * [SMX4-793] - Support run as subject for CXF NMR endpoint

-    * [SMX4-798] - Ensure OBR support is available before boot features are installed

-    * [SMX4-799] - use the latest xerces to replace the jaxp-ri-1.4.4 to resolve cocurrent issue

-    * [SMX4-801] - update a set of bundle version

-    * [SMX4-802] - use features.xml from cxf

-    * [SMX4-805] - Ignore the sun saaj package from the org.osgi.framework.bootdelegation

-    * [SMX4-808] - Ignore the sun jaxb package from the org.osgi.framework.bootdelegation

-    * [SMX4-809] - camel-cache ehcache cache repilication using ehcache-jmsreplication

-    * [SMX4-812] - Upgrade FreeMarker to 2.3.16

-    * [SMX4-815] - upgrade to cxf 2.4.0

-    * [SMX4-825] - Support timeout property on Camel NMR endpoints

-    * [SMX4-836] - Upgrade FreeMarker to 2.3.17

-    * [SMX4-837] - Upgrade FreeMarker to 2.3.18

-    * [SMX4-846] - Upgrade to Jetty 7.4.1.v20110513

-    * [SMX4-852] - Add 'karaf-framework' to boot features to avoid uninstalling core Karaf bundles

-    * [SMX4-854] - add avalon-framework-api bundle

-    * [SMX4-855] - create avalon-framework-impl bundle

-    * [SMX4-863] - upgrade to jetty 7.4.2.v20110526

-    * [SMX4-870] - ">>>> JavaDSL set body:" displayed but not noted in the Camel/OSGi example's README.txt file

-    * [SMX4-871] - README.txt file incomplete for "simple" example in regards to the wsn.xml file.

-    * [SMX4-877] - create wrap bundle for axiom API and Impl 1.2.12

-    * [SMX4-882] - specify start-level as 50 for default installed jbi component features which ensure jbi component related bundle can get started before customer bundles when restart OSGi container

-    * [SMX4-883] - Alter packaging options to better reflect common use cases

-    * [SMX4-899] - xerces and xalan SPI factory package should be added in custom.properties org.osgi.framework.bootdelegation

-    * [SMX4-900] - add camel-blueprint as default installed feature

-    * [SMX4-910] - install activemq-web-console feature should work out of the box

-    * [SMX4-911] - use system properties to define activemq url

-    * [SMX4-923] - add activemq-spring feature to featuresBoot

-    * [SMX4-924] - should ship servlet api 2.5 but not servlet api 3.0

-    * [SMX4-931] - Sample project module elements are missing from top-level POM.

-    * [SMX4-938] - features.xml should reuse jetty feature from karaf

-    * [SMX4-939] - Refactor features build to be independent of NMR build

-    * [SMX4-943] - Camel NMR producer is not registered with its keyName but using the UUID

-    * [SMX4-956] - Monitor etc/activemq-broker.xml for changes

-    * [SMX4-957] - Add a name attribute to the features descriptors

-    * [SMX4-960] - extract servicemix-soap and servicemix-soap2 bundle into servicemix-shared feature

-    * [SMX4-966] - Connection refused to embedded broker when starting up

-    * [SMX4-978] - Upgrade to Camel 2.8.3

-    * [SMX4-979] - add specs feature to featuresBoot list ensure the specs bundle are available in time

-    * [SMX4-981] - Reorganize examples by technology

-    * [SMX4-988] - should add delay to camel timer of  camel-nmr and camel-nmr-blueprint example so that the nmr endpoint get chance to create

-    * [SMX4-989] - create demo using Camel and local ActiveMQ broker

-    * [SMX4-998] - cleanup cxf related examples to remove unnecessary package/resource import and Required-Bundle

-    * [SMX4-999] - enhance cxf-ws-security-osgi example to leverage cxf JAASLoginInterceptor to authenticate against karaf default jaas configuration

-    * [SMX4-1002] - Use SLF4J instead of Java standard logging for CXF in SMX

-    * [SMX4-1008] - let cxf-ws-rm example use http osgi transport

-

-** New Feature

-    * [SMX4-776] - Create OSGi bundle for Perf4j

-    * [SMX4-786] - Add a struts2-core and struts-xwork bundles for SMX project

-    * [SMX4-794] - Provide a convenience POM for users

-

-** Task

-    * [SMX4-752] - Switch to use slf4j as logger (instead of commons-logging)

-    * [SMX4-770] - Update to Karaf 2.2.0

-    * [SMX4-781] - Upgrade to Camel 2.7

-    * [SMX4-785] - upgrade to cxf 2.3.3

-    * [SMX4-795] - Update to CXF 2.4.0

-    * [SMX4-816] - Create JBoss Netty 3.2.4 bundle

-    * [SMX4-820] - Create Bundle for cometd java server 2.1.1

-    * [SMX4-834] - upgrade karaf version to 2.2.1

-    * [SMX4-851] - Velocity bundle - Add dynamic imports so the #parse macro can load the resource

-    * [SMX4-856] - Upgrade to Java Mail 1.4.4

-    * [SMX4-858] - Quartz 2.0.1 bundle

-    * [SMX4-861] - upgrade to cxf 2.4.1

-    * [SMX4-876] - Upgrade to Karaf 2.2.2

-    * [SMX4-880] - Release Apache ServiceMix 4.4.0

-    * [SMX4-881] - Upgrade to Groovy 1.8.0

-    * [SMX4-887] - Upgrade to Quartz 1.8.5

-    * [SMX4-888] - Upgrade to Camel 2.8.0

-    * [SMX4-896] - upgrade to cxf 2.4.2

-    * [SMX4-902] - upgrade to cxf 2.4.2

-    * [SMX4-903] - upgrade to jetty 7.4.5.v20110725

-    * [SMX4-905] - Create a scala 2.9.1 bundle

-    * [SMX4-906] - upgrade xmlsec and opensaml bundle version

-    * [SMX4-908] - Upgrade to Camel 2.8.1

-    * [SMX4-912] - upgrade to spring-dm 1.2.1

-    * [SMX4-916] - upgrade to cxf 2.4.4

-    * [SMX4-942] - upgrade to spring 3.0.6

-    * [SMX4-952] - upgrade axiom version to 1.2.12

-    * [SMX4-961] - XStream 1.4.2 bundle

-    * [SMX4-995] - use same version of jsr311 as cxf 2.4.4

-

-

-

-                      Apache ServiceMix 4.3.0

-                  ================================

- Overview

- --------

-

-Apache ServiceMix 4.3.0 is a major release of the OSGi based ServiceMix ESB platform.  This release contains many

-bugfixes and feature enhancements over the 4.2.0 release.  ServiceMix 4.3.0 includes the following dependencies:

-

-- Apache Felix Karaf 2.1.3 (http://karaf.apache.org)

-  A lightweight OSGi container built on top of Apache Felix OSGi framework.  Karaf provides much of the core OSGi

-  functionality and features (SSH shell, console commands, provisioning, blueprint XML support, etc...)

-

-- Apache ServiceMix NMR 1.4.0

-  An OSGi based NMR and JBI container, with a new clustering engine ready for enterprise deployment

-

-- Apache ServiceMix Components 2011.01

-  OSGi and JBI compatible components for common integration bindings such as FTP, HTTP, JMS, etc. as well as

-  service engines such as Camel (Enterprise Integration Patterns), Quartz, JSR-223 Scripting, etc.

-

-ServiceMix 4.3.0 also ships with a web console for administering and deploying endpoints and components,

-additional OSGi bundles, and configuration files.  We also include support for running outof the box web applications

-via WAR file deployment.  This release includes preliminary implementations of the OSGi Enterprise Specification 4.2

-and includes support for OSGi fragment bundles.  OSGi framework support defauls to Apache Felix, but can be changed

-via a simple configuration paramater to use Eclipse Equinox.

-

- Java 1.5.0 support

- ------------------

-To be able to run ServiceMix 4.3.0 using Java 1.5.0, you need to remove jaxp-ri-1.4.4.jar from the lib/endorsed folder.

-

- Changelog

- ---------

-The following list shows the bug fixes and enhancements included in this release.

-

-Release Notes - ServiceMix 4 - Version 4.3.0

-

-** Sub-task

-* [SMX4-543] - Improve Camel NMR component to leverage async camel routing

-

-** Bug

-* [SMX4-398] - openjpa bundle should import the transaction package without optional flag

-* [SMX4-415] - need add josql bundle to activemq feature

-* [SMX4-417] - calling <setHeader> with <groovy> expression can delete message and headers

-* [SMX4-455] - activemq feature missing dependencies; fails to start two bundles without camel-cxf installed

-* [SMX4-489] - ServiceMix 4.x/ Fuse 4.2 hangs when using command dev:show-tree

-* [SMX4-519] - Allow configuring Camel NMR endpoint to bypass thread pool for handling exchanges

-* [SMX4-520] - NMR Destination should check Exchange Status and Mep Pattern

-* [SMX4-522] - Camel NMR component: reponse NMR message contains reference to itself in property

-* [SMX4-527] - cxf nmr transport should copy over property headers and attachment between cxf message and nmr message

-* [SMX4-530] - servicemix-vfs fails with sftp

-* [SMX4-539] - Inconsistent use of Endpoint.INTERFACE_NAME in cxf nmr transport

-* [SMX4-541] - Jetty bundles export package is not correct

-* [SMX4-548] - remove javax.script package from config.properties for jre export package

-* [SMX4-561] - Servicemix flatpack component is missing the default fpconvert.properties, causing NullPointerException

-* [SMX4-564] - stacktrace dumped on console when shutdown smx

-* [SMX4-578] - Ensure that SecuritySubject is properly conveyed by cxf-nmr transport

-* [SMX4-581] - xpp3 bundle is missing META-INF/services/org.xmlpull.v1.XmlPullParserFactory needed to support zero configuation operation mode

-* [SMX4-585] - incorrect MTOM message for NMR transport

-* [SMX4-602] - Update Karaf jre package

-* [SMX4-608] - Drools package doesn't export org.drools.runtime.rule

-* [SMX4-648] - Camel NMR component does not propagate Exception when using an InOnly MEP

-* [SMX4-649] - config:* commands not available out-of-the-box

-* [SMX4-652] - camel example doesn't work

-* [SMX4-674] - ActiveMQ 5.4.1 feature has a missing dependency

-* [SMX4-706] - specify version for cxf-codegen-plugin in pluginManagement to avoid downloading latest snapshot cxf-codegen-plugin

-* [SMX4-708] - NMR adds null header in Camel Exchange ?

-* [SMX4-709] - Features pom contains duplicate dependency declaration

-* [SMX4-711] - check Exception from Camel Exchange at very first place to honor asyn processor in camel 2.5

-* [SMX4-720] - Several poms contain old JIRA URL

-* [SMX4-729] - "Ather URL Handler not available" messages in the log file

-* [SMX4-735] - Problem on install camel-cxf component for unresolved dependency org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api_1.0/1.6.0

-* [SMX4-739] - add nmr features.xml dependency to make the kit build pass

-* [SMX4-748] - Improve logging policy to avoid impact on performances

-* [SMX4-749] - JBI deployer version range is not up to date

-* [SMX4-760] - JAXB API and implementation version mismatch in Camel features descriptor

-* [SMX4-761] - cxf-osgi example miss a package import which cause it fail with felix

-* [SMX4-763] - Remove examples/web from the distribution

-* [SMX4-764] - Override Apache Felix Framework version to 3.0.8 in the distribution

-* [SMX4-765] - ServiceMix doesn't start with Java 1.5.0

-

-** Improvement

-* [SMX4-512] - Upgrade to ActiveMQ 5.3.1

-* [SMX4-523] - Use Camel Synchronization to ensure NMR exchange can be handled asynchronously

-* [SMX4-531] - Update the jsmpp bundle to 2.1.0

-* [SMX4-534] - Add quartz 1.8.1 bundle

-* [SMX4-536] - Add Quartz 1.8.2 bundle

-* [SMX4-538] - Add quartz 1.8.3 bundle

-* [SMX4-544] - Update poms to not have warnings with Maven 3

-* [SMX4-551] - upgrade to spring 3.x

-* [SMX4-552] - Upgrade to ActiveMQ 5.4

-* [SMX4-556] - Wrap the jaxb impl 2.1.13

-* [SMX4-560] - Prepare the upgrade to ActiveMQ 5.4.0

-* [SMX4-562] - Update flatpack to 3.2.0

-* [SMX4-565] - Upgrade to Karaf 2.0.0

-* [SMX4-567] - Normalize SMX4 naming convention of resources

-* [SMX4-573] - Rome bundle should try to load the configure file from local bundle classloader as a fallback

-* [SMX4-576] - Ensure that Subject is properly conveyed by camel-nmr component

-* [SMX4-579] - extract common used classes for itests

-* [SMX4-584] - Upgrade to the latest release of ServiceMix Bundles

-* [SMX4-586] - The Camel examples uses @deprecated namespace

-* [SMX4-588] - refactor NMRMessageHelper to use new api from cxf StaxUtis

-* [SMX4-591] - Upgrade to ActveMQ 5.4.0

-* [SMX4-592] - Add hibernate-validator 4.1.0.Final bundle

-* [SMX4-598] - HSQLDB bundles.

-* [SMX4-599] - Create drools-5.1.1 bundle with minimal set of dependencies

-* [SMX4-600] - Create antlr-runtime 3.2 bundle

-* [SMX4-601] - Upgrade to Karaf 2.1.0

-* [SMX4-603] - Upgrade to Camel 2.5.0

-* [SMX4-604] - Upgrade to CXF 2.2.11

-* [SMX4-606] - Make the executors/threadpool viewable as JMX mbeans

-* [SMX4-660] - Create OSGi wrap bundle for Jetty 6.1.25

-* [SMX4-667] - Upgrade to JAXP 1.4.4

-* [SMX4-673] - Upgrade to Karaf 2.1.1

-* [SMX4-676] - Upgrade to Karaf 2.1.2

-* [SMX4-689] - Upgrade to ActiveMQ 5.4.2

-* [SMX4-710] - Add Camel NMR blueprint example

-* [SMX4-713] - upgrade to cxf 2.3.1

-* [SMX4-716] - Upgrade to SMX components 2010.02

-* [SMX4-719] - Make camel-blueprint feature installed by default

-* [SMX4-728] - Add a Camel blueprint example

-* [SMX4-738] - remove org.apache.camel.osgi package import for camel-osgi example

-* [SMX4-740] - JAXB-IMPL 2.1.13 Release

-* [SMX4-741] - Upgrade to Karaf 2.1.3

-* [SMX4-742] - Upgrade to Spring 3.0.5.RELEASE

-* [SMX4-745] - Upgrade to Camel 2.6.0

-* [SMX4-746] - Upgrade to CXF 2.3.2

-* [SMX4-754] - Upgrade to ServiceMix Components 2011.01

-* [SMX4-755] - Upgrade to ServiceMix NMR 1.4.0

-* [SMX4-757] - Upgrade to Apache ODE 1.3.5

-* [SMX4-766] - Upgrade to Felix Framework 3.0.9

-

-** New Feature

-* [SMX4-558] - Add a wrap bundle of xmlbeans 2.5.0

-* [SMX4-559] - Add the wrap bundle of jsch-0.1.43

-* [SMX4-590] - Create OSGi bundle for Jasypt 1.6

-* [SMX4-614] - Documentation: Add a Getting Started Guide

-* [SMX4-675] - Bundles for Mongo DB

-

-** Task

-* [SMX4-524] - upgrade to cxf 2.2.7

-* [SMX4-528] - upgrade to cxf 2.2.8

-* [SMX4-533] - upgrade to cxf 2.2.9

-* [SMX4-542] - Upgrade to Camel 2.4.0

-* [SMX4-545] - Update SMX to use aries version of blueprint and latest Felix/Karaf stuff that also uses aries

-* [SMX4-547] - upgrade to use new karaf artifacts

-* [SMX4-553] - Upgrade to google protobuf 2.3.0

-* [SMX4-557] - Upgrade to Velocity 1.6.4

-* [SMX4-563] - upgrade aries to 0.1-r964701

-* [SMX4-574] - add commons-digester-1.8 bundle

-* [SMX4-575] - add commons-configuration-1.4 bundle

-* [SMX4-582] - upgrade to activemq 5.4

-* [SMX4-587] - upgrade to cxf 2.2.10

-* [SMX4-593] - Create Bundles for SIP API and RI.

-* [SMX4-607] - downgrade geronimo-annotation version to 1.0 from 1.1

-* [SMX4-613] - Create a wrap bundle dozer 5.3.0

-* [SMX4-668] - Upgrade to MVEL 2.0.18

-* [SMX4-671] - add scala 2.8.1 bundle

-* [SMX4-672] - Create a wrap bundle for Jetty 6.1.26

-* [SMX4-707] - Fix the camel-nmr failed unit tests

-

-** Test

-* [SMX4-554] - fix itests failure

-* [SMX4-568] - add cxf mtom test

-* [SMX4-650] - fix loan-broker-drools-su test failure

-* [SMX4-651] - add osgi service property for itests test client

-

-** Wish

-* [SMX4-540] - Jetty bundle 6.1.24

-

-

-See the README file for more general informations about ServiceMix 4.

-

-Thanks you for downloading ServiceMix.  Enjoy !

-

-The ServiceMix Team

-http://servicemix.apache.org/team.html

-

diff --git a/activiti/activiti-config/pom.xml b/activiti/activiti-config/pom.xml
deleted file mode 100644
index 0d78294..0000000
--- a/activiti/activiti-config/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>activiti</artifactId>
-        <groupId>org.apache.servicemix.activiti</groupId>
-        <version>4.6.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.activiti.config</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Activiti Support :: Activiti Configuration</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.activiti</groupId>
-            <artifactId>activiti-camel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.activiti</groupId>
-            <artifactId>activiti-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.activiti</groupId>
-            <artifactId>activiti-osgi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>*</Import-Package>
-                        <Export-Package>org.apache.servicemix.activiti.config.*</Export-Package>
-                        <Bundle-Description>${project.description}</Bundle-Description>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/activiti/activiti-config/src/main/java/org/apache/servicemix/activiti/config/CamelAwareELResolver.java b/activiti/activiti-config/src/main/java/org/apache/servicemix/activiti/config/CamelAwareELResolver.java
deleted file mode 100644
index 5c6db0a..0000000
--- a/activiti/activiti-config/src/main/java/org/apache/servicemix/activiti/config/CamelAwareELResolver.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.activiti.config;
-
-import org.activiti.camel.CamelBehaviour;
-import org.activiti.camel.ContextProvider;
-import org.activiti.osgi.blueprint.BlueprintELResolver;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Custom EL resolver that allows Activiti to interact with routes that have been defined in CamelContexts
- * for which a ContextProvider has been registered in the service registry.
- *
- * All these CamelContext instances will be available through a single CamelBehaviour bean that you can access
- * with the EL expression ${camel} in your business process definitions.
- */
-public class CamelAwareELResolver extends BlueprintELResolver {
-
-    public static final String CAMEL_PROPERTY_NAME = "camel";
-    private final List<ContextProvider> providers = new LinkedList<ContextProvider>();
-    private final CamelBehaviour camelBehaviour = new CamelBehaviour(providers);
-
-    @Override
-    public Object getValue(org.activiti.engine.impl.javax.el.ELContext context, Object base, Object property) {
-        if (base == null && property != null && property instanceof String) {
-            String key = (String) property;
-            if (CAMEL_PROPERTY_NAME.endsWith(key)) {
-                context.setPropertyResolved(true);
-                return camelBehaviour;
-            }
-        }
-        return super.getValue(context, base, property);
-    }
-
-    /**
-     * Add a context provider to the global ${camel} variable
-     *
-     * @param provider the context provider
-     */
-    public void addContextProvider(ContextProvider provider) {
-        providers.add(provider);
-    }
-
-    /**
-     * Remove a context provider from the global ${camel} variable
-     *
-     * @param provider the context provider
-     */
-    public void removeContextProvider(ContextProvider provider) {
-        providers.remove(provider);
-    }
-
-    /**
-     * Access the {@link CamelBehaviour} instance that is being returned
-     *
-     * @return the {@link CamelBehaviour} instance
-     */
-    protected CamelBehaviour getCamelBehaviour() {
-        return camelBehaviour;
-    }
-}
diff --git a/activiti/activiti-config/src/main/resources/OSGI-INF/blueprint/activiti-config.xml b/activiti/activiti-config/src/main/resources/OSGI-INF/blueprint/activiti-config.xml
deleted file mode 100644
index 08fa882..0000000
--- a/activiti/activiti-config/src/main/resources/OSGI-INF/blueprint/activiti-config.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
-
-    <ext:property-placeholder />
-
-    <!--
-      Setting up the process engine configuration, using an embedded H2 database together with our default Aries
-      transaction manager.
-    -->
-    <bean id="dataSource" class="org.h2.jdbcx.JdbcDataSource">
-        <property name="URL" value="jdbc:h2:file:${karaf.data}/activiti/database;DB_CLOSE_ON_EXIT=FALSE"/>
-        <property name="user" value="sa"/>
-        <property name="password" value=""/>
-    </bean>
-
-    <reference id="transactionManager" interface="javax.transaction.TransactionManager"/>
-
-    <bean id="configuration" class="org.activiti.engine.impl.cfg.JtaProcessEngineConfiguration" ext:field-injection="true">
-        <property name="databaseType" value="h2"/>
-        <property name="dataSource" ref="dataSource"/>
-        <property name="transactionManager" ref="transactionManager"/>
-        <property name="databaseSchemaUpdate" value="true"/>
-        <property name="transactionsExternallyManaged" value="true" />
-    </bean>
-
-    <!--
-      Set up the custom resolver implementation to ease integration with Camel routes
-    -->
-    <bean id="resolver" class="org.apache.servicemix.activiti.config.CamelAwareELResolver"/>
-
-    <reference-list availability="optional" interface="org.activiti.camel.ContextProvider">
-        <reference-listener ref="resolver" bind-method="addContextProvider" unbind-method="removeContextProvider" />
-    </reference-list>
-
-    <reference-list availability="optional" interface="org.activiti.engine.delegate.JavaDelegate">
-        <reference-listener ref="resolver" bind-method="bindService" unbind-method="unbindService" />
-    </reference-list>
-
-    <!--
-      Set up the Activiti process engine itself
-    -->
-    <bean id="processEngineFactory" class="org.activiti.osgi.blueprint.ProcessEngineFactoryWithELResolver" init-method="init" destroy-method="destroy">
-        <property name="processEngineConfiguration" ref="configuration"/>
-        <property name="bundle" ref="blueprintBundle"/>
-        <property name="blueprintELResolver" ref="resolver" />
-    </bean>
-
-    <bean id="processEngine" factory-ref="processEngineFactory" factory-method="getObject"/>
-
-    <bean id="runtimeService" factory-ref="processEngine" factory-method="getRuntimeService" />
-
-    <!--
-      Register the ProcessEngine and RuntimeService as OSGi services to allow other bundles to use them
-    -->
-    <service ref="processEngine" interface="org.activiti.engine.ProcessEngine"/>
-    <service ref="runtimeService" interface="org.activiti.engine.RuntimeService"/>
-
-</blueprint>
\ No newline at end of file
diff --git a/activiti/activiti-config/src/test/java/org/apache/servicemix/activiti/config/CamelAwareELResolverTest.java b/activiti/activiti-config/src/test/java/org/apache/servicemix/activiti/config/CamelAwareELResolverTest.java
deleted file mode 100644
index 0269c13..0000000
--- a/activiti/activiti-config/src/test/java/org/apache/servicemix/activiti/config/CamelAwareELResolverTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.servicemix.activiti.config;
-
-import org.activiti.engine.impl.javax.el.ELContext;
-import org.junit.Test;
-
-import static org.apache.servicemix.activiti.config.CamelAwareELResolver.CAMEL_PROPERTY_NAME;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-/**
- * Tests for {@link CamelAwareELResolver}
- */
-public class CamelAwareELResolverTest {
-
-    private final CamelAwareELResolver resolver = new CamelAwareELResolver();
-
-    @Test
-    public void testGetValue() {
-        assertNull(resolver.getValue(null, null, null));
-        assertNull(resolver.getValue(null, null, "NonCamelProperty"));
-
-        ELContext context = expectELContextResolved();
-        assertSame(resolver.getCamelBehaviour(), resolver.getValue(context, null, CAMEL_PROPERTY_NAME));
-    }
-
-    /*
-     * Set up a mock ELContext that expects the property to get resolved
-     */
-    private ELContext expectELContextResolved() {
-        ELContext context = createMock(ELContext.class);
-        context.setPropertyResolved(true);
-        replay(context);
-        return context;
-    }
-}
diff --git a/activiti/pom.xml b/activiti/pom.xml
deleted file mode 100644
index d182bfa..0000000
--- a/activiti/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>parent</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.activiti</groupId>
-    <artifactId>activiti</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Activiti Support</name>
-
-    <modules>
-        <module>activiti-config</module>
-    </modules>
-
-</project>
diff --git a/assemblies/apache-servicemix-full/pom.xml b/assemblies/apache-servicemix-full/pom.xml
deleted file mode 100644
index 7de261a..0000000
--- a/assemblies/apache-servicemix-full/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>apache-servicemix</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../apache-servicemix/pom.xml</relativePath>
-    </parent>
-
-    <artifactId>apache-servicemix-full</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix (Full)</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
-                <version>${karaf.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-features-to-repo</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-features-to-repo</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.features.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix/apache-servicemix/${project.version}/xml/features</descriptor>
-                            </descriptors>
-                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
-                            <repository>target/features-repo</repository>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
-
diff --git a/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index 6cc8850..0000000
--- a/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-</assembly>
diff --git a/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml b/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index 30efc17..0000000
--- a/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-</assembly>
diff --git a/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
deleted file mode 100644
index ac18f88..0000000
--- a/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.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.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,activemq-camel,camel-cxf,camel-blueprint,war
-
diff --git a/assemblies/apache-servicemix-jbi/pom.xml b/assemblies/apache-servicemix-jbi/pom.xml
deleted file mode 100644
index ea6be10..0000000
--- a/assemblies/apache-servicemix-jbi/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>apache-servicemix</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../apache-servicemix/pom.xml</relativePath>
-    </parent>
-
-    <artifactId>apache-servicemix-jbi</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix (JBI)</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
-                <version>${karaf.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-features-to-repo</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-features-to-repo</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.features.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix/apache-servicemix/${project.version}/xml/features</descriptor>
-                            </descriptors>
-                            <features>
-                                <feature>cxf</feature>
-                                <feature>obr</feature>
-                                <feature>config</feature>
-                                <feature>activemq</feature>
-                                <feature>activemq-blueprint</feature>
-                                <feature>activemq-spring</feature>
-                                <feature>activemq-broker</feature>
-                                <feature>camel</feature>
-                                <feature>activemq-camel</feature>
-                                <feature>camel-nmr</feature>
-                                <feature>camel-cxf</feature>
-                                <feature>camel-blueprint</feature>
-                                <feature>jbi-cluster</feature>
-                                <feature>war</feature>
-                                <!-- ServiceMix Components -->
-                                <feature>servicemix-cxf-bc</feature>
-                                <feature>servicemix-file</feature>
-                                <feature>servicemix-ftp</feature>
-                                <feature>servicemix-http</feature>
-                                <feature>servicemix-jms</feature>
-                                <feature>servicemix-mail</feature>
-                                <feature>servicemix-bean</feature>
-                                <feature>servicemix-camel</feature>
-                                <feature>servicemix-cxf-se</feature>
-                                <feature>servicemix-drools</feature>
-                                <feature>servicemix-eip</feature>
-                                <feature>servicemix-osworkflow</feature>
-                                <feature>servicemix-quartz</feature>
-                                <feature>servicemix-scripting</feature>
-                                <feature>servicemix-validation</feature>
-                                <feature>servicemix-saxon</feature>
-                                <feature>servicemix-wsn2005</feature>
-                                <feature>servicemix-snmp</feature>
-                                <feature>servicemix-vfs</feature>
-                                <feature>servicemix-smpp</feature>
-                                <feature>servicemix-exec</feature>
-                            </features>
-                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
-                            <repository>target/features-repo</repository>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
-
diff --git a/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index 11d36fe..0000000
--- a/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-    <fileSets>
-       <!-- Copy over ant task definition files -->
-       <fileSet>
-            <directory>target/shared/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>unix</lineEnding>
-       </fileSet>
-
-        <!-- Copy over karaf demos to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf</outputDirectory>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-
-        <!-- Copy over all the examples (incl. the NMR and JBI ones) -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-                <!-- exclude these 3 failing demos -->
-                <exclude>**/wsdl-first/**</exclude>
-                <exclude>**/loan-broker-bpel/**</exclude>
-                <exclude>**/web/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <excludes>
-                <exclude>README.txt</exclude>  <!-- don't include the main README.txt file -->
-            </excludes>
-            <includes>
-                <include>**/README.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <!-- pick a pom.xml and README.txt file that includes the NMR and JBI examples -->
-    <files>
-        <file>
-            <source>${basedir}/target/classes/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</assembly>
diff --git a/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml b/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index 6630644..0000000
--- a/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-    <fileSets>
-        <!-- Copy over ant task definition files -->
-        <fileSet>
-            <directory>target/shared/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>dos</lineEnding>
-        </fileSet>
-
-        <!-- Copy over karaf demos to examples folder -->
-        <fileSet>
-           <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-           <outputDirectory>/examples/karaf</outputDirectory>
-           <lineEnding>dos</lineEnding>
-        </fileSet>
-
-        <!-- Copy over all the examples (incl. the NMR and JBI ones) -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>dos</lineEnding>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-                <!-- exclude these 3 failing demos -->
-                <exclude>**/wsdl-first/**</exclude>
-                <exclude>**/loan-broker-bpel/**</exclude>
-                <exclude>**/web/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>dos</lineEnding>
-            <filtered>true</filtered>
-            <includes>
-                <include>**/README.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <!-- pick a pom.xml file that includes the NMR and JBI examples -->
-    <files>
-        <file>
-            <source>${basedir}/target/classes/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</assembly>
diff --git a/assemblies/apache-servicemix-jbi/src/main/filtered-resources/README.txt b/assemblies/apache-servicemix-jbi/src/main/filtered-resources/README.txt
deleted file mode 100644
index 858b55d..0000000
--- a/assemblies/apache-servicemix-jbi/src/main/filtered-resources/README.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-WELCOME TO THE SERVICEMIX EXAMPLES
-==================================
-
-Camel Examples
-==============
-
-- camel-osgi
-  Deploys a Camel EIP route as an OSGi bundle. Configuration makes use
-  of the OSGi Configuration Admin service and Spring property placeholders,
-  and the example demonstrates how to deploy the properties file from the
-  ServiceMix console.
-
-- camel-blueprint
-  Deploys a Camel EIP route as an OSGi bundle. Configuration makes use
-  of the OSGi Configuration Admin service and uses a Blueprint XML file to
-  start the Camel routes.
-
-CXF examples
-============
-
-- cxf-jaxrs
-  Creates a RESTful JAX-RS web service using CXF and exposes it using
-  the OSGi HTTP service.
-
-- cxf-osgi
-  Creates a web service using CXF and Spring-DM, and exposes it through
-  the OSGi HTTP service.
-
-- cxf-ws-addressing
-  Uses CXF to create a web service enabled for WS-Addressing, and exposes
-  it through the OSGi HTTP service.
-
-- cxf-ws-rm
-  Uses CXF to create a web service enabled for WS-ReliableMessaging, and exposes
-  it through the OSGi HTTP service.
-
-- cxf-ws-security-osgi
-  Create a web service with CXF using WS-SECURITY and expose it through the OSGi HTTP
-  Service, then it will leverage cxf JAASLoginInterceptor to authenticate against karaf
-  default jaas configuration.
-
-- cxf-ws-security-blueprint
-  Create a web service with CXF using WS-SECURITY and blueprint configuration,
-  and expose it through the OSGi HTTP
-  Service, then it will leverage cxf JAASLoginInterceptor to authenticate against karaf
-  default jaas configuration.
-
-- cxf-ws-security-signature
-  Create a web service with CXF using WS-SECURITY Signature action and expose it through the OSGi HTTP
-  Service, the main purpose is to demonstrate how to use signaturePropRefId WSS4J configuration in
-  OSGi container.
-
-
-Karaf examples
-==============
-
-- branding
-  Builds the artifacts that allow you to re-brand Apache Karaf
-  (as e.g. we did in Apache ServiceMix).
-
-- dump
-  Demo that deploys a simple service into the OSGi Service Registry
-  using a Blueprint XML file.
-
-- web
-  Embeds Apache Karaf in a web application.
-
-
-NMR examples
-============
-
-- basic
-  Contains a client and endpoint bundle showing the basic functionality of the NMR.
-
-  1. /endpoint
-     Deploys a custom endpoint into the NMR registry.
-
-  2. /client
-     Deploys a client class that interacts with the NMR to communicate with
-     the endpoint.
-
-- camel-nmr
-  Deploys two Camel EIP routes that communicate with each other via the
-  ServiceMix NMR, using Spring to define the Camel routes.
-
-- camel-nmr-blueprint
-  Deploys two Camel EIP routes that communicate with each other via the
-  ServiceMix NMR, using Blueprint to define the Camel routes.
-
-- cxf-camel-nmr
-  Deploys a Camel route that transforms a message and passes it to a CXF
-  web service via the ServiceMix NMR.
-
-- cxf-nmr
-  Creates a web service using CXF and Spring-DM, and publishes it to the
-  ServiceMix NMR.
-
-- interceptors
-  Contains two interceptor examples:
-
-  1. /endpoint
-     Deploys a custom endpoint listener that captures and reports, to
-     the ServiceMix log, when an endpoint registers and unregisters with
-     the NMR.
-
-  2. /exchange
-     Deploys a custom exchange listener that captures and reports, to
-     the ServiceMix log, the exchanges that are sent and delivered using
-     the NMR.
-
-
-JBI examples
-============
-
-- bridge
-  Uses the original ServiceMix EIP component and JBI to create a
-  protocol bridge that receives a message via HTTP, transforms it
-  and sends it to a JMS queue.
-  
-  This example uses the older ServiceMix EIP implementation. The
-  bridge-camel example (see below), on the other hand, uses Camel to
-  achieve the same result.
-  
-- bridge-camel
-  Uses Camel and JBI to create a protocol bridge that receives a
-  message via HTTP, transforms it and sends it to a JMS queue.
-  
-  This example uses the newer Camel integration framework.
-  
-- camel
-  Deploys a simple Camel EIP route, written in Java, as a JBI component.
-
-- cluster
-  Creates two child container instances with one JBI endpoint of each of them,
-  using the JBI clustering engine to interconnect the two endpoints.
-
-- cxf-wsdl-first
-  Publishes, as a JBI service assembly, a WSDL-defined web service created
-  using CXF.
-
-- cxf-wsdl-first-osgi-package
-  Publishes, as OSGi bundles, a WSDL-defined web service created using CXF.
-
-- simple
-  Adds new endpoints using XML configuration files only.
-
-
-Prerequisites for Running the Examples
-=========================================
-
-Java Development Kit (JDK)
---------------------------
-You must have JDK 1.6 or higher installed on your machine to
-run the ServiceMix examples.
-
-Apache Maven
-------------
-The examples use Apache Maven for building code. You must install
-Maven 2.2.1 or higher and add the Maven bin/ directory to your PATH
-if you want to build any of the examples. 
-
-If you have not used Maven before, the first time you use it to
-build one of the examples, it downloads a lot of JARs to a local
-repository on your machine. The next time you run Maven it uses the
-locally stored JARs where possible.
-
-To download and find out more about Maven, visit:
-  http://maven.apache.org
-
-ServiceMix Container
---------------------
-You must have ServiceMix up and running. To start the ServiceMix
-container, run the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-ServiceMix Features Facility
-============================
-Several of the examples make use of the ServiceMix features facility.
-A feature is a named, versioned collection of OSGi bundles that work
-together to provide some functionality. The details of what makes up
-a feature are contained in a features definition file. The ServiceMix
-console includes a features subshell that provides commands to enable
-you to add and remove features, and to point to feature repositories.
-If you add a feature, ServiceMix uses the details provided in
-the features definition file to load and activate all of the
-required bundles that are not already present in the container.
-
-ServiceMix includes a number of features that make the running of
-the examples quick and easy. Each feature enables you to use a single
-command to install the example bundle and any bundles that the example
-depends on.
-
-To view a list of the features that are already installed, enter
-the following command in the ServiceMix console:
-
-  features:list
-
-To view a list of the features that are used by the examples, enter
-the following command in the ServiceMix console:
-
-  features:list | grep examples
-
-To view the repository URLs currently associated with the features
-facility, enter the following command in the ServiceMix console:
-
-  features:listUrl
-
-To view the contents of the features definition file that includes
-definitions for each of the features used by the examples, enter the
-following command in the ServiceMix console:
-
-  cat mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features
-
-For more information about the features facility, see the ServiceMix
-documentation.
diff --git a/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
deleted file mode 100644
index c1f6eb5..0000000
--- a/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.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.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,activemq-camel,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
-
diff --git a/assemblies/apache-servicemix-jbi/src/main/filtered-resources/pom.xml b/assemblies/apache-servicemix-jbi/src/main/filtered-resources/pom.xml
deleted file mode 100644
index 2d5395f..0000000
--- a/assemblies/apache-servicemix-jbi/src/main/filtered-resources/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>parent</artifactId>
-        <version>${project.version}</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>examples</artifactId>
-    <packaging>pom</packaging>
-    <version>${project.version}</version>
-    <name>Apache ServiceMix :: Examples</name>
-
-    <modules>
-        <module>activemq</module>
-        <module>camel</module>
-        <module>cxf</module>
-        <module>nmr</module>
-        <module>jbi</module>
-        <module>karaf</module>
-    </modules>
-
-    <repositories>
-        <!-- Required to build the examples in a SNAPSHOT assembly -->
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/assemblies/apache-servicemix-minimal/pom.xml b/assemblies/apache-servicemix-minimal/pom.xml
deleted file mode 100644
index 25b8dee..0000000
--- a/assemblies/apache-servicemix-minimal/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>apache-servicemix</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../apache-servicemix/pom.xml</relativePath>
-    </parent>
-
-    <artifactId>apache-servicemix-minimal</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix (Minimal)</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
-                <version>${karaf.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-features-to-repo</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-features-to-repo</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.features.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix/apache-servicemix/${project.version}/xml/features</descriptor>
-                            </descriptors>
-                            <features>
-                              <feature>obr</feature>
-                            </features>
-                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
-                            <repository>target/features-repo</repository>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
-
diff --git a/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml b/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
deleted file mode 100644
index 7932dc3..0000000
--- a/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-        <!-- Cherry-pick files from the expanded Karaf distribution -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-              <exclude>**/demos/**</exclude>
-              <exclude>bin/**</exclude>
-              <exclude>etc/system.properties</exclude>
-              <exclude>etc/org.apache.karaf.features.cfg</exclude>
-              <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
-              <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
-              <exclude>etc/users.properties</exclude>
-              <exclude>etc/custom.properties</exclude>
-              <exclude>etc/jre.properties</exclude>
-              <exclude>system/**</exclude>
-              <exclude>LICENSE</exclude>
-              <exclude>NOTICE</exclude>
-              <exclude>README</exclude>
-              <exclude>RELEASE-NOTES</exclude>
-              <exclude>karaf-manual*</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Copy over bin/* scripts separately to get the correct file mode -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-              <include>bin/*</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <!-- Copy license and other files from root -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>README</include>
-                <include>RELEASE*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over everything that needs to get unix line endings -->
-        <fileSet>
-            <directory>target/shared/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-            <excludes>
-              <exclude>org.apache.servicemix.nmr.cfg</exclude>
-              <exclude>org.apache.servicemix.jbi.cfg</exclude>
-              <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
-              <exclude>activemq-broker.xml</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/shared/licenses</directory>
-            <outputDirectory>/licenses/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over filtered resources -->
-        <fileSet>
-            <directory>target/classes/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-            <excludes>
-              <exclude>org.apache.servicemix.nmr.cfg</exclude>
-              <exclude>org.apache.servicemix.jbi.cfg</exclude>
-              <exclude>activemq-broker.xml</exclude>
-              <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
-            </excludes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>servicemix</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</component>
diff --git a/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml b/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
deleted file mode 100644
index bf1c941..0000000
--- a/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-      <!-- Cherry-pick files from the expanded Karaf distribution -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
-          <outputDirectory>/</outputDirectory>
-          <excludes>
-             <exclude>**/demos/**</exclude>
-             <exclude>etc/system.properties</exclude>
-             <exclude>etc/org.apache.karaf.features.cfg</exclude>
-             <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
-             <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
-             <exclude>etc/users.properties</exclude>
-             <exclude>etc/custom.properties</exclude>
-             <exclude>etc/jre.properties</exclude>
-             <exclude>system/**</exclude>
-             <exclude>LICENSE</exclude>
-             <exclude>NOTICE</exclude>
-             <exclude>README</exclude>
-             <exclude>RELEASE-NOTES</exclude>
-             <exclude>karaf-manual*</exclude>
-          </excludes>
-      </fileSet>
-
-      <!-- Copy license and other files from root -->
-      <fileSet>
-          <directory>${basedir}/../..</directory>
-          <outputDirectory>/</outputDirectory>
-          <includes>
-              <include>README</include>
-              <include>RELEASE*</include>
-          </includes>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <!-- Copy over everything that needs to get dos line endings -->
-      <fileSet>
-          <directory>target/shared/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-          <excludes>
-              <exclude>org.apache.servicemix.nmr.cfg</exclude>
-              <exclude>org.apache.servicemix.jbi.cfg</exclude>
-              <exclude>activemq-broker.xml</exclude>
-              <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
-          </excludes>
-      </fileSet>
-
-      <fileSet>
-          <directory>target/shared/licenses</directory>
-          <outputDirectory>/licenses/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <fileSet>
-          <directory>target/classes/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <includes>
-              <include>*.*</include>
-          </includes>
-          <excludes>
-              <exclude>org.apache.servicemix.nmr.cfg</exclude>
-              <exclude>org.apache.servicemix.jbi.cfg</exclude>
-              <exclude>activemq-broker.xml</exclude>
-              <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
-          </excludes>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>servicemix.bat</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</component>
diff --git a/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index 441cb13..0000000
--- a/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>./minimal-unix-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-</assembly>
diff --git a/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml b/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index 4eaf532..0000000
--- a/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>./minimal-windows-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-</assembly>
diff --git a/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.felix.fileinstall-activemq.cfg b/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.felix.fileinstall-activemq.cfg
deleted file mode 100644
index 0b9153f..0000000
--- a/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.felix.fileinstall-activemq.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-# uncomment the following lines to enable reloading of <smx-home>/etc/activemq-broker.xml
-
-#felix.fileinstall.poll   = 2000
-#felix.fileinstall.dir    = ${karaf.base}/etc
-#felix.fileinstall.tmpdir = ${karaf.data}/generated-bundles
-#felix.fileinstall.filter = activemq-broker.xml
diff --git a/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
deleted file mode 100644
index 9d1b3ef..0000000
--- a/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.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.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot=karaf-framework,config
-
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
deleted file mode 100644
index 253e24b..0000000
--- a/assemblies/apache-servicemix/pom.xml
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>assemblies</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>apache-servicemix</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.assemblies</groupId>
-            <artifactId>shared</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- Download Karaf assemblies for dependency:unpack-->
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <type>tar.gz</type>
-        </dependency>
-
-        <!--Xerces jar to be included in lib/endorsed -->
-        <dependency>
-            <groupId>org.apache.xerces</groupId>
-            <artifactId>xml-apis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-
-        <!--xalan jar to be included in lib/endorsed-->
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>serializer</artifactId>
-        </dependency>
-
-        <!-- branding -->
-        <dependency>
-            <groupId>org.apache.servicemix.features</groupId>
-            <artifactId>org.apache.servicemix.features.branding</artifactId>
-        </dependency>
-        
-    </dependencies>
-    
-    <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <configuration>
-                    <appendedResourcesDirectory>${basedir}/target/shared/appended-resources</appendedResourcesDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
-                <version>${karaf.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-features-to-repo</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>add-features-to-repo</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.features.version}/xml/features</descriptor>
-                                <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
-                            </descriptors>
-                            <features>
-                                <feature>cxf</feature>
-                                <feature>obr</feature>
-                                <feature>config</feature>
-                                <feature>activemq</feature>
-                                <feature>activemq-blueprint</feature>
-                                <feature>activemq-spring</feature>
-                                <feature>activemq-broker</feature>
-                                <feature>camel</feature>
-                                <feature>activemq-camel</feature>
-                                <feature>camel-cxf</feature>
-                                <feature>camel-blueprint</feature>
-                                <feature>war</feature>
-                            </features>
-                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
-                            <repository>target/features-repo</repository>
-                        </configuration>
-                        <inherited>false</inherited>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>copy-system-folder</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/features-repo</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>target/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-shared</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.assemblies</groupId>
-                                    <artifactId>shared</artifactId>
-                                    <type>jar</type>
-                                    <outputDirectory>target/shared</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unpack-unix</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.karaf</groupId>
-                                    <artifactId>apache-karaf</artifactId>
-                                    <type>tar.gz</type>
-                                    <outputDirectory>target/dependencies/unix</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unpack-win</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.karaf</groupId>
-                                    <artifactId>apache-karaf</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>target/dependencies/win</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enable-obr</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target name="enable-obr">
-                                <echo message="Updating etc/startup.properties in unix assembly" />
-                                <concat destfile="target/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true" eol="unix">
-                                    <fileset file="target/shared/startup-obr.properties" />
-                                </concat>
-                                <echo message="Updating etc/startup.properties in windows assembly" />
-                                <concat destfile="target/dependencies/win/apache-karaf-${karaf.version}/etc/startup.properties" append="true" eol="dos">
-                                    <fileset file="target/shared/startup-obr.properties" />
-                                </concat>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <inherited>false</inherited>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/classes/features.xml</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>unix-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
-                            </descriptors>
-                            <finalName>${project.artifactId}-${project.version}</finalName>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
-                            </descriptors>
-                            <finalName>${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unix-src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/descriptors/unix-src.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                                <inherited>false</inherited>
-                            </execution>
-                            <execution>
-                                <id>windows-src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/descriptors/windows-src.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                                <inherited>false</inherited>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
-
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index fe5c88a..0000000
--- a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-    <files>
-        <file>
-        <!-- Install the features descriptor into the system repository -->
-            <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
-            <destName>${artifactId}-${version}-features.xml</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</assembly>
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
deleted file mode 100644
index aeb20b0..0000000
--- a/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <fileSets>
-        <!-- Copy license and other files from root -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>BUILDING.txt</include>
-                <include>README.txt</include>
-                <include>RELEASE*.txt</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-
-        <!-- Binary Files -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>src</outputDirectory>
-            <includes>
-                <include>**/*.jpeg</include>
-                <include>**/*.jpg</include>
-                <include>**/*.gif</include>
-                <include>**/*.png</include>
-                <include>**/*.exe</include>
-                <include>**/*.dll</include>
-                <include>**/*.jar</include>
-                <include>**/*.so</include>
-                <include>**/*.ks</include>
-                <include>**/*.ts</include>
-                <include>**/*.keystore</include>
-                <include>**/*.bin</include>
-                <include>**/*.jnilib</include>
-                <include>**/*.cert</include>
-                <include>**/*.jks</include>
-                <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
-            </includes>
-            <excludes>
-                <exclude>**/eclipse-classes/**</exclude>
-                <exclude>**/target/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Text Files -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>src</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>**/*.jpeg</exclude>
-                <exclude>**/*.jpg</exclude>
-                <exclude>**/*.gif</exclude>
-                <exclude>**/*.png</exclude>
-                <exclude>**/*.exe</exclude>
-                <exclude>**/*.dll</exclude>
-                <exclude>**/*.jar</exclude>
-                <exclude>**/*.so</exclude>
-                <exclude>**/*.ks</exclude>
-                <exclude>**/*.ts</exclude>
-                <exclude>**/*.keystore</exclude>
-                <exclude>**/*.bin</exclude>
-                <exclude>**/*.jnilib</exclude>
-                <exclude>**/*.cert</exclude>
-                <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
-                <exclude>**/target/**</exclude>
-                <exclude>**/build/**</exclude>
-                <exclude>activemq-data/**</exclude>
-                <exclude>*/activemq-data/**</exclude>
-                <exclude>**/eclipse-classes/**</exclude>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-
-                <exclude>**/surefire*</exclude>
-                <exclude>**/svn-commit*</exclude>
-
-                <exclude>**/*.iml</exclude>
-                <exclude>**/*.ipr</exclude>
-                <exclude>**/*.iws</exclude>
-                <exclude>**/*.jks</exclude>
-
-                <exclude>**/cobertura.ser</exclude>
-
-            </excludes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-    </fileSets>
-    <files>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE.txt</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE.txt</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-</assembly>
diff --git a/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml b/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index d54c399..0000000
--- a/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
-    <files>
-        <file>
-            <source>${basedir}/target/classes/features.xml</source>
-            <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
-            <destName>${artifactId}-${version}-features.xml</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</assembly>
diff --git a/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml b/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml
deleted file mode 100644
index 78bbeba..0000000
--- a/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <!-- Copy license and other files from root -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>BUILDING.txt</include>
-                <include>README.txt</include>
-                <include>RELEASE*.txt</include>
-            </includes>
-            <lineEnding>dos</lineEnding>
-        </fileSet>
-
-        <!-- Binary Files -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>src</outputDirectory>
-            <includes>
-                <include>**/*.jpeg</include>
-                <include>**/*.jpg</include>
-                <include>**/*.gif</include>
-                <include>**/*.png</include>
-                <include>**/*.exe</include>
-                <include>**/*.dll</include>
-                <include>**/*.jar</include>
-                <include>**/*.so</include>
-                <include>**/*.ks</include>
-                <include>**/*.ts</include>
-                <include>**/*.keystore</include>
-                <include>**/*.bin</include>
-                <include>**/*.jnilib</include>
-                <include>**/*.cert</include>
-                <include>**/*.jks</include>
-                <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
-            </includes>
-            <excludes>
-                <exclude>**/eclipse-classes/**</exclude>
-                <exclude>**/target/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Text Files -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>src</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>**/*.jpeg</exclude>
-                <exclude>**/*.jpg</exclude>
-                <exclude>**/*.gif</exclude>
-                <exclude>**/*.png</exclude>
-                <exclude>**/*.exe</exclude>
-                <exclude>**/*.dll</exclude>
-                <exclude>**/*.jar</exclude>
-                <exclude>**/*.so</exclude>
-                <exclude>**/*.ks</exclude>
-                <exclude>**/*.ts</exclude>
-                <exclude>**/*.keystore</exclude>
-                <exclude>**/*.bin</exclude>
-                <exclude>**/*.jnilib</exclude>
-                <exclude>**/*.cert</exclude>
-                <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
-
-                <exclude>**/target/**</exclude>
-                <exclude>**/build/**</exclude>
-                <exclude>activemq-data/**</exclude>
-                <exclude>*/activemq-data/**</exclude>
-                <exclude>**/eclipse-classes/**</exclude>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-
-                <exclude>**/surefire*</exclude>
-                <exclude>**/svn-commit*</exclude>
-
-                <exclude>**/*.iml</exclude>
-                <exclude>**/*.ipr</exclude>
-                <exclude>**/*.iws</exclude>
-                <exclude>**/*.jks</exclude>
-                <exclude>**/cobertura.ser</exclude>
-
-            </excludes>
-            <lineEnding>dos</lineEnding>
-        </fileSet>
-    </fileSets>
-    <files>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE.txt</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE.txt</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-</assembly>
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
deleted file mode 100644
index ac18f88..0000000
--- a/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.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.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,activemq-camel,camel-cxf,camel-blueprint,war
-
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
deleted file mode 100644
index c7efc4d..0000000
--- a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<features name="servicemix-${version}">
-    <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.features.version}/xml/features</repository>
-    <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
-    <repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
-    <repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
-    <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
-
-
-    <feature name="connector" version="${version}" resolver="(obr)" start-level='50'>
-        <feature version="${aries.transaction.version}">transaction</feature>
-        <bundle dependency="true">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 dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-context/${spring.version}</bundle>                                       ‚
-        <bundle dependency="true">mvn:org.springframework/spring-aop/${spring.version}</bundle>
-    </feature>
-
-    <feature name="cxf-nmr" version="${version}" resolver="(obr)" start-level='50'>
-        <feature version="${cxf.version}">cxf</feature>
-        <feature version="${servicemix.nmr.version}">nmr</feature>
-        <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}" resolver="(obr)" start-level='50'>
-        <feature version="${camel.version}">camel</feature>
-        <feature version="${servicemix.nmr.version}">nmr</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle dependency="true">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>
-
-    <!--
-      -
-      -  Examples
-      -
-    -->
-    <feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${activemq.version}">activemq-camel</feature>
-        <feature version="${camel.version}">camel-blueprint</feature>
-        <bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">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-jaxrs-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-nmr" version="${version}" resolver="(obr)">
-        <feature version="${version}">cxf-nmr</feature>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-nmr/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-osgi" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-blueprint</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-nmr" version="${version}" resolver="(obr)">
-        <feature version="${version}">camel-nmr</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-nmr/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-nmr-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${version}">camel-nmr</feature>
-        <feature version="${camel.version}">camel-blueprint</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-nmr-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-camel-nmr" version="${version}" resolver="(obr)">
-        <feature version="${version}">camel-nmr</feature>
-        <feature version="${version}">cxf-nmr</feature>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-camel-nmr/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-wsdl-first-osgi-package" version="${version}" resolver="(obr)">
-        <feature version="${servicemix.components.version}">servicemix-cxf-bc</feature>
-        <feature version="${servicemix.components.version}">servicemix-cxf-se</feature>
-        <bundle dependency="true">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>
-    </feature>
-    <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
-    </feature>
-
-    <feature name="examples-nmr" version="${version}">
-        <feature version="${servicemix.nmr.version}">nmr</feature>
-        <bundle>mvn:org.apache.servicemix.examples/org.apache.servicemix.examples.nmr.endpoint/${pom.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/org.apache.servicemix.examples.nmr.client/${pom.version}</bundle>
-    </feature>
-
-    <feature name="examples-activiti-camel" version="${version}" resolver="(obr)">
-	      <feature version="${camel.version}">camel-core</feature>
-        <feature version="${activiti.version}">activiti</feature>
-        <bundle>mvn:org.apache.servicemix.examples/activiti-camel/${version}</bundle>
-    </feature>
-
-
-    <!--
-      -
-      -  JBI Components
-      -
-    -->
-
-    <feature name="servicemix-shared" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.nmr.version}">jbi</feature>
-        <feature version="${spring.version}">spring</feature>
-        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
-        <bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle dependency="true">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 dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix.components.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix.components.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-cxf-bc" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <feature version="${cxf.version}">cxf</feature>
-        <feature>jetty</feature>
-        <bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-file" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-ftp" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle dependency="true">mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
-        <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-http" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <feature>jetty</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
-        <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.santuario/xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-jms" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.santuario/xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-jms/${spring.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-mail" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-bean" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-camel" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <feature version="${camel.version}">camel</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-drools" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.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 dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.mvel/mvel2/${mvel.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-cxf-se" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-eip" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-osworkflow" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscore/${oscore.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.propertyset/${propertyset.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.osworkflow/${osworkflow.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-quartz" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-scripting" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm2.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
-        <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle>
-        <bundle dependency="true">mvn:org.jruby/jruby-core/${jruby.version}</bundle>
-        <bundle dependency="true">mvn:org.jruby/jruby-stdlib/${jruby.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.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-validation" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-saxon" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-blueprint/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-wsn2005" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <feature version="${activemq.version}">activemq</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-snmp" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-vfs" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-smpp" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix.components.version}</bundle>
-    </feature>
-    <feature name="servicemix-exec" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
-        <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix.components.version}</bundle>
-    </feature>
-
-    <!-- Default broker configuration -->
-    <feature name="activemq-broker" version="${version}" resolver="(obr)" start-level='50'>
-        <feature version="${activemq.version}">activemq-blueprint</feature>
-        <bundle>blueprint:file:etc/activemq-broker.xml</bundle>
-    </feature>
-
-    <feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
-        <feature version="${version}">activemq-broker</feature>
-        <bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>
-    </feature>
-
-    <!-- Activiti support -->
-    <feature name="activiti" version="${activiti.version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf-specs</feature>
-        <feature version="${aries.transaction.version}">transaction</feature>
-        <feature version="${camel.version}">camel</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.mybatis/mybatis/${mybatis.version}/</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
-        <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
-        <bundle>mvn:org.activiti/activiti-engine/${activiti.version}</bundle>
-        <bundle>mvn:org.activiti/activiti-osgi/${activiti.version}</bundle>
-        <bundle>mvn:org.activiti/activiti-camel/${activiti.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
-    </feature>
-    
-    <feature name="saaj" resolver='(obr)'>
-        <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-    </feature>
-
-</features>
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
deleted file mode 100644
index dd86bbc..0000000
--- a/assemblies/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>parent</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <artifactId>assemblies</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Assemblies</name>
-
-    <properties>
-        <examples.directory>../examples</examples.directory>
-    </properties>
-
-    <modules>
-        <module>shared</module>
-        <module>apache-servicemix</module>
-        <module>apache-servicemix-minimal</module>
-        <module>apache-servicemix-jbi</module>
-        <module>apache-servicemix-full</module>
-    </modules>
-
-
-</project>
diff --git a/assemblies/shared/pom.xml b/assemblies/shared/pom.xml
deleted file mode 100644
index f3badc3..0000000
--- a/assemblies/shared/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>assemblies</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.assemblies</groupId>
-    <artifactId>shared</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache ServiceMix :: Features :: Assemblies :: Shared files</name>
-     
- 
-    <build>
-        <resources>
-            <resource>
-                <!-- we need unfiltered copies of these files -->
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-</project>
diff --git a/assemblies/shared/src/main/filtered-resources/etc/org.apache.felix.fileinstall-activemq.cfg b/assemblies/shared/src/main/filtered-resources/etc/org.apache.felix.fileinstall-activemq.cfg
deleted file mode 100644
index eed1230..0000000
--- a/assemblies/shared/src/main/filtered-resources/etc/org.apache.felix.fileinstall-activemq.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-felix.fileinstall.poll   = 2000
-felix.fileinstall.dir    = ${karaf.base}/etc
-felix.fileinstall.tmpdir = ${karaf.data}/generated-bundles
-felix.fileinstall.filter = activemq-broker.xml
-felix.fileinstall.start.level = 50
diff --git a/assemblies/shared/src/main/filtered-resources/pom.xml b/assemblies/shared/src/main/filtered-resources/pom.xml
deleted file mode 100644
index c0fad3a..0000000
--- a/assemblies/shared/src/main/filtered-resources/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>parent</artifactId>
-        <version>${project.version}</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>examples</artifactId>
-    <packaging>pom</packaging>
-    <version>${project.version}</version>
-    <name>Apache ServiceMix :: Examples</name>
-
-    <modules>
-        <module>activemq</module>
-        <module>activiti</module>
-        <module>camel</module>
-        <module>cxf</module>
-        <module>karaf</module>
-    </modules>
-
-    <repositories>
-        <!-- Required to build the examples in a SNAPSHOT assembly -->
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/assemblies/shared/src/main/filtered-resources/startup-obr.properties b/assemblies/shared/src/main/filtered-resources/startup-obr.properties
deleted file mode 100644
index 30514de..0000000
--- a/assemblies/shared/src/main/filtered-resources/startup-obr.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# enabling features OBR resolver support
-org/apache/felix/org.apache.felix.bundlerepository/${felix.obr.version}/org.apache.felix.bundlerepository-${felix.obr.version}.jar=10
-org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
diff --git a/assemblies/shared/src/main/resources/ant/README b/assemblies/shared/src/main/resources/ant/README
deleted file mode 100644
index c2fa824..0000000
--- a/assemblies/shared/src/main/resources/ant/README
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-    Servicemix Ant Task Help.
-    ==========================================================
-    Usage : ant -f <fullpath>/servicemix-ant-task.xml [options] [target]
-    options: -D<property>=<value> use value for given property
-    
-    Targets Available:
-    ----------------------------------------------------------
-    target : install-component 
-       - Use to install service engine or binding component.
-
-    options :
-        sm.username       : Servicemix user name.
-        sm.password       : Servicemix password.
-        sm.host           : host name where Servicemix is running.
-        sm.port           : port where Servicemix is listening.
-        sm.install.file   : file path for installing service engine or binding component.
-
-    Example :
-     ant -f servicemix-ant-task.xml -Dsm.install.file=testarchive.jar install-component
-     
-    ----------------------------------------------------------
-    target : uninstall-component 
-        - use to uninstall service engine or binding component.
-    
-    options :        
-        sm.username       : Servicemix user name.
-        sm.password       : Servicemix password.
-        sm.host           : host name where Servicemix is running.
-        sm.port           : port where Servicemix is listening.
-        sm.component.name : name of service engine or binding component to uninstall.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=testarchive uninstall-component
-
-    ----------------------------------------------------------
-    target : install-shared-library 
-        - installs shared library to Servicemix.
-    
-    options :        
-        sm.username       : Servicemix user name.
-        sm.password       : Servicemix password.
-        sm.host           : host name where Servicemix is running.
-        sm.port           : port where Servicemix is listening.
-        sm.install.file   : zip file path for installing shared library installation file.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.install.file=/dir/sharedlib.zip install-shared-library  
-                
-    ----------------------------------------------------------
-    target : uninstall-shared-library 
-        - uninstalls shared library to Servicemix.
-    
-    options :        
-        sm.username            : Servicemix user name.
-        sm.password            : Servicemix password.
-        sm.host                : host name where Servicemix is running.
-        sm.port                : port where Servicemix is listening.
-        sm.shared.library.name : uninstall shared library, given name.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.shared.library.name="sharedlibname" uninstall-shared-library  
-                
-    ----------------------------------------------------------
-    target : start-component 
-        - starts service engine or binding component in Servcemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name, service engine or binding component to start.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=componentname start-component  
-
-    ----------------------------------------------------------
-    target : stop-component 
-        - stop service engine or binding component in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name, service engine or binding component to stop.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=componentname stop-component  
-
-    ----------------------------------------------------------
-    target : shutdown-component 
-        - shutdown service engine or binding component in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name, service engine or binding component to shutdown.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=componentname shutdown-component  
-
-    ----------------------------------------------------------
-    target : deploy-service-assembly 
-        - deploys a service assembly into Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.deploy.file     : fully qualified service assembly file path.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.deploy.file deploy-service-assembly  
-
-    ----------------------------------------------------------
-    target : undeploy-service-assembly 
-        - undeploys a service assembly from Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name  : service assembly name previously deployed. 
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name undeploy-service-assemply  
-
-    ----------------------------------------------------------
-    target : start-service-assembly 
-        - starts a service assembly in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name : service assembly name to start.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name start-service-assemply  
-
-    ----------------------------------------------------------
-    target : stop-service-assembly 
-        - stops service assembly in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name : service assembly name to stop.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name stop-service-assembly  
-
-    ----------------------------------------------------------
-    target : shutdown-service-assembly 
-        - shutdowns service assembly in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name : service assembly name to shutdown.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name shutdown-service-assemply  
-
-    ----------------------------------------------------------
-    target : list-service-engines 
-        - Prints the information about all the service engine in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.state           : component state
-        sm.service.assembly.name : service assembly name to list.
-        sm.shared.library.name : shared library name to list.
-
-    Example :
-    ant -f servicemix-ant-task.xml list-service-engines  
-
-    ----------------------------------------------------------
-    target : list-binding-components 
-        - Prints the information about all binding components in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.state           : component state to list
-        sm.shared.library.name : shared library name to list.
-        sm.service.assembly.name : service assembly name to list.
-
-    Example :
-    ant -f servicemix-ant-task.xml list-binding-components  
-
-    ----------------------------------------------------------
-    target : list-shared-libraries 
-        - Prints the information all about the shared library in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name to list.
-        sm.shared.library.name : shared library name to list.
-
-    Example :
-    ant -f servicemix-ant-task.xml list-shared-libraries   
-
-    ----------------------------------------------------------
-    target : list-service-assemblies 
-        - list deployed Service Assemblies in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.state           : component state to list
-        sm.component.name  : component name to list.
-        sm.service.assembly.name : service assembly name to list.
-        
-    Example :
-    ant -f servicemix-ant-task.xml list-service-assemblies  
-
diff --git a/assemblies/shared/src/main/resources/ant/servicemix-ant-task.xml b/assemblies/shared/src/main/resources/ant/servicemix-ant-task.xml
deleted file mode 100644
index 9c21127..0000000
--- a/assemblies/shared/src/main/resources/ant/servicemix-ant-task.xml
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project basedir="." default="help" name="servicemix-ant-task">
-    <description>
-        This ant script contains the Servicemix ant tasks and the targets and properties.
-     </description>
-
-    <!-- default value for the location of the Servicemix task definitions file -->
-    <property name="servicemix.taskdefs" location="servicemix_ant_taskdef.properties"/>
-    
-        
-    <!-- Servicemix ant task definitions  -->
-    <taskdef file="${servicemix.taskdefs}">
-        <classpath id="servicemix.classpath">            
-            <fileset dir="../system" includes="**/*.jar"/>
-        </classpath>
-    </taskdef>
-    
-    
-    <!-- properties used as attribute values for Servicemix Ant Task. 
-         command line args can override the values. -->
-        
-    <!-- default username. -->
-    <property name="sm.username" value="" />
-    
-    <!-- default password -->
-    <property name="sm.password" value="" />
-    
-    <!-- default host.-->
-    <property name="sm.host" value="localhost" />
-    
-    <!-- default port. -->
-    <property name="sm.port" value="1099" />
-    
-    
-    <!-- Command Line Argumants can override the following values. -->
-     
-    <!-- Property files -->
-    <property name="sm.state" value="" />
-    <property name="sm.install.file" value="" />
-    <property name="sm.component.name" value="" />
-    <property name="sm.shared.library.name" value="" />
-    <property name="sm.deploy.file" value="" />
-    <property name="sm.service.assembly.name" value="" />
-    
-          
-     <!-- Ant Task Targets -->
-     
-     <!-- install-component task -->
-     <target name="install-component" description="Installs service engine or binding component with installation parameters.">
-         <echo message=" install-component" />
-         <echo message=" Installing a service engine or binding component."/>
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    file=${sm.install.file}" />
-         
-         <jbi-install-component
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             file="${sm.install.file}"/>  
-      </target>
-     
-     <!-- uninstall-component task -->
-     <target name="uninstall-component" description="Uninstalls service engine or binding component.">
-         <echo message=" uninstall-component" />
-         <echo message=" Uninstalling a Service Engine or Binding Component." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.component.name}" />
-         <jbi-uninstall-component
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             name="${sm.component.name}"
-         />
-         
-     </target>
-     
-     <!-- install-shared-library -->
-     <target name="install-shared-library" description="Installs shared library.">
-        <echo message=" install-shared-library" />
-        <echo message=" Installs a shared library in Servicemix." />
-        <echo message="    host=${sm.host}" />
-        <echo message="    port=${sm.port}" />
-        <echo message="    file=${sm.install.file}" /> 
-        
-        <jbi-install-shared-library
-            username="${sm.username}" 
-            password="${sm.password}"
-            host="${sm.host}"
-            file="${sm.install.file}"
-        />
-     </target>
-     
-     <!-- uninstall-shared-library -->
-     <target name="uninstall-shared-library" description="Uninstalls shared library.">
-         <echo message=" uninstall-shared-library" />
-         <echo message=" Uninstall a previously installed shared library in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.shared.library.name}" />
-         
-         <jbi-uninstall-shared-library
-            username="${sm.username}" 
-            password="${sm.password}"
-            host="${sm.host}"
-            name="${sm.shared.library.name}"    
-        />
-         
-     </target>
-
-     <!-- start-component -->
-     <target name="start-component" description="starts a particular Servicemix component, service-engine or binding component.">
-         <echo message=" start-component" />
-         <echo message=" starts a particular component (service engine or binding component) in Servicemix" />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.component.name}" />
-         
-         <jbi-start-component
-            username="${sm.username}" 
-            password="${sm.password}"
-            host="${sm.host}"
-            name="${sm.component.name}"        
-        />
-     
-     </target>
-     
-     <!-- stop-component -->
-     <target name="stop-component" description="stops a particular Servicemix component, service engine or binding component.">
-         <echo message=" stop-component" />
-         <echo message=" stops a particular component (service engine or binding component) in Servicemix" />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.component.name}" />
-         
-         <jbi-stop-component
-            username="${sm.username}" 
-            password="${sm.password}"
-            host="${sm.host}"
-            name="${sm.component.name}"            
-         />
-          
-     </target>
-     
-     <!-- shut-down-component -->
-     <target name="shut-down-component" description="shut downs a particular Servicemix component.">
-         <echo message=" shut-down-component" />
-         <echo message=" shuts down a particular component (service engine or binding component) in Servicemix" />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.component.name}" />
-         
-         <jbi-shut-down-component
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             name="${sm.component.name}"                
-         />
-     </target>
-     
-     <!-- deploy-service-assembly -->
-     <target name="deploy-service-assembly" description="deploys service assembly in Servicemix.">
-         <echo message=" deploy-service-assembly" />
-         <echo message=" deploys a service assembly in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    file=${sm.deploy.file}" />
-         
-         <jbi-deploy-service-assembly
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             file="${sm.deploy.file}"                    
-         />
-     </target>
-     
-     <!-- undeploy-service-assembly -->
-     <target name="undeploy-service-assembly" description="undeploys a previously deployed service assembly in Servicemix.">
-         <echo message=" undeploy-service-assembly" />
-         <echo message=" undeploys a previously deployed service assembly in Sericemix."/>
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.service.assembly.name}" />
-         
-         <jbi-undeploy-service-assembly
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             name="${sm.service.assembly.name}"                        
-         />
-     
-     </target>
-     
-     <!-- start-service-assembly -->
-     <target name="start-service-assembly" description="starts a particular service assembly in Servicemix.">
-         <echo message=" start-service-assembly" />
-         <echo message=" starts a particular service assembly in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.service.assembly.name}" />
-         
-         <jbi-start-service-assembly
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             name="${sm.service.assembly.name}"                            
-         />
-         
-     </target>
-     
-     <!-- stop-service-assembly -->
-     <target name="stop-service-assembly" description="stops a particular service assembly in Servicemix.">
-         <echo message=" stop-service-assembly" />
-         <echo message=" stops a particular service assembly in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.service.assembly.name}" /> 
-
-         <jbi-stop-service-assembly
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             name="${sm.service.assembly.name}"                                
-         />     
-     </target>
-     
-     <!-- shut-down-service-assembly -->
-     <target name="shut-down-service-assembly" description="shuts down a particular service assembly in Servicemix.">
-         <echo message=" shut-down-service-assembly" />
-         <echo message=" shuts down a particular service assembly in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    name=${sm.service.assembly.name}" /> 
-
-         <jbi-shut-down-service-assembly
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             name="${sm.service.assembly.name}"                                    
-         />
-     
-     </target>
-     
-     <!-- list-service-engines -->
-     <target name="list-service-engines" description="prints information about all of the Service Engines in Servicemix.">
-         <echo message=" list-service-engines" />
-         <echo message=" Prints information about all of the Service Engines in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    state=${sm.state}" />
-         <echo message="    serviceAssemblyName=${sm.service.assembly.name}" />
-         <echo message="    sharedLibraryName=${sm.shared.library.name}" />
-
-         <jbi-list-service-engines
-             username="${sm.username}"
-             password="${sm.password}"
-             host="${sm.host}"
-             state="${sm.state}"
-             serviceAssemblyName="${sm.service.assembly.name}"
-             sharedLibraryName="${sm.shared.library.name}"
-         />
-     
-     </target>
-     
-     <!-- list-binding-components -->
-     <target name="list-binding-components" description="prints information about all of the Binding Components in Servicemix.">
-         <echo message=" list-binding-components" />
-         <echo message=" Prints information about the binding components installed in servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    state=${sm.state}" />
-         <echo message="    sharedLibraryName=${sm.shared.library.name}" />
-         <echo message="    serviceAssemblyName=${sm.service.assembly.name}" />
-
-         <jbi-list-binding-components
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             state="${sm.state}"
-             sharedLibraryName="${sm.shared.library.name}"
-             serviceAssemblyName="${sm.service.assembly.name}"
-         />
-     
-     </target>
-     
-     <!-- list-shared-libraries -->
-     <target name="list-shared-libraries" description="prints information about all of the Shared Libraries installed in Servicemix.">
-         <echo message=" list-shared-libraries" />
-         <echo message=" Prints information about all shared libraries installed in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    componentName=${sm.component.name}" />
-         <echo message="    sharedLibraryName=${sm.shared.library.name}" />
-
-         <jbi-list-shared-libraries
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             componentName="${sm.component.name}"
-             sharedLibraryName="${sm.shared.library.name}"
-      />
-      </target>
-     
-     <!-- list-service-assemblies -->
-     <target name="list-service-assemblies" description="list deployed Service Assemblies in Servicemix.">
-         <echo message=" list-service-assemblies" />
-         <echo message=" list deployed Service Assemblies in Servicemix." />
-         <echo message="    host=${sm.host}" />
-         <echo message="    port=${sm.port}" />
-         <echo message="    state=${sm.state}" />
-         <echo message="    componentName=${sm.component.name}" />
-         <echo message="    serviceAssemblyName=${sm.service.assembly.name}" />
-
-         <jbi-list-service-assemblies
-             username="${sm.username}" 
-             password="${sm.password}"
-             host="${sm.host}"
-             state="${sm.state}"
-             componentName="${sm.component.name}"
-             serviceAssemblyName="${sm.service.assembly.name}"
-         />
-     
-     </target>
-
-     <!-- Help/Usage target -->
-    <target name="help" description="Description of commands and their parameters.">
-    <echo>         
-    Servicemix Ant Task Help.
-    ==========================================================
-    Usage : ant -f &lt;fullpath>/servicemix-ant-task.xml [options] [target]
-    options: -D&lt;property>=&lt;value> use value for given property
-    
-    Targets Available:
-    ----------------------------------------------------------
-    target : install-component 
-       - Use to install service engine or binding component.
-
-    options :
-        sm.username       : Servicemix user name.
-        sm.password       : Servicemix password.
-        sm.host           : host name where Servicemix is running.
-        sm.port           : port where Servicemix is listening.
-        sm.install.file   : file path for installing service engine or binding component.
-
-    Example :
-     ant -f servicemix-ant-task.xml -Dsm.install.file=testarchive.jar install-component
-     
-    ----------------------------------------------------------
-    target : uninstall-component 
-        - use to uninstall service engine or binding component.
-    
-    options :        
-        sm.username       : Servicemix user name.
-        sm.password       : Servicemix password.
-        sm.host           : host name where Servicemix is running.
-        sm.port           : port where Servicemix is listening.
-        sm.component.name : name of service engine or binding component to uninstall.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=testarchive uninstall-component
-
-    ----------------------------------------------------------
-    target : install-shared-library 
-        - installs shared library to Servicemix.
-    
-    options :        
-        sm.username       : Servicemix user name.
-        sm.password       : Servicemix password.
-        sm.host           : host name where Servicemix is running.
-        sm.port           : port where Servicemix is listening.
-        sm.install.file   : zip file path for installing shared library installation file.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.install.file=/dir/sharedlib.zip install-shared-library  
-                
-    ----------------------------------------------------------
-    target : uninstall-shared-library 
-        - uninstalls shared library to Servicemix.
-    
-    options :        
-        sm.username            : Servicemix user name.
-        sm.password            : Servicemix password.
-        sm.host                : host name where Servicemix is running.
-        sm.port                : port where Servicemix is listening.
-        sm.shared.library.name : uninstall shared library, given name.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.shared.library.name="sharedlibname" uninstall-shared-library  
-                
-    ----------------------------------------------------------
-    target : start-component 
-        - starts service engine or binding component in Servcemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name, service engine or binding component to start.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=componentname start-component  
-
-    ----------------------------------------------------------
-    target : stop-component 
-        - stop service engine or binding component in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name, service engine or binding component to stop.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=componentname stop-component  
-
-    ----------------------------------------------------------
-    target : shut-down-component 
-        - shut down service engine or binding component in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name, service engine or binding component to shut down.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.component.name=componentname shut-down-component  
-
-    ----------------------------------------------------------
-    target : deploy-service-assembly 
-        - deploys a service assembly into Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.deploy.file     : fully qualified service assembly file path.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.deploy.file deploy-service-assembly  
-
-    ----------------------------------------------------------
-    target : undeploy-service-assembly 
-        - undeploys a service assembly from Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name  : service assembly name previously deployed. 
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name undeploy-service-assembly  
-
-    ----------------------------------------------------------
-    target : start-service-assembly 
-        - starts a service assembly in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name : service assembly name to start.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name start-service-assembly  
-
-    ----------------------------------------------------------
-    target : stop-service-assembly 
-        - stops service assembly in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name : service assembly name to stop.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name stop-service-assembly  
-
-    ----------------------------------------------------------
-    target : shut-down-service-assembly 
-        - shuts down service assembly in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.service.assembly.name : service assembly name to shut down.
-    
-    Example :
-    ant -f servicemix-ant-task.xml -Dsm.service.assembly.name shut-down-service-assembly  
-
-    ----------------------------------------------------------
-    target : list-service-engines 
-        - Prints the information about all the service engine in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.state           : component state
-        sm.service.assembly.name : service assembly name to list.
-        sm.shared.library.name : shared library name to list.
-
-    Example :
-    ant -f servicemix-ant-task.xml list-service-engines  
-
-    ----------------------------------------------------------
-    target : list-binding-components 
-        - Prints the information about all binding components in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.state           : component state to list
-        sm.shared.library.name : shared library name to list.
-        sm.service.assembly.name : service assembly name to list.
-
-    Example :
-    ant -f servicemix-ant-task.xml list-binding-components  
-
-    ----------------------------------------------------------
-    target : list-shared-libraries 
-        - Prints the information all about the shared library in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.component.name  : component name to list.
-        sm.shared.library.name : shared library name to list.
-
-    Example :
-    ant -f servicemix-ant-task.xml list-shared-libraries   
-
-    ----------------------------------------------------------
-    target : list-service-assemblies 
-        - list deployed Service Assemblies in Servicemix.
-    
-    options :        
-        sm.username        : Servicemix user name.
-        sm.password        : Servicemix password.
-        sm.host            : host name where Servicemix is running.
-        sm.port            : port where Servicemix is listening.
-        sm.state           : component state to list
-        sm.component.name  : component name to list.
-        sm.service.assembly.name : service assembly name to list.
-        
-    Example :
-    ant -f servicemix-ant-task.xml list-service-assemblies  
-
-    </echo>
-    </target>
-
-
-</project>
diff --git a/assemblies/shared/src/main/resources/ant/servicemix_ant_taskdef.properties b/assemblies/shared/src/main/resources/ant/servicemix_ant_taskdef.properties
deleted file mode 100644
index 41c0941..0000000
--- a/assemblies/shared/src/main/resources/ant/servicemix_ant_taskdef.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-# Servicemix Jbi Ant definitions
-# 
-jbi-install-component=org.apache.servicemix.jbi.deployer.task.InstallComponentTask
-jbi-uninstall-component=org.apache.servicemix.jbi.deployer.task.UninstallComponentTask
-jbi-install-shared-library=org.apache.servicemix.jbi.deployer.task.InstallSharedLibraryTask
-jbi-uninstall-shared-library=org.apache.servicemix.jbi.deployer.task.UninstallSharedLibraryTask
-jbi-start-component=org.apache.servicemix.jbi.deployer.task.StartComponentTask
-jbi-stop-component=org.apache.servicemix.jbi.deployer.task.StopComponentTask
-jbi-shut-down-component=org.apache.servicemix.jbi.deployer.task.ShutDownComponentTask
-jbi-deploy-service-assembly=org.apache.servicemix.jbi.deployer.task.DeployServiceAssemblyTask
-jbi-undeploy-service-assembly=org.apache.servicemix.jbi.deployer.task.UndeployServiceAssemblyTask
-jbi-start-service-assembly=org.apache.servicemix.jbi.deployer.task.StartServiceAssemblyTask
-jbi-stop-service-assembly=org.apache.servicemix.jbi.deployer.task.StopServiceAssemblyTask
-jbi-shut-down-service-assembly=org.apache.servicemix.jbi.deployer.task.ShutDownServiceAssemblyTask
-jbi-list-service-engines=org.apache.servicemix.jbi.deployer.task.ListServiceEnginesTask
-jbi-list-binding-components=org.apache.servicemix.jbi.deployer.task.ListBindingComponentsTask
-jbi-list-shared-libraries=org.apache.servicemix.jbi.deployer.task.ListSharedLibrariesTask
-jbi-list-service-assemblies=org.apache.servicemix.jbi.deployer.task.ListServiceAssembliesTask
diff --git a/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm b/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm
deleted file mode 100644
index d123dbc..0000000
--- a/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements.  See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership.  The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License.  You may obtain a copy of the License at
-##
-##  http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied.  See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
-##
-
-========================================================================
-
-Apache ServiceMix includes a number of components and libraries with 
-separate copyright notices and license terms. Your use of those 
-components are subject to the terms and conditions of the following 
-licenses.
-
-#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
-#foreach ( $project in $projects )
-#foreach ( $license in $project.licenses)
-#if ( ! ($apacheTxt == $license.name) ) 
-
-$project.name #if ($project.url)($project.url)#end $project.artifact
-    License: $license.name #if ($license.url) ($license.url)#end
-
-#end
-#end
-#end
diff --git a/assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE b/assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 0e6fb2a..0000000
--- a/assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-This product contains software developed by
-Open Participation Software for Java (http://www.ops4j.org/).
-
-Additional copyright notices and license terms applicable are
-present in the licenses directory of this distribution.
\ No newline at end of file
diff --git a/assemblies/shared/src/main/resources/common-bin.xml b/assemblies/shared/src/main/resources/common-bin.xml
deleted file mode 100644
index fd29e49..0000000
--- a/assemblies/shared/src/main/resources/common-bin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-        <fileSet>
-          <outputDirectory>system</outputDirectory>
-          <directory>target/features-repo</directory>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>org.apache.servicemix.features:org.apache.servicemix.features.branding</include>
-            </includes>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/lib/endorsed</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>org.apache.xerces:xercesImpl</include>
-                <include>org.apache.xerces:xml-apis</include>
-                <include>xalan:xalan</include>
-                <include>xalan:serializer</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-</component>
diff --git a/assemblies/shared/src/main/resources/common-unix-bin.xml b/assemblies/shared/src/main/resources/common-unix-bin.xml
deleted file mode 100644
index f67111c..0000000
--- a/assemblies/shared/src/main/resources/common-unix-bin.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-        <!-- Cherry-pick files from the expanded Karaf distribution -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-              <exclude>**/demos/**</exclude>
-              <exclude>bin/**</exclude>
-              <exclude>etc/system.properties</exclude>
-              <exclude>etc/org.apache.karaf.features.cfg</exclude>
-              <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
-              <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
-              <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
-              <exclude>etc/users.properties</exclude>
-              <exclude>etc/custom.properties</exclude>
-              <exclude>etc/jre.properties</exclude>
-              <exclude>etc/jre.properties.cxf</exclude>
-              <exclude>system/**</exclude>
-              <exclude>LICENSE</exclude>
-              <exclude>NOTICE</exclude>
-              <exclude>README</exclude>
-              <exclude>RELEASE-NOTES</exclude>
-              <exclude>karaf-manual*</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Copy over bin/* scripts separately to get the correct file mode -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-              <include>bin/*</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <!-- Copy license and other files from root -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>README</include>
-                <include>RELEASE*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over everything that needs to get unix line endings -->
-        <fileSet>
-            <directory>target/shared/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/shared/licenses</directory>
-            <outputDirectory>/licenses/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over filtered resources -->
-        <fileSet>
-            <directory>target/classes/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>servicemix</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</component>
diff --git a/assemblies/shared/src/main/resources/common-windows-bin.xml b/assemblies/shared/src/main/resources/common-windows-bin.xml
deleted file mode 100644
index c4257ae..0000000
--- a/assemblies/shared/src/main/resources/common-windows-bin.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-      <!-- Cherry-pick files from the expanded Karaf distribution -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
-          <outputDirectory>/</outputDirectory>
-          <excludes>
-             <exclude>**/demos/**</exclude>
-             <exclude>etc/system.properties</exclude>
-             <exclude>etc/org.apache.karaf.features.cfg</exclude>
-             <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
-             <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
-             <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
-             <exclude>etc/users.properties</exclude>
-             <exclude>etc/custom.properties</exclude>
-             <exclude>etc/jre.properties</exclude>
-             <exclude>etc/jre.properties.cxf</exclude>
-             <exclude>system/**</exclude>
-             <exclude>LICENSE</exclude>
-             <exclude>NOTICE</exclude>
-             <exclude>README</exclude>
-             <exclude>RELEASE-NOTES</exclude>
-             <exclude>karaf-manual*</exclude>
-          </excludes>
-      </fileSet>
-
-      <!-- Copy license and other files from root -->
-      <fileSet>
-          <directory>${basedir}/../..</directory>
-          <outputDirectory>/</outputDirectory>
-          <includes>
-              <include>README</include>
-              <include>RELEASE*</include>
-          </includes>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <!-- Copy over everything that needs to get dos line endings -->
-      <fileSet>
-          <directory>target/shared/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <fileSet>
-          <directory>target/shared/licenses</directory>
-          <outputDirectory>/licenses/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <fileSet>
-          <directory>target/classes/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <includes>
-              <include>*.*</include>
-          </includes>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>servicemix.bat</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</component>
diff --git a/assemblies/shared/src/main/resources/etc/activemq-broker.xml b/assemblies/shared/src/main/resources/etc/activemq-broker.xml
deleted file mode 100644
index b77b90b..0000000
--- a/assemblies/shared/src/main/resources/etc/activemq-broker.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
-           xmlns:amq="http://activemq.apache.org/schema/core"
-           xmlns:blueprint="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
-    <manifest>
-      Export-Service = javax.jms.ConnectionFactory
-    </manifest>
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <ext:property-placeholder />
-
-    <broker xmlns="http://activemq.apache.org/schema/core" blueprint:id="broker" brokerName="default" dataDirectory="${karaf.data}/activemq/default" useShutdownHook="false">
-       <!--
-            For better performances use VM cursor and small memory limit.
-            For more information, see:
-            
-            http://activemq.apache.org/message-cursors.html
-            
-            Also, if your producer is "hanging", it's probably due to producer flow control.
-            For more information, see:
-            http://activemq.apache.org/producer-flow-control.html
-        -->
-              
-        <destinationPolicy>
-            <policyMap>
-              <policyEntries>
-                <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
-                  <pendingSubscriberPolicy>
-                    <vmCursor />
-                  </pendingSubscriberPolicy>
-                </policyEntry>
-                <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
-                  <!-- Use VM cursor for better latency
-                       For more information, see:
-                       
-                       http://activemq.apache.org/message-cursors.html
-                       
-                  <pendingQueuePolicy>
-                    <vmQueueCursor/>
-                  </pendingQueuePolicy>
-                  -->
-                </policyEntry>
-              </policyEntries>
-            </policyMap>
-        </destinationPolicy> 
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!-- 
-            Configure message persistence for the broker. The default persistence
-            mechanism is the KahaDB store (identified by the kahaDB tag). 
-            For more information, see: 
-            
-            http://activemq.apache.org/persistence.html 
-        -->
-        <persistenceAdapter>
-            <kahaDB directory="${karaf.data}/activemq/default/kahadb"/>
-        </persistenceAdapter>
-
-       <!--
-            The systemUsage controls the maximum amount of space the broker will 
-            use before slowing down producers. For more information, see:
-            
-            http://activemq.apache.org/producer-flow-control.html
-             
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb" name="foo"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-        -->
-
-        <!-- The transport connectors ActiveMQ will listen to -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="${activemq.url}"/>
-            <transportConnector name="stomp" uri="stomp://localhost:61613"/>
-        </transportConnectors>
-
-    </broker>
-
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="broker">
-
-        <property name="brokerURL" value="vm://default?create=false&amp;waitForStart=10000" />
-    </bean>
-
-    <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
-        <property name="maxConnections" value="8" />
-        <property name="connectionFactory" ref="activemqConnectionFactory" />
-    </bean>
-
-    <bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
-        <property name="transactionManager" ref="recoverableTxManager" />
-        <property name="connectionFactory" ref="activemqConnectionFactory" />
-        <property name="resourceName" value="activemq.${name}" />
-    </bean>
-
-    <reference id="recoverableTxManager" interface="org.apache.geronimo.transaction.manager.RecoverableTransactionManager" availability="mandatory" />
-
-    <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
-        <service-properties>
-            <entry key="name" value="localhost"/>
-        </service-properties>
-    </service>
-
-</blueprint>
-
diff --git a/assemblies/shared/src/main/resources/etc/custom.properties b/assemblies/shared/src/main/resources/etc/custom.properties
deleted file mode 100644
index 48bedcb..0000000
--- a/assemblies/shared/src/main/resources/etc/custom.properties
+++ /dev/null
@@ -1,119 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# You can place any customized configuration here.
-# All the values specified here will override the default value.
-#
-
-karaf.systemBundlesStartLevel=50
-
-# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
-# as servicemix is using sun saaj impl bundle, we should ignore the package of saaj
-# as servicemix is using sun jaxb impl bundle, we should ignore the package of jaxb
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
-
-
-org.osgi.framework.system.packages.extra = \
-  org.apache.karaf.branding, \
-  com.sun.org.apache.xalan.internal.xsltc.trax, \
-  com.sun.org.apache.xerces.internal.dom, \
-  com.sun.org.apache.xerces.internal.jaxp, \
-  com.sun.org.apache.xerces.internal.xni, \
-  com.sun.jndi.ldap, \
-  org.apache.xalan.extensions; version="2.7.1", \
-  org.apache.xalan.xsltc.compiler; version="2.7.1", \
-  org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \
-  org.apache.xalan.xsltc.util; version="2.7.1", \
-  org.apache.xalan.transformer; version="2.7.1", \
-  org.apache.xalan.xsltc.trax; version="2.7.1", \
-  org.apache.xalan.processor; version="2.7.1", \
-  org.apache.xalan.lib; version="2.7.1", \
-  org.apache.xalan.trace; version="2.7.1", \
-  org.apache.xalan.xsltc.compiler.util; version="2.7.1", \
-  org.apache.xalan.templates; version="2.7.1", \
-  org.apache.xalan.xsltc; version="2.7.1", \
-  org.apache.xalan.xsltc.runtime; version="2.7.1", \
-  org.apache.xalan; version="2.7.1", \
-  org.apache.xalan.xslt; version="2.7.1", \
-  org.apache.xalan.lib.sql; version="2.7.1", \
-  org.apache.xalan.xsltc.runtime.output; version="2.7.1", \
-  org.apache.xalan.xsltc.dom; version="2.7.1", \
-  org.apache.xalan.client; version="2.7.1", \
-  org.apache.xalan.xsltc.cmdline; version="2.7.1", \
-  org.apache.xalan.serialize; version="2.7.1", \
-  org.apache.xalan.res; version="2.7.1", \
-  org.apache.xml.dtm.ref; version="2.7.1", \
-  org.apache.xml.dtm; version="2.7.1", \
-  org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \
-  org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \
-  org.apache.xml.res; version="2.7.1", \
-  org.apache.xml.serializer.dom3; version="2.7.1", \
-  org.apache.xml.serializer; version="2.7.1", \
-  org.apache.xml.serializer.utils; version="2.7.1", \
-  org.apache.xml.utils.res; version="2.7.1", \
-  org.apache.xml.utils; version="2.7.1", \
-  org.apache.xpath.functions; version="2.7.1", \
-  org.apache.xpath.jaxp; version="2.7.1", \
-  org.apache.xpath.patterns; version="2.7.1", \
-  org.apache.xpath.objects; version="2.7.1", \
-  org.apache.xpath.res; version="2.7.1", \
-  org.apache.xpath; version="2.7.1", \
-  org.apache.xpath.axes; version="2.7.1", \
-  org.apache.xpath.compiler; version="2.7.1", \
-  org.apache.xpath.operations; version="2.7.1", \
-  org.apache.xpath.domapi; version="2.7.1", \
-  org.apache.html.dom; version="2.11.0", \
-  org.apache.wml.dom; version="2.11.0", \
-  org.apache.wml; version="2.11.0", \
-  org.apache.xerces.parsers; version="2.11.0", \
-  org.apache.xerces.impl.dtd.models; version="2.11.0", \
-  org.apache.xerces.xni.parser; version="2.11.0", \
-  org.apache.xerces.impl.dv.xs; version="2.11.0", \
-  org.apache.xerces.impl.xs.traversers; version="2.11.0", \
-  org.apache.xerces.util; version="2.11.0", \
-  org.apache.xerces.impl.dtd; version="2.11.0", \
-  org.apache.xerces.jaxp.validation; version="2.11.0", \
-  org.apache.xerces.dom3.as; version="2.11.0", \
-  org.apache.xerces.impl.dv; version="2.11.0", \
-  org.apache.xerces.jaxp; version="2.11.0", \
-  org.apache.xerces.jaxp.datatype; version="2.11.0", \
-  org.apache.xerces.impl.xpath.regex; version="2.11.0", \
-  org.apache.xerces.xni; version="2.11.0", \
-  org.apache.xerces.impl.msg; version="2.11.0", \
-  org.apache.xerces.impl.dv.util; version="2.11.0", \
-  org.apache.xerces.impl.xs.util; version="2.11.0", \
-  org.apache.xerces.dom; version="2.11.0", \
-  org.apache.xerces.dom.events; version="2.11.0", \
-  org.apache.xerces.impl.xs.opti; version="2.11.0", \
-  org.apache.xerces.impl; version="2.11.0", \
-  org.apache.xerces.xs; version="2.11.0", \
-  org.apache.xerces.impl.io; version="2.11.0", \
-  org.apache.xerces.xpointer; version="2.11.0", \
-  org.apache.xerces.impl.dv.dtd; version="2.11.0", \
-  org.apache.xerces.xinclude; version="2.11.0", \
-  org.apache.xerces.impl.xpath; version="2.11.0", \
-  org.apache.xerces.xs.datatypes; version="2.11.0", \
-  org.apache.xerces.impl.xs.identity; version="2.11.0", \
-  org.apache.xerces.impl.xs.models; version="2.11.0", \
-  org.apache.xerces.xni.grammars; version="2.11.0", \
-  org.apache.xerces.impl.xs; version="2.11.0", \
-  org.apache.xerces.impl.validation; version="2.11.0", \
-  org.apache.xml.serialize; version="2.11.0" 
-
diff --git a/assemblies/shared/src/main/resources/etc/jre.properties b/assemblies/shared/src/main/resources/etc/jre.properties
deleted file mode 100644
index fcab1b2..0000000
--- a/assemblies/shared/src/main/resources/etc/jre.properties
+++ /dev/null
@@ -1,297 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# Java platform package export properties.
-#
-
-# Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute
-jre-1.6= \
- javax.accessibility, \
- javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.xpath, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
-
-# Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute
-jre-1.7= \
- javax.accessibility, \
- javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.xpath, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg b/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg
deleted file mode 100644
index 6083d8c..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed  under the  License is distributed on an "AS IS" BASIS,
-# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-aries.transaction.timeout=600
-aries.transaction.howl.logFileDir=${karaf.data}/txlog/
-aries.transaction.recoverable=true
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg b/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg
deleted file mode 100644
index ec72283..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# This configuration file is used to configure the default values for features OBR resolver
-#
-
-#
-# Defines whether or not the features OBR resolver has to resolve optional imports as well.  The default value is
-# false (do not attempt to resolve optional imports).
-#
-resolveOptionalImports = true
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg b/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg
deleted file mode 100644
index 770601d..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-# When using a forced shutdown of a SA, all pending synchronous exchanges will be canceled after this timeout
-# The value is specified in ms, the default value of 0 will wait indefinitely for all exchanges to finish
-shutdownTimeout=0
-
-# The values below can be used to configure the thread pool size for the ServiceMix JBI components.
-# - corePoolSize defines the core thread pool size (default is 4)
-# - maximumPoolSize defines the maximum thread pool size, -1 means an unbounded thread pool size (default is -1)
-# - queueSize defines the executor queue size (default is 1024)
-# - allowCoreThreadTimeOut allows the core threads to timeout (defaults to true)
-# - keepAliveTime is the amount of milliseconds a thread is kept alive when idle (defaults to 60000)
-corePoolSize=4
-maximumPoolSize=-1
-queueSize=1024
-allowCoreThreadTimeOut=true
-keepAliveTime=60000
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg b/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg
deleted file mode 100644
index 038a0d3..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-# The values below can be used to configure the thread pool size for NMR endpoints.
-# - corePoolSize defines the core thread pool size (default is 4)
-# - maximumPoolSize defines the maximum thread pool size, -1 means an unbounded thread pool size (default is -1)
-# - queueSize defines the executor queue size (default is 1024)
-# - allowCoreThreadTimeOut allows the core threads to timeout (defaults to true)
-# - keepAliveTime is the amount of milliseconds a thread is kept alive when idle (defaults to 60000)
-#
-# Endpoints are provided a ThreadPool with specific configuration.  If no configuration
-# can be found for the endpoint name, the default one can be used.
-# A given thread pool can be configured by prefixing the above properties with the name followed by a dot.
-# For example:
-#   foo.bar.corePoolSize=16
-#
-corePoolSize=4
-maximumPoolSize=-1
-queueSize=1024
-allowCoreThreadTimeOut=true
-keepAliveTime=60000
diff --git a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 515fdc8..0000000
--- a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-# Root logger
-log4j.rootLogger=INFO, out, osgi:VmLogAppender
-log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-log4j.appender.out.file=${karaf.data}/log/servicemix.log
-log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=1MB
-log4j.appender.out.maxBackupIndex=10
-
-# Sift appender
-log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
-log4j.appender.sift.key=bundle.name
-log4j.appender.sift.default=servicemix
-log4j.appender.sift.appender=org.apache.log4j.FileAppender
-log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n
-log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
-log4j.appender.sift.appender.append=true
diff --git a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
deleted file mode 100644
index 54007cc..0000000
--- a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ /dev/null
@@ -1,100 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# If set to true, the following property will not allow any certificate to be used
-# when accessing Maven repositories through SSL
-#
-#org.ops4j.pax.url.mvn.certificateCheck=
-
-#
-# Path to the local Maven settings file.
-# The repositories defined in this file will be automatically added to the list
-# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
-# below is not set.
-# The following locations are checked for the existence of the settings.xml file
-#   * 1. looks for the specified url
-#   * 2. if not found looks for ${user.home}/.m2/settings.xml
-#   * 3. if not found looks for ${maven.home}/conf/settings.xml
-#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
-#
-#org.ops4j.pax.url.mvn.settings=
-
-#
-# Path to the local Maven repository which is used to avoid downloading
-# artifacts when they already exist locally.
-# The value of this property will be extracted from the settings.xml file
-# above, or defaulted to:
-#     System.getProperty( "user.home" ) + "/.m2/repository"
-#
-#org.ops4j.pax.url.mvn.localRepository=
-
-#
-# Default this to false. It's just weird to use undocumented repos
-#
-org.ops4j.pax.url.mvn.useFallbackRepositories=false
-
-#
-# Uncomment if you don't wanna use the proxy settings
-# from the Maven conf/settings.xml file
-#
-# org.ops4j.pax.url.mvn.proxySupport=false
-
-#
-# Disable aether support by default.  This ensure that the defaultRepositories
-# below will be used
-#
-org.ops4j.pax.url.mvn.disableAether=true
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# Those repositories will be checked before iterating through the
-#    below list of repositories and even before the local repository
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#
-# The following property value will add the system folder as a repo.
-#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots,\
-    file:${karaf.home}/local-repo@snapshots
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# The default list includes the following repositories:
-#    http://repo1.maven.org/maven2
-#    http://repository.apache.org/content/groups/snapshots-group
-#    http://svn.apache.org/repos/asf/servicemix/m2-repo
-#    http://repository.springsource.com/maven/bundles/release
-#    http://repository.springsource.com/maven/bundles/external
-# To add repositories to the default ones, prepend '+' to the list of repositories
-# to add.
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#
-org.ops4j.pax.url.mvn.repositories= \
-    http://repo1.maven.org/maven2, \
-    http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \
-    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
-    http://repository.springsource.com/maven/bundles/release, \
-    http://repository.springsource.com/maven/bundles/external, \
-    http://oss.sonatype.org/content/repositories/releases/, \
-    https://maven.alfresco.com/nexus/content/groups/public/
-
diff --git a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub b/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
deleted file mode 100644
index c83c914..0000000
--- a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-#################################################################################
-
-#################################################################################
-#
-#    This is a stub configuration file for pax-web ssl configuration.
-#    More details please refer to 
-#    http://wiki.ops4j.org/display/paxweb/SSL+Configuration
-#    Important Notes: If file named org.ops4j.pax.web.cfg in etc folder,
-#                     Pax Web will always try to read configuration from
-                      this file, so any org.ops4j.pax.web configuration 
-                      in http feature get ignored, that's why we name this 
-                      file as org.ops4j.pax.web.empty.stub.
-                      If you need this configuration file, rename it to
-                      org.ops4j.pax.web before use it.
-#################################################################################
-
-#org.osgi.service.http.secure.enabled=true
-#org.ops4j.pax.web.ssl.keystore=etc/servicemix.jks
-#org.ops4j.pax.web.ssl.password=password
-#org.ops4j.pax.web.ssl.keypassword=password
-#org.osgi.service.http.port.secure=8443
-org.ops4j.pax.web.config.file=etc/jetty.xml
-org.osgi.service.http.port=8181
-javax.servlet.context.tempdir=data/pax-web-jsp
diff --git a/assemblies/shared/src/main/resources/etc/system.properties b/assemblies/shared/src/main/resources/etc/system.properties
deleted file mode 100644
index bf73988..0000000
--- a/assemblies/shared/src/main/resources/etc/system.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# The properties defined in this file will be made available through system
-# properties at the very beginning of the Karaf's boot process.
-#
-
-
-# Log level when the pax-logging service is not available
-# This level will only be used while the pax-logging service bundle
-# is not fully available.
-# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
-# instead.
-org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
-
-#
-# Name of this karaf instance.
-#
-karaf.name=root
-
-#
-# Default repository where bundles will be loaded from before using
-# other maven repositories.  For the full maven configuration, see
-# the org.ops4j.pax.url.mvn.cfg file.
-#
-karaf.default.repository=system
-
-#
-# Location of a shell script that will be run when starting a shell
-# session.  This script can be used to create aliases and define
-# additional commands.
-#
-karaf.shell.init.script=${karaf.home}/etc/shell.init.script
-
-#
-# Default role name used for console authorization (JMX, SSH and WEB)
-# The syntax is the following:
-#   [classname:]principal
-# where classname is the class name of the principal object
-# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
-# and principal is the name of the principal of that class
-# (defaults to admin).
-#
-# Note that this value can be overriden using the various ConfigAdmin
-# configurations for JMX, SSH or the WebConsole.
-#
-karaf.admin.role=admin
-
-
-
-#
-# Set this empty property to avoid errors when validating xml documents.
-#
-xml.catalog.files=
-
-#
-# Suppress the bell in the console when hitting backspace to many times
-# for example
-#
-jline.nobell=true
-
-#
-# Default port for the OSGI HTTP Service
-#
-org.osgi.service.http.port=8181
-
-#
-# Allow usage of ${servicemix.home} as an alias for ${karaf.home}
-#
-servicemix.home=${karaf.home}
-
-#
-# Activemq configuration
-#
-activemq.port = 61616
-activemq.host = localhost
-activemq.url = tcp://${activemq.host}:${activemq.port}
-
-
-#
-# Activemq JMX configuration
-#
-activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
-activemq.jmx.user=smx
-activemq.jmx.password=smx
-
-#
-# Activemq Webconsole configuration
-#
-webconsole.type=properties
-webconsole.jms.url=${activemq.url}
-webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
-webconsole.jmx.user=smx
-webconsole.jmx.password=smx
-
-
-javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
-
-#
-# CXF Log configuration
-#
-org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
-
-# Workaround for KARAF-1117: Jetty will use a JUL logger.
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
diff --git a/assemblies/shared/src/main/resources/etc/users.properties b/assemblies/shared/src/main/resources/etc/users.properties
deleted file mode 100644
index 0348fae..0000000
--- a/assemblies/shared/src/main/resources/etc/users.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-smx=smx,admin
diff --git a/assemblies/shared/src/main/resources/examples-unix-bin.xml b/assemblies/shared/src/main/resources/examples-unix-bin.xml
deleted file mode 100644
index f7402ea..0000000
--- a/assemblies/shared/src/main/resources/examples-unix-bin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-        <!-- Copy over karaf demo to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf</outputDirectory>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-
-        <!-- Copy over the examples -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <includes>
-                <include>activemq/**</include>
-                <include>activiti/**</include>
-                <include>camel/**</include>
-                <include>cxf/**</include>
-            </includes>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>README.txt</include>
-                <include>activemq/**/README.txt</include>
-                <include>activiti/**/README.txt</include>
-                <include>camel/**/README.txt</include>
-                <include>cxf/**/README.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</component>
diff --git a/assemblies/shared/src/main/resources/examples-windows-bin.xml b/assemblies/shared/src/main/resources/examples-windows-bin.xml
deleted file mode 100644
index 7fb72bd..0000000
--- a/assemblies/shared/src/main/resources/examples-windows-bin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-      <!-- Copy over kernel demo to examples folder -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-          <outputDirectory>/examples/karaf</outputDirectory>
-          <lineEnding>dos</lineEnding>
-      </fileSet>
-
-      <!-- Copy over the examples -->
-      <fileSet>
-          <directory>${basedir}/../../examples</directory>
-          <outputDirectory>/examples/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-              <include>activemq/**</include>
-              <include>activiti/**</include>
-              <include>camel/**</include>
-              <include>cxf/**</include>
-          </includes>
-          <excludes>
-              <exclude>pom.xml</exclude>
-              <!--we need add filtered README.txt, so exclude the raw one here-->
-              <exclude>**/README.txt</exclude>
-              <!-- exclude build output/IDE config/... files -->
-              <exclude>**/target/**</exclude>
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**</exclude>
-              <exclude>**/*.i??</exclude>
-          </excludes>
-      </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples</outputDirectory>
-            <lineEnding>dos</lineEnding>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>README.txt</include>
-                <include>activemq/**/README.txt</include>
-                <include>activiti/**/README.txt</include>
-                <include>camel/**/README.txt</include>
-                <include>cxf/**/README.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</component>
diff --git a/assemblies/shared/src/main/resources/licenses/asm.txt b/assemblies/shared/src/main/resources/licenses/asm.txt
deleted file mode 100644
index 6eff43a..0000000
--- a/assemblies/shared/src/main/resources/licenses/asm.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/assemblies/shared/src/main/resources/licenses/bsd.txt b/assemblies/shared/src/main/resources/licenses/bsd.txt
deleted file mode 100644
index 1568be2..0000000
--- a/assemblies/shared/src/main/resources/licenses/bsd.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-The BSD License
-
-   Copyright (c) <YEAR>, <OWNER>
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt b/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt
deleted file mode 100644
index 4830da9..0000000
--- a/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt
+++ /dev/null
@@ -1,385 +0,0 @@
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. ÒContributorÓ means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. ÒContributor VersionÓ means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. ÒCovered SoftwareÓ means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. ÒExecutableÓ means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. ÒInitial DeveloperÓ means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. ÒLarger WorkÓ means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. ÒLicenseÓ means this document.
-
-            1.8. ÒLicensableÓ means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. ÒModificationsÓ means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. ÒOriginal SoftwareÓ means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. ÒPatent ClaimsÓ means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. ÒSource CodeÓ means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. ÒYouÓ (or ÒYourÓ) means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, ÒYouÓ
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, ÒcontrolÓ means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipientsÕ
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipientÕs rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN ÒAS ISÓ
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as ÒParticipantÓ)
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a Òcommercial item,Ó as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of Òcommercial
-      computer softwareÓ (as that term is defined at 48 C.F.R. ¤
-      252.227-7014(a)(1)) and Òcommercial computer software
-      documentationÓ as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdictionÕs conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneysÕ fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
diff --git a/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt b/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt
deleted file mode 100644
index c9990a7..0000000
--- a/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
-    b) in the case of each subsequent Contributor:
-
-    i) changes to the Program, and
-
-    ii) additions to the Program;
-
-    where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-    c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-    d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-
-    b) its license agreement:
-
-    i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-    ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
-    iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
-    iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-
-    b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
diff --git a/assemblies/shared/src/main/resources/licenses/epl-1.0.txt b/assemblies/shared/src/main/resources/licenses/epl-1.0.txt
deleted file mode 100644
index fddc311..0000000
--- a/assemblies/shared/src/main/resources/licenses/epl-1.0.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt b/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt
deleted file mode 100644
index 0bf5791..0000000
--- a/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- Copyright (c) 2004-2011 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free  of charge, to any person obtaining
- a  copy  of this  software  and  associated  documentation files  (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute,  sublicense, and/or sell  copies of  the Software,  and to
- permit persons to whom the Software  is furnished to do so, subject to
- the following conditions:
- 
- The  above  copyright  notice  and  this permission  notice  shall  be
- included in all copies or substantial portions of the Software.
- 
- THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
- EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
- MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/branding/pom.xml b/branding/pom.xml
deleted file mode 100644
index 972f5c3..0000000
--- a/branding/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>parent</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.features</groupId>
-    <artifactId>org.apache.servicemix.features.branding</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Branding Support</name>
-    <description>Branding for Apache ServiceMix features</description>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Description>${project.description}</Bundle-Description>
-                        <Import-Package>*</Import-Package>
-                        <Private-Package>!*</Private-Package>
-                        <Export-Package>
-                            org.apache.karaf.branding        
-                        </Export-Package>
-                        <Spring-Context>*;publish-context:=false</Spring-Context>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branding/src/main/resources/org/apache/karaf/branding/branding.properties b/branding/src/main/resources/org/apache/karaf/branding/branding.properties
deleted file mode 100644
index 8e3332c..0000000
--- a/branding/src/main/resources/org/apache/karaf/branding/branding.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-welcome = \
-\u001B[36m ____                  _          __  __ _      \u001B[0m\n\
-\u001B[36m/ ___|  ___ _ ____   _(_) ___ ___|  \\/  (_)_  __\u001B[0m\n\
-\u001B[36m\\___ \\ / _ \\ '__\\ \\ / / |/ __/ _ \\ |\\/| | \\ \\/ /\u001B[0m\n\
-\u001B[36m ___) |  __/ |   \\ V /| | (_|  __/ |  | | |>  < \u001B[0m\n\
-\u001B[36m|____/ \\___|_|    \\_/ |_|\\___\\___|_|  |_|_/_/\\_\\\u001B[0m\n\
-\n\
-\u001B[1m  Apache ServiceMix\u001B[0m (${pom.version})\n\
-\n\
-Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\n\
-   and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\n\
-Hit '<ctrl-d>' or 'osgi:shutdown' to shutdown ServiceMix.\n
-
diff --git a/camel/pom.xml b/camel/pom.xml
deleted file mode 100644
index d526870..0000000
--- a/camel/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>parent</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.camel</groupId>
-    <artifactId>camel</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Camel Support</name>
-
-    <modules>
-        <module>servicemix-camel</module>
-    </modules>
-
-</project>
diff --git a/camel/servicemix-camel/pom.xml b/camel/servicemix-camel/pom.xml
deleted file mode 100644
index 041314d..0000000
--- a/camel/servicemix-camel/pom.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-    
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.camel</groupId>
-        <artifactId>camel</artifactId>
-        <version>4.6.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.camel.component</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Camel Support :: Component</name>
-    <description>Apache Camel component tight integrated in the NMR</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-core</artifactId>
-            <version>2.5.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cxf</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-transports-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-transports-http-jetty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-transports-local</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-frontend-simple</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-management</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-testutils</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-tools-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jetty</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-http</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>xfire</groupId>
-            <artifactId>opensaml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.parsers</groupId>
-            <artifactId>jaxp-ri</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>*</Import-Package>
-                        <Export-Package>org.apache.servicemix.camel.nmr*</Export-Package>
-                        <Bundle-Description>${project.description}</Bundle-Description>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                    <systemProperties>
-                        <property>
-                            <name>javax.xml.parsers.DocumentBuilderFactory</name>
-                            <value>com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>javax.xml.datatype.DatatypeFactory</name>
-                            <value>com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>javax.xml.parsers.SAXParserFactory</name>
-                            <value>com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>javax.xml.stream.XMLInputFactory</name>
-                            <value>com.ctc.wstx.stax.WstxInputFactory</value>
-                        </property>
-                        <property>
-                            <name>javax.xml.stream.XMLOutputFactory</name>
-                            <value>com.ctc.wstx.stax.WstxOutputFactory</value>
-                        </property>
-                    </systemProperties>
-                    <excludes>
-                        <exclude>**/TimeoutTest*.*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>${cxf.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <testSourceRoot>${basedir}/target/generated/test/java</testSourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/person.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-verbose</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- exclude generated class from cxf-codegen-plugin -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <configuration>
-                    <instrumentation>
-                        <excludes>
-                            <exclude>org/apache/servicemix/samples/wsdl_first/*.class</exclude>
-                        </excludes>
-                    </instrumentation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>jar-test-classes</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
deleted file mode 100644
index 09d68d9..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import javax.activation.DataHandler;
-import javax.security.auth.Subject;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
-import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.impl.DefaultMessage;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The binding object will help us to deal with copying between the NMR exchange and camel exchange
- */
-public class ServiceMixBinding {
-
-    private final transient Logger LOG = LoggerFactory.getLogger(ServiceMixBinding.class);
-
-    public static final String NMR_MESSAGE = "nmrMessage";
-    public static final String NMR_EXCHANGE = "nmrExchange";
-    public static final String NMR_OPERATION = "nmrOperation";
-    
-    public void copyCamelMessageToNmrMessage(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
-        if (nmrMessage != null && camelMessage != null) {
-            nmrMessage.setBody(camelMessage.getBody());
-            nmrMessage.getHeaders().clear();
-            addNmrHeaders(nmrMessage, camelMessage);
-            nmrMessage.getAttachments().clear();
-            nmrMessage.getAttachments().putAll(camelMessage.getAttachments());
-            //addSecuritySubject(nmrMessage, camelMessage);
-
-            // propagate the security subject
-            if (camelMessage.getHeader(Exchange.AUTHENTICATION, Subject.class) != null) {
-                nmrMessage.setSecuritySubject(camelMessage.getHeader(Exchange.AUTHENTICATION, Subject.class));
-            }
-        }
-    }
-
-    public void copyNmrMessageToCamelMessage(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
-        camelMessage.setBody(nmrMessage.getBody());
-        camelMessage.setHeader(NMR_MESSAGE, nmrMessage);
-        camelMessage.getHeaders().putAll(nmrMessage.getHeaders());
-        addCamelAttachments(nmrMessage, camelMessage);
-
-        // copy the security subject
-        if (nmrMessage.getSecuritySubject() != null) {
-            camelMessage.setHeader(Exchange.AUTHENTICATION, nmrMessage.getSecuritySubject());
-        }
-    }
-    
-    public org.apache.servicemix.nmr.api.Exchange populateNmrExchangeFromCamelExchange(Exchange camelExchange, Channel client)  {
-        org.apache.servicemix.nmr.api.Exchange e = client.createExchange(
-                Pattern.fromWsdlUri(camelExchange.getPattern().getWsdlUri()));
-        e.getProperties().putAll(camelExchange.getProperties());
-        org.apache.servicemix.nmr.api.Message inMessage = e.getIn();
-        copyCamelMessageToNmrMessage(inMessage, camelExchange.getIn());
-        return e;
-                   
-    }
-    
-    
-    public Exchange populateCamelExchangeFromNmrExchange(CamelContext context, org.apache.servicemix.nmr.api.Exchange nmrExchange) {
-        Exchange answer = new DefaultExchange(context);
-        answer.setPattern(ExchangePattern.fromWsdlUri(nmrExchange.getPattern().getWsdlUri()));
-        
-        // copy the nmrExchange's properties
-        answer.getProperties().putAll(nmrExchange.getProperties());
-
-        org.apache.servicemix.nmr.api.Message inMessage = nmrExchange.getIn();
-        if (inMessage != null) {
-            Message message = new DefaultMessage();
-            copyNmrMessageToCamelMessage(inMessage, message);
-            answer.setIn(message);
-        }
-        
-        answer.setProperty(NMR_EXCHANGE, nmrExchange);
-        if (nmrExchange != null && nmrExchange.getOperation() != null) {
-            answer.setProperty(NMR_OPERATION, nmrExchange.getOperation().toString());
-        }
-      
-        return answer;
-    }
-    
-    
-    
-    protected void addNmrHeaders(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
-        // get headers from the Camel in message
-        Set<Map.Entry<String, Object>> entries = camelMessage.getHeaders().entrySet();
-        for (Map.Entry<String, Object> entry : entries) {
-            // skip the camel header's normalized Message
-            if (entry.getKey().equals(NMR_MESSAGE)) {
-                continue;
-            }
-            //check if value is Serializable, and if value is Map or collection,
-            //just exclude it since the entry of it may not be Serializable as well
-            if (entry.getValue() instanceof Serializable
-                    && !(entry.getValue() instanceof Map)
-                    && !(entry.getValue() instanceof Collection)) {
-                nmrMessage.setHeader(entry.getKey(), entry.getValue());
-            }
-        }
-       
-    }
-  
-    protected void addCamelAttachments(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
-        Set<String> names = nmrMessage.getAttachments().keySet();
-        for (String name : names) {
-            if (nmrMessage.getAttachment(name) instanceof DataHandler) {
-                DataHandler dataHandler = (DataHandler) nmrMessage.getAttachment(name);             
-                camelMessage.addAttachment(name, dataHandler);
-            } else {
-                LOG.warn("NMR attachement of " + name + " is not a instance of DataHandler, cannot copy it into Camel message.");
-            }
-        }
-        
-    }
-
-    /**
-     * Extract the underlying NMR {@link org.apache.servicemix.nmr.api.Message} for a Camel message
-     *
-     * @param message the Camel Message
-     * @return the corresponding NMR message
-     */
-    public org.apache.servicemix.nmr.api.Message getNmrMessage(Message message) {
-        if (message.getHeader(NMR_MESSAGE) != null) {
-            return message.getHeader(NMR_MESSAGE, org.apache.servicemix.nmr.api.Message.class);
-        }
-        return null;
-    }
-
-    /**
-     * Extract the NMR Exchange from the Camel Exchange
-     *
-     * @param camel the Camel Exchange
-     * @return the NMR Exchange
-     */
-    public org.apache.servicemix.nmr.api.Exchange extractNmrExchange(Exchange camel) {
-        return (org.apache.servicemix.nmr.api.Exchange) camel.getProperties().remove(NMR_EXCHANGE);
-    }
-}
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
deleted file mode 100644
index 95cb52a..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-import org.apache.servicemix.nmr.api.NMR;
-
-/**
- * A camel component to bridge ServiceMix NMR with Camel.
- */
-public class ServiceMixComponent extends DefaultComponent {
-
-    private static NMR nmr;
-    private ServiceMixBinding binding;
-    
-    public ServiceMixComponent() {
-    }
-   
-    public ServiceMixBinding getBinding() {
-        if (binding == null) {
-            binding = new ServiceMixBinding();
-        }
-        return binding;
-    }
-
-    public void setBinding(ServiceMixBinding binding) {
-        this.binding = binding;
-    }
-
-    public NMR getNmr() {
-        if (nmr == null) {
-            nmr = getCamelContext().getRegistry().lookup(NMR.class.getName(), NMR.class);
-        }
-        return nmr;
-    }
-
-    public void setNmr(NMR nmr) {
-        this.nmr = nmr;
-    }
-
-    protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
-        return new ServiceMixEndpoint(this, uri, remaining);
-    }
-
-    public void registerEndpoint(org.apache.servicemix.nmr.api.Endpoint endpoint, Map<String, ?> properties) {
-        getNmr().getEndpointRegistry().register(endpoint, properties);
-    }
-
-    public void unregisterEndpoint(org.apache.servicemix.nmr.api.Endpoint endpoint, Map<String, ?> properties) {
-        getNmr().getEndpointRegistry().unregister(endpoint, properties);
-    }
-}
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
deleted file mode 100644
index 5622ca1..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.Map;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.impl.DefaultConsumer;
-import org.apache.camel.spi.Synchronization;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.Status;
-import org.apache.servicemix.nmr.api.service.ServiceHelper;
-
-/**
- * A {@link Consumer} that receives NMR {@link org.apache.servicemix.nmr.api.Exchange}s and invokes the Camel route
- */
-public class ServiceMixConsumer extends DefaultConsumer implements org.apache.servicemix.nmr.api.Endpoint, Synchronization {
-
-    private Channel channel;
-
-    public ServiceMixConsumer(ServiceMixEndpoint endpoint, Processor processor) {
-        super(endpoint, processor);
-    }
-
-    public ServiceMixEndpoint getEndpoint() {
-        return (ServiceMixEndpoint) super.getEndpoint();
-    }
-
-    protected void doStart() throws Exception {
-        super.doStart();
-        getEndpoint().getComponent().registerEndpoint(this, createEndpointMap());
-    }
-
-    protected void doStop() throws Exception {
-        getEndpoint().getComponent().unregisterEndpoint(this, createEndpointMap());
-        super.doStop();
-    }
-
-    private Map<String,?> createEndpointMap() {
-        Map<String, Object> result = ServiceHelper.createMap(Endpoint.NAME,
-                                                             getEndpoint().getEndpointName());
-        result.put(Endpoint.CHANNEL_SYNC_DELIVERY, getEndpoint().isSynchronous());
-        result.put(Endpoint.RUN_AS_SUBJECT, getEndpoint().isRunAsSubject());
-        String interfaceName = getEndpoint().getInterfaceName();
-        if (interfaceName != null && interfaceName.length() > 0) {
-            result.put(Endpoint.INTERFACE_NAME, interfaceName);
-        }
-        String serviceName = getEndpoint().getServiceName();
-        if (serviceName != null && serviceName.length() > 0) {
-            result.put(Endpoint.SERVICE_NAME, serviceName);
-        }
-        return result;
-    }
-
-    public void setChannel(Channel channel) {
-        this.channel = channel;
-    }
-
-    /**
-     * Process an NMR {@link org.apache.servicemix.nmr.api.Exchange} by creating and sending a Camel {@link org.apache.servicemix.nmr.api.Exchange}
-     * through the defined route
-     */
-    public void process(Exchange exchange) {
-        if (exchange.getStatus() == Status.Active) {
-            try {
-                org.apache.camel.Exchange camelExchange = getEndpoint().createExchange(exchange);
-                camelExchange.addOnCompletion(this);
-                if (getEndpoint().isSynchronous()) {
-                    getProcessor().process(camelExchange);
-                    // no need to send the response back here, this is handled by the onComplete/onFailure method
-                } else {
-                    getAsyncProcessor().process(camelExchange, new AsyncCallback() {
-                        public void done(boolean doneSync) {
-                            // this is handled by the onComplete/onFailure method
-                        }
-                    });
-                }
-            } catch (Exception e) {
-                exchange.setError(e);
-                exchange.setStatus(Status.Error);
-                channel.send(exchange);
-            }
-        }
-    }
-
-    /**
-     * Handle the Camel {@link org.apache.camel.Exchange) response by updating the matching NMR {@link org.apache.servicemix.nmr.api.Exchange}
-     * and finishing the NMR MEP
-     */
-    private void handleCamelResponse(Exchange exchange, org.apache.camel.Exchange camelExchange) {
-        // just copy the camelExchange back to the nmr exchange
-        exchange.getProperties().putAll(camelExchange.getProperties());
-        if (camelExchange.getException() != null) {
-            exchange.setError(camelExchange.getException());
-            exchange.setStatus(Status.Error);
-        } else if (camelExchange.hasOut() && !camelExchange.getOut().isFault()) {
-            getEndpoint().getComponent().getBinding().
-                copyCamelMessageToNmrMessage(exchange.getOut(), camelExchange.getOut());
-        } else if (camelExchange.hasOut() && camelExchange.getOut().isFault()) {
-            getEndpoint().getComponent().getBinding().
-                copyCamelMessageToNmrMessage(exchange.getFault(), camelExchange.getOut());
-        } else {
-            exchange.setStatus(Status.Done);
-        }
-        channel.send(exchange);
-    }
-
-    /*
-     * Handle a successfully completed Camel Exchange
-     */
-    public void onComplete(org.apache.camel.Exchange exchange) {
-        Exchange nmr = getEndpoint().getComponent().getBinding().extractNmrExchange(exchange);
-        handleCamelResponse(nmr, exchange);
-    }
-
-    /*
-     * Handle a Caml exchange failure
-     */
-    public void onFailure(org.apache.camel.Exchange exchange) {
-        Exchange nmr = getEndpoint().getComponent().getBinding().extractNmrExchange(exchange);
-        handleCamelResponse(nmr, exchange);
-    }
-}
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
deleted file mode 100644
index 57a667f..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.Map;
-
-import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Producer;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.impl.SynchronousDelegateProducer;
-
-/**
- * A Camel {@link Endpoint} to interact with the ServiceMix NMR from within a Camel route
- * 
- * @org.apache.xbean.XBean element="smxEndpoint"
- */
-public class ServiceMixEndpoint extends DefaultEndpoint {
-
-    private static final String SYNCHRONOUS = "synchronous";
-    public static final String RUN_AS_SUBJECT = "runAsSubject";
-    private static final String TIMEOUT = "timeout";
-    private static final String THROW_EXCEPTION_ON_FAILURE = "throwExceptionOnFailure";
-    private static final String INTERFACE_NAME = "interfaceName";
-    private static final String SERVICE_NAME = "serviceName";
-    private static final Long DEFAULT_TIMEOUT = new Long(0);
-
-    private String endpointName;
-    private String interfaceName;
-    private String serviceName;
-    private boolean synchronous;
-    private boolean runAsSubject;
-    private boolean throwExceptionOnFailure = true;
-    private Long timeOut = DEFAULT_TIMEOUT;
-
-    public ServiceMixEndpoint(ServiceMixComponent component, String uri, String endpointName) {
-        super(uri, component);
-        this.endpointName = endpointName;
-    }
-
-    @Override
-    public void configureProperties(Map<String, Object> options) {
-        synchronous = Boolean.valueOf((String) options.remove(SYNCHRONOUS));
-        runAsSubject = Boolean.valueOf((String) options.remove(RUN_AS_SUBJECT));
-        interfaceName = (String)options.remove(INTERFACE_NAME);
-        serviceName = (String)options.remove(SERVICE_NAME);
-        setThrowExceptionOnFailure(Boolean.valueOf((String) options.remove(THROW_EXCEPTION_ON_FAILURE)));
-        timeOut = parseLongOption(options, TIMEOUT);
-    }
-
-    private Long parseLongOption(Map<String, Object> options, String timeout) {
-        String value = (String) options.remove(TIMEOUT);
-        if (value != null) {
-            return Long.parseLong(value);
-        }
-        return 0l;
-    }
-
-    public ServiceMixComponent getComponent() {
-        return (ServiceMixComponent)super.getComponent();
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public boolean isSynchronous() {
-        return synchronous;
-    }
-
-    public boolean isRunAsSubject() {
-        return runAsSubject;
-    }
-
-    public Long getTimeOut() {
-        return timeOut;
-    }
-
-    
-    public Producer createProducer() throws Exception {
-        if (isSynchronous()) {
-            return new SynchronousDelegateProducer(new ServiceMixProducer(this, getComponent().getNmr()));
-        } else {
-            return new ServiceMixProducer(this, getComponent().getNmr());
-        }
-    }
-
-    public Consumer createConsumer(Processor processor) throws Exception {
-        return new ServiceMixConsumer(this, processor);
-    }
-
-    public Exchange createExchange(org.apache.servicemix.nmr.api.Exchange nmrExchange) {
-        return getComponent().getBinding().populateCamelExchangeFromNmrExchange(getCamelContext(),
-                                                                                nmrExchange);
-    }
-
-    public void setEndpointName(String endpointName) {
-        this.endpointName = endpointName;
-    }
-
-    public String getEndpointName() {
-        return endpointName;
-    }
-
-    public boolean isThrowExceptionOnFailure() {
-        return throwExceptionOnFailure;
-    }
-
-    public void setThrowExceptionOnFailure(boolean throwExceptionOnFailure) {
-        this.throwExceptionOnFailure = throwExceptionOnFailure;
-    }
-
-    public String getInterfaceName() {
-        return interfaceName;
-    }
-
-    public void setInterfaceName(String interfaceName) {
-        this.interfaceName = interfaceName;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-}
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
deleted file mode 100644
index f24f093..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
-import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.Exchange;
-import org.apache.servicemix.nmr.api.*;
-import org.apache.servicemix.nmr.api.service.ServiceHelper;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * A {@link org.apache.camel.Producer} that handles incoming Camel exchanges by sending/receiving an NMR {@link org.apache.camel.Exchange}
- */
-public class ServiceMixProducer extends DefaultProducer implements Endpoint, AsyncProcessor {
-
-    private static final String TARGET_ENDPOINT_NAME = "TARGET_ENDPOINT_NAME";
-
-    private final Map<String, Continuation> continuations = new ConcurrentHashMap<String, Continuation>();
-    private final NMR nmr;
-
-    private Channel channel;
-
-    public ServiceMixProducer(ServiceMixEndpoint endpoint, NMR nmr) {
-        super(endpoint);
-        this.nmr = nmr;
-    }
-
-    /*
-     * Synchronously process the Camel exchange (using sendSync to send and receive the NMR Exchange)
-     */
-    public void process(Exchange exchange) throws Exception {
-        NMR nmr = getEndpoint().getComponent().getNmr();
-
-        org.apache.servicemix.nmr.api.Exchange e =
-            getEndpoint().getComponent().getBinding().populateNmrExchangeFromCamelExchange(exchange, channel);
-
-        try {
-            e.setTarget(nmr.getEndpointRegistry().lookup(
-                            ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
-                                                    getEndpoint().getEndpointName())));
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        channel.sendSync(e, getEndpoint().getTimeOut());
-
-        handleResponse(exchange, channel, e);
-    }
-
-    /*
-     * Asynchronously process the Camel exchange (using send to send the NMR Exchange)
-     * (NMR responses will be handled by the {@link #process(org.apache.servicemix.nmr.api.Exchange)} method
-     */
-    public boolean process(Exchange exchange, AsyncCallback asyncCallback) {
-        NMR nmr = getEndpoint().getComponent().getNmr();
-
-        org.apache.servicemix.nmr.api.Exchange e
-                = getEndpoint().getComponent().getBinding().populateNmrExchangeFromCamelExchange(exchange, channel);
-
-        try {
-            e.setTarget(nmr.getEndpointRegistry().lookup(
-                    ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
-                            getEndpoint().getEndpointName())));
-
-            if (isSendSyncRequired()) {
-                process(exchange);
-                asyncCallback.done(true);
-                return true;
-            } else {
-                continuations.put(e.getId(), new Continuation(exchange, asyncCallback));
-                channel.send(e);
-                return false;
-            }
-        } catch (Exception ex) {
-            log.warn("Error occured while sending NMR exchange", ex);
-
-            continuations.remove(e.getId());
-
-            exchange.setException(ex);
-            asyncCallback.done(true);
-            return true;
-        }
-    }
-
-    /**
-     * Handle incoming NMR exchanges (responses to the exchanges sent in {@link #process(org.apache.camel.Exchange, org.apache.camel.AsyncCallback)}
-     */
-    public void process(org.apache.servicemix.nmr.api.Exchange exchange) {
-        Continuation continuation = continuations.remove(exchange.getId());
-
-        if (continuation == null) {
-            log.error("Unknown exchange received: " + exchange);
-        } else {
-            handleResponse(continuation.exchange, channel, exchange);
-            continuation.callback.done(false);
-        }
-    }
-
-    /*
-     * Handle the NMR Exchange by:
-     * - updating the corresponding Camel Exchange
-     * - finishing the NMR Exchange MEP
-     */
-    private void handleResponse(Exchange exchange, Channel client, org.apache.servicemix.nmr.api.Exchange e) {
-        
-        if (e.getError() != null && getEndpoint().isThrowExceptionOnFailure()) {
-            handleErrorResponse(exchange, client, e);
-        } else {
-            handleSuccessResponse(exchange, client, e);
-        }
-    }
-
-    private void handleSuccessResponse(Exchange exchange, Channel client, org.apache.servicemix.nmr.api.Exchange e) {
-        if (e.getPattern() != Pattern.InOnly) {
-            exchange.getProperties().putAll(e.getProperties());
-            if (e.getFault().getBody() != null) {
-                exchange.getOut().setFault(true);
-                getEndpoint().getComponent().getBinding().copyNmrMessageToCamelMessage(e.getFault(), exchange.getOut());
-            } else {
-                getEndpoint().getComponent().getBinding().copyNmrMessageToCamelMessage(e.getOut(), exchange.getOut());
-            }
-            e.setStatus(Status.Done);
-            channel.send(e);
-        }
-    }
-
-    private void handleErrorResponse(Exchange camel, Channel client, org.apache.servicemix.nmr.api.Exchange nmr) {
-        camel.setException(nmr.getError());
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        nmr.getEndpointRegistry().register(this, createEndpointMap());
-        super.doStart();
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        super.doStop();
-        nmr.getEndpointRegistry().unregister(this, createEndpointMap());
-    }
-
-    /**
-     * Access the matching {@link org.apache.servicemix.camel.nmr.ServiceMixEndpoint}
-     */
-    public ServiceMixEndpoint getEndpoint() {
-        return (ServiceMixEndpoint) super.getEndpoint();
-    }
-
-    public void setChannel(Channel channel) {
-        this.channel = channel;
-    }
-
-    /*
-     * Creates the default endpoint map, containing the endpoint name as well as a property referring to the
-     * target endpoint name
-     */
-    private Map<String,Object> createEndpointMap() {
-        return ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
-                ServiceMixProducer.class.getName() + "-" + getEndpoint().getEndpointName(),
-                TARGET_ENDPOINT_NAME,
-                getEndpoint().getEndpointName());
-
-    }
-
-    /*
-     * Access an unmodifiable copy of the pending continuations map
-     */
-    protected Map<String, Continuation> getContinuations() {
-        return Collections.unmodifiableMap(continuations);
-    }
-
-    /*
-     * Encapsulates all the information required to continue a Camel {@link Exchange} 
-     */
-    private final class Continuation {
-
-        private final Exchange exchange;
-        private final AsyncCallback callback;
-
-        private Continuation(Exchange exchange, AsyncCallback callback) {
-            super();
-            this.exchange = exchange;
-            this.callback = callback;
-        }
-    }
-
-    /*
-     * Check if sendSync is required for interacting with the NMR.
-     * Currently, sendSync is required only if a timeout has been configured on the endpoint.
-     */
-    private boolean isSendSyncRequired() {
-        return getEndpoint().getTimeOut() > 0;
-    }
-}
diff --git a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr b/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
deleted file mode 100644
index 17e2f92..0000000
--- a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.servicemix.camel.nmr.ServiceMixComponent
diff --git a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx b/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
deleted file mode 100644
index 17e2f92..0000000
--- a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.servicemix.camel.nmr.ServiceMixComponent
diff --git a/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml b/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml
deleted file mode 100644
index ed80a29..0000000
--- a/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
-    <bean id="nmr" class="org.apache.servicemix.camel.nmr.ServiceMixComponent">
-        <property name="nmr">
-            <reference interface="org.apache.servicemix.nmr.api.NMR" />
-        </property>
-    </bean>
-
-</blueprint>
diff --git a/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml b/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
deleted file mode 100644
index 439aae8..0000000
--- a/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       xmlns:camel-osgi="http://activemq.apache.org/camel/schema/osgi"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/camel/schema/spring/camel-spring.xsd
-       http://camel.apache.org/schema/osgi http://camel.apache.org/schema/osgi/camel-osgi.xsd">
-
-    <bean id="nmr" class="org.apache.servicemix.camel.nmr.ServiceMixComponent">
-        <property name="nmr">
-            <osgi:reference interface="org.apache.servicemix.nmr.api.NMR" />
-        </property>
-    </bean>
-
-</beans>
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
deleted file mode 100644
index f0dd7b0..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.servicemix.executors.ExecutorFactory;
-import org.apache.servicemix.executors.impl.ExecutorConfig;
-import org.apache.servicemix.executors.impl.ExecutorFactoryImpl;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.event.ExchangeListener;
-import org.apache.servicemix.nmr.api.service.ServiceHelper;
-import org.apache.servicemix.nmr.core.InternalEndpointWrapper;
-import org.apache.servicemix.nmr.core.ServiceMix;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Abstract base class for building NMR component unit tests
- * - the NMR component is available with URI prefix nmr:
- * - a client channel to the NMR can be obtained with the {@link #getChannel()} method
- */
-public abstract class AbstractComponentTest extends CamelTestSupport implements ExchangeListener {
-
-    private ServiceMix nmr;
-    private ServiceMixComponent component;
-    private Channel channel;
-
-    @Override
-    public void setUp() throws Exception {
-        nmr = new ServiceMix();
-        nmr.setExecutorFactory(createExecutorFactory());
-        nmr.init();
-        
-        nmr.getListenerRegistry().register(this, ServiceHelper.createMap());
-
-        component = new ServiceMixComponent();
-        component.setNmr(nmr);
-
-        super.setUp();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        for (ServiceMixProducer producer : findEndpoints(ServiceMixProducer.class)) {
-            if (producer.getContinuations().size() > 0) {
-                // let's wait for a moment to give the last exchanges the time to get Done
-                Thread.sleep(500);
-            }
-            assertEquals("There should be no more pending Camel exchanges in the producer endpoints",
-                         0, producer.getContinuations().size());
-        }
-
-        nmr.shutdown();
-        super.tearDown();
-    }
-
-    private <E extends Endpoint> List<E> findEndpoints(Class<E> type) {
-        List<E> result = new LinkedList<E>();
-
-        for (Endpoint endpoint : nmr.getEndpointRegistry().getServices()) {
-            if (endpoint instanceof InternalEndpointWrapper) {
-                InternalEndpointWrapper wrapper = (InternalEndpointWrapper) endpoint;
-                if (type.isAssignableFrom(wrapper.getEndpoint().getClass())) {
-                    result.add(type.cast(wrapper.getEndpoint()));
-                }
-            }
-        }
-        return result;
-    }
-
-    /*
-     * Create the ExecutorFactory for the unit test
-     * based on the default configuration used in ServiceMix 4
-     */
-    protected ExecutorFactory createExecutorFactory() {
-        ExecutorFactoryImpl factory = new ExecutorFactoryImpl();
-
-        ExecutorConfig config = factory.getDefaultConfig();
-        config.setCorePoolSize(1);
-        config.setMaximumPoolSize(16);
-        config.setQueueSize(0);
-        config.setBypassIfSynchronous(true);
-
-        return factory;
-    };
-
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-        registry.bind("nmr", component);
-        return registry;
-    }
-
-    /**
-     * Get a client channel to access the NMR used for testing
-     *
-     * @return the client channel
-     */
-    protected Channel getChannel() {
-        if (channel == null) {
-            channel = nmr.createChannel();
-        }
-
-        return channel;
-    }
-
-    public void exchangeSent(Exchange exchange) {
-        // graciously do nothing
-    }
-
-    public void exchangeDelivered(Exchange exchange) {
-        // graciously do nothing
-    }
-
-    public void exchangeFailed(Exchange exchange) {
-        // graciously do nothing
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java
deleted file mode 100644
index e7944bb..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.io.InputStream;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.UndeclaredThrowableException;
-
-import javax.activation.DataHandler;
-import javax.mail.util.ByteArrayDataSource;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.ClientImpl;
-import org.apache.cxf.jaxws.JaxWsClientProxy;
-import org.apache.cxf.jaxws.binding.soap.SOAPBindingImpl;
-import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
-import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
-import org.apache.cxf.mime.TestMtom;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class AttachmentTest extends CamelTestSupport {
-    
-    protected static final String SERVICE_ADDRESS = "local://smx/attachment";
-    protected static final String ROUTER_ADDRESS = "http://localhost:9036/mime-test";
-    
-    protected static final String SERVICE_CLASS = "serviceClass=org.apache.cxf.mime.TestMtom";
-     
-    
-    
-    
-    public static final QName MTOM_PORT = new QName(
-            "http://cxf.apache.org/mime", "TestMtomPort");
-
-    public static final QName MTOM_SERVICE = new QName(
-            "http://cxf.apache.org/mime", "TestMtomService");
-    
-    protected AbstractXmlApplicationContext applicationContext;
-    
-    
-           
-    
-    @Override
-    protected void setUp() throws Exception {
-        applicationContext = createApplicationContext();
-        super.setUp();        
-        assertNotNull("Should have created a valid spring context", applicationContext);
-
-        startService();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {        
-        if (applicationContext != null) {
-            applicationContext.destroy();
-        }
-        super.tearDown();
-    }
-    
-    protected void startService() {
-        //start a service
-        Object implementor = new MtomImpl();
-        
-        javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
-    }
-    
-   
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
-                from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");
-            }
-        };
-    }
-    
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        return SpringCamelContext.springCamelContext(applicationContext);
-    }
-    
-    
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/spring/mtom.xml");
-    }
-
-    
-    public void testAttachment() throws Exception {  
-        TestMtom mtomPort = createPort(MTOM_SERVICE, MTOM_PORT, TestMtom.class,
-                true);
-        try {
-            
-            Holder<DataHandler> param = new Holder<DataHandler>();
-            
-            param.value = new DataHandler(new ByteArrayDataSource("foobar".getBytes(), 
-                "application/octet-stream"));
-            
-            Holder<String> name = new Holder<String>("call detail");
-            mtomPort.testXop(name, param);
-            assertEquals("call detailfoobar",
-                    name.value);
-            assertNotNull(param.value);
-            InputStream bis = param.value.getDataSource().getInputStream();
-            byte b[] = new byte[10];
-            bis.read(b, 0, 10);
-            String attachContent = new String(b);
-            assertEquals(attachContent, "testfoobar");
-        } catch (UndeclaredThrowableException ex) {
-            throw (Exception) ex.getCause();
-        }        
-                
-    }
-    
-    private <T> T createPort(QName serviceName, QName portName,
-            Class<T> serviceEndpointInterface, boolean enableMTOM)
-        throws Exception {
-        Bus bus = BusFactory.getDefaultBus();
-        ReflectionServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean();
-        serviceFactory.setBus(bus);
-        serviceFactory.setServiceName(serviceName);
-        serviceFactory.setServiceClass(serviceEndpointInterface);
-        serviceFactory.setWsdlURL(getClass().getResource("/wsdl/mtom_xop.wsdl"));
-        Service service = serviceFactory.create();
-        EndpointInfo ei = service.getEndpointInfo(portName);
-        JaxWsEndpointImpl jaxwsEndpoint = new JaxWsEndpointImpl(bus, service,
-                ei);
-        SOAPBinding jaxWsSoapBinding = new SOAPBindingImpl(ei.getBinding(), jaxwsEndpoint);
-        jaxWsSoapBinding.setMTOMEnabled(enableMTOM);
-
-        Client client = new ClientImpl(bus, jaxwsEndpoint);
-        InvocationHandler ih = new JaxWsClientProxy(client, jaxwsEndpoint
-                .getJaxwsBinding());
-        Object obj = Proxy.newProxyInstance(serviceEndpointInterface
-                .getClassLoader(), new Class[] {serviceEndpointInterface,
-                    BindingProvider.class}, ih);
-        return serviceEndpointInterface.cast(obj);
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java
deleted file mode 100644
index c925038..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.servicemix.nmr.api.Status;
-
-import org.junit.Test;
-
-/**
- * Test case for making sure that the component behaves properly if the Camel route is using
- * asynchronous elements (e.g. threads or seda queues)
- */
-public class CamelAsyncRouteTest extends AbstractComponentTest {
-
-    private static final String HANDLED_BY_THREAD = "HandledByThread";
-    
-    private static final int COUNT = 1000;
-    private static final long DELAY = 60000;
-
-    /* Latch to count NMR Done Exchanges */
-    private CountDownLatch done;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        done = new CountDownLatch(COUNT);
-    }
-
-    @Test
-    public void testCamelThreads() throws InterruptedException {
-        expectDefaultMessageCount("mock:sent");
-        expectDefaultMessageCount("mock:threads").whenAnyExchangeReceived(new AssertHandledByCamelThreadProcessor());
-        
-        for (int i = 0 ; i < COUNT ; i++) {
-            template.asyncSendBody("direct:threads", "Simple message body " + i);
-        }
-
-        assertMockEndpointsSatisfied();
-
-        assertTrue("All NMR exchanges should have been marked DONE",
-                   done.await(DELAY, TimeUnit.MILLISECONDS));
-    }
-
-    @Test
-    public void testCamelSeda() throws InterruptedException {
-        expectDefaultMessageCount("mock:sent");
-        expectDefaultMessageCount("mock:seda");
-
-        for (int i = 0 ; i < COUNT ; i++) {
-            template.asyncSendBody("seda:seda", "Simple message body " + i);
-        }
-
-        assertMockEndpointsSatisfied();
-
-        assertTrue("All NMR exchanges should have been marked DONE",
-                   done.await(DELAY, TimeUnit.MILLISECONDS));
-    }
-
-    /*
-     * Configure the mock endpoint to expect {@value #COUNT} messages to arrive in {@value #DELAY}ms
-     */
-    private MockEndpoint expectDefaultMessageCount(String endpoint) {
-        final MockEndpoint mock = getMockEndpoint(endpoint);
-        mock.setResultWaitTime(DELAY);
-        mock.expectedMessageCount(COUNT);
-        return mock;
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:threads").to("mock:sent").to("nmr:threads");
-                from("nmr:threads")
-                    .threads(5)
-                    .process(new Processor() {
-                        public void process(Exchange exchange) throws Exception {
-                            exchange.setProperty(HANDLED_BY_THREAD, Thread.currentThread());
-                        }
-                    })
-                    .to("mock:threads");
-
-                from("seda:seda?concurrentConsumers=10").to("mock:sent").to("nmr:seda");
-                from("nmr:seda").to("seda:seda-internal?waitForTaskToComplete=Never");
-                from("seda:seda-internal").to("mock:seda");
-
-            }
-        };
-    }
-
-    @Override
-    public void exchangeDelivered(org.apache.servicemix.nmr.api.Exchange exchange) {
-        if (exchange.getStatus().equals(Status.Done)) {
-            done.countDown();
-        }
-    }
-
-    /*
-     * Processor to ensure that the exchange has been handled by a Camel thread instead of an NMR thread
-     */
-    private static final class AssertHandledByCamelThreadProcessor implements Processor {
-
-        public void process(Exchange exchange) throws Exception {
-            Thread thread = exchange.getProperty(HANDLED_BY_THREAD, Thread.class);
-            assertTrue("processor should have been called from the Camel 'threads' thread pool instead of " + thread.getName(),
-                       thread.getName().contains("Camel") && thread.getName().contains("Thread"));
-        }
-
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java
deleted file mode 100644
index 4a77285..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-/**
- * A very basic NMR test, just testing if the Exchange can flow through the NMR
- * from one Camel route to the next one
- */
-public class CamelTryCatchTest extends AbstractComponentTest {
-
-    private static final String REQUEST_MESSAGE = "Simple message body";
-
-    @Test
-    public void testInOnlyTryCatch() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:caught");
-        mock.expectedMessageCount(1);
-
-        template.sendBody("direct:inonly", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Test
-    public void testInOutTryCatch() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:caught");
-        mock.expectedMessageCount(1);
-
-        template.requestBody("direct:inout", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:inonly")
-                    .doTry()
-                        .to("nmr:throwsException")
-                    .doCatch(CustomBusinessException.class)
-                        .to("mock:caught");
-
-                from("direct:inout")
-                    .doTry()
-                        .to("nmr:throwsException")
-                    .doCatch(CustomBusinessException.class)
-                        .to("mock:caught");
-
-                from("nmr:throwsException")
-                    .errorHandler(noErrorHandler())
-                    .throwException(new CustomBusinessException());
-            }
-        };
-    }
-
-    /*
-     * Custom business exception for testing purposes
-     */
-    private static final class CustomBusinessException extends Exception {
-
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
deleted file mode 100644
index 2528032..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.CamelSpringTestSupport;
-import org.apache.camel.CamelContext;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.servicemix.samples.wsdl_first.Person;
-import org.apache.servicemix.samples.wsdl_first.PersonService;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
-public class CxfMessageTest extends CamelSpringTestSupport {
-       
-    
-    private ServerImpl server;
-
-    
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();        
-                
-        startService();
-    }
-
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/spring/CxfMessageBeans.xml");
-    }
-
-    protected void assertValidContext(CamelContext context) {
-        assertNotNull("No context found!", context);
-    }
-
-    protected void startService() {
-         Object implementor = new PersonImpl();
-        String address = "http://localhost:19000/PersonService/";
-        Endpoint.publish(address, implementor);
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (server != null) {
-            server.stop();
-        }
-        super.tearDown();
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                //from(routerEndpointURI).to("smx:testEndpoint");// like what do in binding component
-                //from("smx:testEndpoint").to(serviceEndpointURI);// like what do in se
-            }
-        };
-    }
-    
-    public void testInvokingServiceFromCXFClient() throws Exception {  
-     
-        URL wsdlURL = getClass().getClassLoader().getResource("person.wsdl");
-        
-
-        System.out.println(wsdlURL);
-        PersonService ss = new PersonService(wsdlURL, new QName("http://servicemix.apache.org/samples/wsdl-first", 
-            "PersonService"));
-        Person client = ss.getSoap();
-        ClientProxy.getClient(client).getOutInterceptors().add(new LoggingOutInterceptor());
-        ClientProxy.getClient(client).getInInterceptors().add(new LoggingInInterceptor());
-        Holder<String> personId = new Holder<String>();
-        personId.value = "world";
-        Holder<String> ssn = new Holder<String>();
-        Holder<String> name = new Holder<String>();
-        client.getPerson(personId, ssn, name);
-        assertEquals("we should get the right answer from router", "Bonjour", name.value);
-    }
-    
-        
-    
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
deleted file mode 100644
index 3a037f9..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.cxf.transport.CamelTransportFactory;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.hello_world_soap_http.BadRecordLitFault;
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.GreeterImpl;
-import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
-import org.apache.hello_world_soap_http.SOAPService;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.core.ServiceMix;
-
-
-public class ExceptionHandleTest extends CamelTestSupport {
-    protected static final String ROUTER_ADDRESS = "camel://jetty:http://localhost:19000/SoapContext/SoapPort";
-    protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
-    protected static final String SERVICE_CLASS = "serviceClass=org.apache.hello_world_soap_http.Greeter";
-    private static final String WSDL_LOCATION = "wsdlURL=/wsdl/hello_world.wsdl";
-    private static final String SERVICE_NAME = "serviceName={http://apache.org/hello_world_soap_http}SOAPService";
-
-    private String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS 
-        + "&" + WSDL_LOCATION + "&" + SERVICE_NAME + "&dataFormat=POJO&bus=#Bus";
-    private String serviceEndpointURI = "cxf://" + SERVICE_ADDRESS + "?" + SERVICE_CLASS
-        + "&" + WSDL_LOCATION + "&" + SERVICE_NAME + "&dataFormat=POJO&bus=#Bus";
-
-    private CamelContext camelContext;
-    private ServiceMixComponent smxComponent;
-    private NMR nmr;
-    private javax.xml.ws.Endpoint endpoint;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();        
-        Object implementor = new GreeterImpl();
-        endpoint = javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (camelContext != null) {
-            camelContext.stop();
-        }
-        if (endpoint != null) {
-            endpoint.stop();
-        }
-        super.tearDown();
-        // Not sure why we need a timeout here
-        // but if we don't, the jetty server is not fully
-        // stopped, so the next test fails. 
-        Thread.sleep(5000);
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                errorHandler(noErrorHandler());
-                from(routerEndpointURI).to("smx:testEndpoint");// like what do in binding component
-                from("smx:testEndpoint").to(serviceEndpointURI);// like what do in se
-            }
-        };
-    }
-    
-    protected CamelContext createCamelContext() throws Exception {
-        camelContext = new DefaultCamelContext(createJndiContext());
-        Bus bus = BusFactory.getDefaultBus();
-        CamelTransportFactory camelTransportFactory = (CamelTransportFactory) bus.getExtension(ConduitInitiatorManager.class)
-            .getConduitInitiator(CamelTransportFactory.TRANSPORT_ID);
-        camelTransportFactory.setCamelContext(camelContext);
-        List<String> ids = new ArrayList<String>();
-        ids.add(CamelTransportFactory.TRANSPORT_ID);
-        camelTransportFactory.setTransportIds(ids);
-        smxComponent = new ServiceMixComponent();
-        nmr = new ServiceMix();
-        ((ServiceMix)nmr).init();
-        smxComponent.setNmr(nmr);
-        camelContext.addComponent("smx", smxComponent);
-        return camelContext;
-    }
-
-    @Override
-    protected Context createJndiContext() throws Exception {
-        Context ctx = super.createJndiContext();
-        ctx.bind("Bus", BusFactory.getDefaultBus());
-        return ctx;    //To change body of overridden methods use File | Settings | File Templates.
-    }
-
-    public void testException() throws Exception {
-        URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
-        assertNotNull(wsdl);
-        SOAPService service1 = new SOAPService(wsdl, new QName(
-                "http://apache.org/hello_world_soap_http", "SOAPService"));
-        QName endpoint = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-        service1.addPort(endpoint, 
-                SOAPBinding.SOAP12HTTP_BINDING, "http://localhost:19000/SoapContext/SoapPort");
-        Greeter greeter = service1.getPort(endpoint, Greeter.class);
-        ClientProxy.getClient(greeter).getInInterceptors().add(new LoggingInInterceptor());
-        ClientProxy.getClient(greeter).getOutInterceptors().add(new LoggingOutInterceptor());
-        String ret = greeter.sayHi();
-        assertEquals(ret, "Bonjour");
-        String noSuchCodeFault = "NoSuchCodeLitFault";
-        String badRecordFault = "BadRecordLitFault";
-        try {
-            greeter.testDocLitFault(noSuchCodeFault);
-            fail("Should have thrown NoSuchCodeLitFault exception");
-        } catch (NoSuchCodeLitFault nslf) {
-            assertNotNull(nslf.getFaultInfo());
-            assertNotNull(nslf.getFaultInfo().getCode());
-        } 
-        
-        try {
-            greeter.testDocLitFault(badRecordFault);
-            fail("Should have thrown BadRecordLitFault exception");
-        } catch (BadRecordLitFault brlf) {                
-            BindingProvider bp = (BindingProvider)greeter;
-            Map<String, Object> responseContext = bp.getResponseContext();
-            Integer responseCode = (Integer) responseContext.get(Message.RESPONSE_CODE);
-            assertEquals(500, responseCode.intValue());                
-            assertNotNull(brlf.getFaultInfo());
-            assertEquals("BadRecordLitFault", brlf.getFaultInfo());
-        }
-    } 
-    
-    public void testOneway() throws Exception {
-        URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
-        assertNotNull(wsdl);
-        SOAPService service1 = new SOAPService(wsdl, new QName(
-                "http://apache.org/hello_world_soap_http", "SOAPService"));
-        QName endpoint = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-        service1.addPort(endpoint, 
-                SOAPBinding.SOAP12HTTP_BINDING, "http://localhost:19000/SoapContext/SoapPort");
-        Greeter greeter = service1.getPort(endpoint, Greeter.class);
-        ClientProxy.getClient(greeter).getInInterceptors().add(new LoggingInInterceptor());
-        ClientProxy.getClient(greeter).getOutInterceptors().add(new LoggingOutInterceptor());
-        greeter.greetMeOneWay("test oneway");
-        // Need to sleep a while as Camel is using Async Engine, 
-        // we need to make sure the camel context is not shutdown rightly.
-        Thread.sleep(1000); 
-    }
-    
-    public void testGetTransportFactoryFromBus() throws Exception {
-        Bus bus = BusFactory.getDefaultBus();
-        assertNotNull(bus.getExtension(ConduitInitiatorManager.class)
-            .getConduitInitiator(CamelTransportFactory.TRANSPORT_ID));
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java
deleted file mode 100644
index ebddb7f..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicemix.camel.nmr;
-
-public interface HelloService {
-    String sayHello();
-
-    void ping();
-
-    String echo(String text);
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java
deleted file mode 100644
index 77bd20e..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicemix.camel.nmr;
-
-public class HelloServiceImpl implements HelloService {
-    public String echo(String text) {        
-        System.out.println("call for echo with " + text);
-        return text + " echo";
-    }
-
-    public void ping() {
-
-    }
-
-    public String sayHello() {
-        return "hello";
-    }
-}
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java
deleted file mode 100644
index b231cbc..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.activation.DataHandler;
-import javax.jws.WebService;
-import javax.mail.util.ByteArrayDataSource;
-import javax.xml.ws.Holder;
-
-import org.apache.cxf.mime.types.XopStringType;
-
-@WebService(serviceName = "TestMtomService", 
-        portName = "TestMtomPort", 
-        targetNamespace = "http://cxf.apache.org/mime", 
-        endpointInterface = "org.apache.cxf.mime.TestMtom",
-            wsdlLocation = "testutils/mtom_xop.wsdl")
-public class MtomImpl {
-    public void testXop(Holder<String> name, Holder<DataHandler> attachinfo) {
-        
-        try {
-            InputStream bis = attachinfo.value.getDataSource().getInputStream();
-            byte b[] = new byte[6];
-            bis.read(b, 0, 6);
-            String attachContent = new String(b);
-            name.value = name.value + attachContent;
-            
-            ByteArrayDataSource source = 
-                new ByteArrayDataSource(("test" + attachContent).getBytes(), "application/octet-stream");
-            attachinfo.value = new DataHandler(source);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        
-    }
-    public XopStringType testXopString(XopStringType data) {
-        return data;
-    }
-
-}
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
deleted file mode 100644
index fff06e4..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * Test case to ensure that the component can deal with multiple {@link org.apache.servicemix.camel.nmr.ServiceMixProducer}
- * instances for the same endpoint name being used concurrently.
- */
-public class MultipleProducersTest extends AbstractComponentTest {
-
-    private static final int COUNT = 100;
-
-    @Test
-    public void testConcurrentlyUsingTheSameProducerName() throws InterruptedException {
-        getMockEndpoint("mock:handler").expectedMessageCount(2 * COUNT);
-
-        ExecutorService executor = Executors.newFixedThreadPool(10);
-
-        for (int i = 0 ; i < 100 ; i++) {
-            executor.execute(new Runnable() {
-                public void run() {
-                    assertEquals("Replying to Guillaume",
-                                 template.requestBody("direct:a", "Guillaume"));
-                }
-            });
-            executor.execute(new Runnable() {
-                public void run() {
-                    assertEquals("Replying to Chris",
-                                 template.requestBody("direct:a", "Chris"));
-                }
-            });
-        }
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:a").to("nmr:handler");
-                from("direct:b").to("nmr:handler");
-
-                from("nmr:handler").setBody(simple("Replying to ${body}")).to("mock:handler");
-            }
-        };
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java
deleted file mode 100644
index 4676e9a..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-
-import org.apache.servicemix.samples.wsdl_first.Person;
-import org.apache.servicemix.samples.wsdl_first.UnknownPersonFault;
-
-@WebService(serviceName = "PersonService",
-        targetNamespace = "http://servicemix.apache.org/samples/wsdl-first",
-        endpointInterface = "org.apache.servicemix.samples.wsdl_first.Person")
-public class PersonImpl implements Person {
-
-    public void getPerson(Holder<String> personId, Holder<String> ssn,
-            Holder<String> name) throws UnknownPersonFault {
-        System.out.println("the server is invoked ");
-        if (personId.value == null || personId.value.length() == 0) {
-            org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault
-                fault = new org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault();
-            fault.setPersonId(personId.value);
-            throw new UnknownPersonFault(null, fault);
-        }
-        name.value = "Bonjour";
-        ssn.value = "000-000-0000";
-    }
-
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/RunAsSubjectTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/RunAsSubjectTest.java
deleted file mode 100644
index 8d00a33..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/RunAsSubjectTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.security.AccessController;
-
-import javax.security.auth.Subject;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.servicemix.nmr.api.security.UserPrincipal;
-import org.junit.Test;
-
-public class RunAsSubjectTest  extends AbstractComponentTest {
-
-    private static final String REQUEST_MESSAGE = "Simple message body";
-
-    @Test
-    public void testRunAsSubject() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:caught");
-        mock.expectedMessageCount(1);
-
-        template.sendBody("direct:inonly", REQUEST_MESSAGE);
-
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-            	Subject subject = new Subject();
-                subject.getPrincipals().add(new UserPrincipal("ffang"));
-                from("direct:inonly").setHeader(Exchange.AUTHENTICATION).constant(subject).
-                	to("nmr:helloworld");
-                   
-                from("nmr:helloworld?runAsSubject=true").process(new SubjectProcessor());
-                    
-            }
-        };
-    }
-
-    class SubjectProcessor implements Processor {
-
-		public void process(Exchange exchange) throws Exception {
-			Subject receivedSubject = 
-            	(Subject)exchange.getIn().getHeader(Exchange.AUTHENTICATION);
-            assertNotNull(receivedSubject);
-            assertEquals(receivedSubject.getPrincipals().size(), 1);
-            assertEquals(receivedSubject.getPrincipals().iterator().next().getName(), "ffang");
-            Subject onBefalfsubject = Subject.getSubject(AccessController.getContext());
-            assertNotNull(onBefalfsubject);
-            assertEquals(onBefalfsubject, receivedSubject);
-			
-		}
-    	
-    }
-}
\ No newline at end of file
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java
deleted file mode 100644
index 6e9c40e..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-import javax.security.auth.Subject;
-import java.security.Principal;
-
-/**
- * Test case to ensure the Camel NMR component is capable of conveying security information provided by Camel
- */
-public class SecuritySubjectTest extends AbstractComponentTest {
-
-    private static final String REQUEST_MESSAGE = "Simple message body";
-    private static final String RESPONSE_MESSAGE = "Simple message reply";
-
-    private static final Principal CLARK_KENT = new PrincipalImpl("Clark Kent");
-    private static final Principal SUPERMAN = new PrincipalImpl("Superman");
-
-    /*
-     * Test case for conveying security subject information in an InOnly MEP
-     */
-    @Test
-    public void testInOnlyWithSecuritySubject() throws Exception {
-        Subject subject = createSubject(CLARK_KENT);
-
-        MockEndpoint mock = getMockEndpoint("mock:simple");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        template.sendBodyAndHeader("direct:simple", REQUEST_MESSAGE,
-                Exchange.AUTHENTICATION, subject);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    /*
-     * Test case for conveying security subject information in an InOut MEP
-     */
-    @Test
-    public void testInOutWithSecuritySubject() throws Exception {
-        final Subject subject = createSubject(CLARK_KENT);
-
-        Exchange result = template.request("direct:simple", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setBody(REQUEST_MESSAGE);
-                exchange.getIn().setHeader(Exchange.AUTHENTICATION, subject);
-            }
-        });
-
-        assertSecuritySubject(SUPERMAN, result.getOut().getHeader(Exchange.AUTHENTICATION, Subject.class));
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:simple").to("nmr:simple");
-                from("nmr:simple").process(assertSecuritySubject()).to("mock:simple");
-            }
-        };
-    }
-
-    /*
-     * Build a simple {@link Processor} to ensure our exchange contains the correct security information
-     */
-    private Processor assertSecuritySubject() {
-        return new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                Subject subject = exchange.getIn().getHeader(Exchange.AUTHENTICATION, Subject.class);
-                assertSecuritySubject(CLARK_KENT, subject);
-
-                if (ExchangePattern.InOut.equals(exchange.getPattern())) {
-                    // wow, Clark Kent is Superman, who would have thought that?
-                    exchange.getOut().copyFrom(exchange.getIn());
-                    exchange.getOut().setBody(RESPONSE_MESSAGE);
-                    exchange.getOut().setHeader(Exchange.AUTHENTICATION, createSubject(SUPERMAN));
-                }
-            }
-        };
-    }
-
-    @Override
-    public void exchangeSent(org.apache.servicemix.nmr.api.Exchange exchange) {
-        super.exchangeSent(exchange);
-
-        // let's check the subject inside the NMR as well
-        if (exchange.getIn(false) != null) {
-            assertSecuritySubject(CLARK_KENT, exchange.getIn().getSecuritySubject());
-        }
-        if (exchange.getOut(false) != null) {
-            assertSecuritySubject(SUPERMAN, exchange.getOut().getSecuritySubject());
-        }
-    }
-
-    /*
-    * Ensure that the Subject is valid and matches the principal
-    */
-    private void assertSecuritySubject(Principal expected, Subject subject) {
-        assertNotNull(subject);
-        assertTrue("Subject should have contained " + expected, subject.getPrincipals().contains(expected));
-    }
-
-    /*
-     * Create a new Subject, containing the provided principal information
-     */
-    private Subject createSubject(Principal principal) {
-        final Subject subject = new Subject();
-        subject.getPrincipals().add(principal);
-        return subject;
-    }
-
-    /*
-     * Simple {@link Principal} implementation used for testing
-     */
-    private static final class PrincipalImpl implements Principal {
-
-        private final String name;
-
-        public PrincipalImpl(String name) {
-            super();
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String toString() {
-            return String.format("Principal [%s]", name);
-        }
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java
deleted file mode 100644
index 9a8258a..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.junit.Test;
-
-/**
- * Test cases for {@link org.apache.servicemix.camel.nmr.ServiceMixBinding}
- */
-public class ServiceMixBindingTest extends AbstractComponentTest {
-
-    private static final String KEY = "test.key";
-    private static final String VALUE = "test.value";
-    private static final String MESSAGE = "Message content";
-
-    private ServiceMixBinding binding = new ServiceMixBinding();
-
-    @Test
-    public void testToCamelAndBackToNmr() {
-        Exchange nmr = getChannel().createExchange(Pattern.InOnly);
-        nmr.setProperty(KEY, VALUE);
-        nmr.getIn().setBody(MESSAGE);
-        nmr.getIn().setHeader(KEY, VALUE);
-
-        org.apache.camel.Exchange camel =
-                binding.populateCamelExchangeFromNmrExchange(new DefaultCamelContext(), nmr);
-
-        assertEquals(VALUE, camel.getProperty(KEY));
-        assertEquals(VALUE, camel.getIn().getHeader(KEY));
-        assertEquals(MESSAGE, camel.getIn().getBody());
-        assertEquals("NMR Exchange should be available on the Camel Exchange",
-                     nmr, camel.getProperty(ServiceMixBinding.NMR_EXCHANGE));
-
-        assertSame(nmr, binding.extractNmrExchange(camel));
-        assertNull("NMR Exchange should have been removed from the Camel Exchange",
-                   camel.getProperty(ServiceMixBinding.NMR_EXCHANGE));
-        
-
-    }
-
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixComponentTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixComponentTest.java
deleted file mode 100644
index 91ed657..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixComponentTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.SynchronousDelegateProducer;
-import org.junit.Test;
-
-/**
- * Test cases for {@link ServiceMixComponent} and the correct handling of the nmr: URIs
- */
-public class ServiceMixComponentTest extends AbstractComponentTest {
-
-    private final CamelContext context = new DefaultCamelContext();
-
-    @Test
-    public void testSimpleUri() {
-        ServiceMixEndpoint endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test");
-        assertNotNull(endpoint);
-    }
-
-    @Test
-    public void testSyncOperation() throws Exception {
-        ServiceMixEndpoint endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test?synchronous=true");
-        assertNotNull(endpoint);
-        Producer producer = endpoint.createProducer();
-        assertTrue("It should be the instance of ", producer instanceof SynchronousDelegateProducer);
-    }
-
-    @Test
-    public void testUriRunAsSubject() {
-        ServiceMixEndpoint endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test");
-        assertNotNull(endpoint);
-        assertFalse(endpoint.isRunAsSubject());
-
-        endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test?runAsSubject=false");
-        assertNotNull(endpoint);
-        assertFalse(endpoint.isRunAsSubject());
-
-        endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test?runAsSubject=true");
-        assertNotNull(endpoint);
-        assertTrue(endpoint.isRunAsSubject());
-    }
-
-    @Test
-    public void testUriTimeOut() {
-        ServiceMixEndpoint endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test");
-        assertNotNull(endpoint);
-        assertEquals(new Long(0), endpoint.getTimeOut());
-        endpoint = (ServiceMixEndpoint) context.getEndpoint("nmr:Test?timeout=3000");
-        assertNotNull(endpoint);
-        assertEquals(new Long(3000), endpoint.getTimeOut());
-    }
-
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
deleted file mode 100644
index f32fc71..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-/**
- * Test case for the ?synchronous=true setting on a camel consumer endpoint
- */
-public class ShouldRunSynchronouslyTest extends AbstractComponentTest {
-
-    private static final String HANDLED_BY_THREAD = "HandledByThread";
-
-    @Test
-    public void testProcessingOnSameThread() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:simple");
-        mock.expectedBodiesReceived("Simple message body");
-
-        template.sendBody("direct:simple", "Simple message body");
-
-        assertMockEndpointsSatisfied();
-
-        Thread thread = mock.getExchanges().get(0).getProperty(HANDLED_BY_THREAD, Thread.class);
-        assertNotNull(thread);
-        assertEquals("No thread context switching should have occurred",
-                     Thread.currentThread(), thread);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:simple").to("nmr:simple");
-                from("nmr:simple?synchronous=true").process(new Processor() {
-
-                    public void process(Exchange exchange) throws Exception {
-                        exchange.setProperty(HANDLED_BY_THREAD, Thread.currentThread());
-                    }
-
-                }).to("mock:simple");
-            }
-        };
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java
deleted file mode 100644
index d36adb6..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-/**
- * A very basic NMR test, just testing if the Exchange can flow through the NMR
- * from one Camel route to the next one
- */
-public class SimpleNmrTest extends AbstractComponentTest {
-
-    private static final String REQUEST_MESSAGE = "Simple message body";
-    private static final String RESPONSE_MESSAGE = "Simple message reply";
-
-    @Test
-    public void testSimpleInOnly() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:simple");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        template.sendBody("direct:simple", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Test
-    public void testSimpleInOnlyWithMultipleHops() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:hops");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        template.sendBody("direct:hops", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();        
-    }
-
-    @Test
-    public void testSimpleInOut() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:simple");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        final String response = template.requestBody("direct:simple", REQUEST_MESSAGE, String.class);
-
-        assertMockEndpointsSatisfied();
-        assertEquals("Receiving back the reply set by the second route",
-                     RESPONSE_MESSAGE, response);
-    }
-
-    @Test
-    public void testSimpleInOutWithMultipleHops() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:hops");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        final String response = template.requestBody("direct:hops", REQUEST_MESSAGE, String.class);
-
-        assertMockEndpointsSatisfied();
-        assertEquals("Receiving back the reply set by the second route",
-                     RESPONSE_MESSAGE, response);
-    }
-
-    @Test
-    public void testSimpleInvalidEndpoint() throws InterruptedException {
-        Exchange exchange = template.send("direct:error", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setBody(REQUEST_MESSAGE);
-            }
-        });
-
-        assertTrue("Sending to an invalid NMR endpoint should have failed", exchange.isFailed());
-    }
-
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:simple").to("nmr:simple");
-                from("nmr:simple").to("mock:simple").setBody(constant(RESPONSE_MESSAGE));
-
-                from("direct:hops").to("nmr:hop1");
-                from("nmr:hop1").to("nmr:hop2");
-                from("nmr:hop2").to("mock:hops").setBody(constant(RESPONSE_MESSAGE));
-
-                from("direct:error").to("nmr:invalid-endpoint-name");
-            }
-        };
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java
deleted file mode 100644
index cf729f3..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class SmxToCxfSpringTest extends SmxToCxfTest {
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        assertNotNull("Should have created a valid spring context", applicationContext);
-
-        
-    }
-
-    @Override
-    protected void tearDown() throws Exception {        
-        super.tearDown();
-    }
-    
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("cxf:bean:routerEndpoint").to("smx:bean:testEndpoint");
-                from("smx:bean:testEndpoint").to("cxf:bean:serviceEndpoint");              
-            }
-        };
-    }
-    
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        return SpringCamelContext.springCamelContext(applicationContext);
-    }
-    
-    
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/spring/EndpointBeans.xml");
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
deleted file mode 100644
index e2684e2..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.CamelSpringTestSupport;
-import org.apache.camel.CamelContext;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.frontend.ClientFactoryBean;
-import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.frontend.ServerFactoryBean;
-import org.springframework.beans.BeansException;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
-public class SmxToCxfTest extends CamelSpringTestSupport {
-
-    private static final String BUS_BEAN_NAME = "Bus";
-    protected static final String ROUTER_ADDRESS = "http://localhost:19000/router";
-    protected static final String SERVICE_ADDRESS = "local://smx/helloworld";
-    protected static final String SERVICE_CLASS = "serviceClass=org.apache.servicemix.camel.nmr.HelloService";
-
-    private String routerEndpointURI =
-            String.format("cxf://%s?%s&dataFormat=POJO&setDefaultBus=true&bus=#%s", ROUTER_ADDRESS, SERVICE_CLASS, BUS_BEAN_NAME);
-
-    private String serviceEndpointURI =
-            String.format("cxf://%s?%s&dataFormat=POJO&setDefaultBus=true&bus=#%s", SERVICE_ADDRESS, SERVICE_CLASS, BUS_BEAN_NAME);
-
-    private ServerImpl server;
-    private Bus bus;
-
-    @Override
-    protected void setUp() throws Exception {
-        bus = CXFBusFactory.getDefaultBus();
-        
-        super.setUp();        
-                
-        startService();
-    }
-
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/spring/DummyBean.xml") {
-            @Override
-            public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
-                if (BUS_BEAN_NAME.equals(name)) {
-                    return requiredType.cast(bus);
-                }                
-                return super.getBean(name, requiredType);    //To change body of overridden methods use File | Settings | File Templates.
-            }
-        };
-    }
-
-    protected void assertValidContext(CamelContext context) {
-        assertNotNull("No context found!", context);
-    }
-
-    protected void startService() {
-        //start a service
-        ServerFactoryBean svrBean = new ServerFactoryBean();
-
-        svrBean.setAddress(SERVICE_ADDRESS);
-        svrBean.setServiceClass(HelloService.class);
-        svrBean.setServiceBean(new HelloServiceImpl());
-        svrBean.setBus(CXFBusFactory.getDefaultBus());
-
-        server = (ServerImpl)svrBean.create();
-        server.start();
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (server != null) {
-            server.stop();
-        }
-        super.tearDown();
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from(routerEndpointURI).to("smx:testEndpoint");// like what do in binding component
-                from("smx:testEndpoint").to(serviceEndpointURI);// like what do in se
-            }
-        };
-    }
-
-    public void testInvokingServiceFromCXFClient() throws Exception {
-        Bus bus = BusFactory.getDefaultBus();
-        
-        ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
-        ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean();
-        clientBean.setAddress(ROUTER_ADDRESS);        
-        clientBean.setServiceClass(HelloService.class);
-        clientBean.setBus(bus);        
-        
-        HelloService client = (HelloService) proxyFactory.create();
-        String result = client.echo("hello world");
-        assertEquals("we should get the right answer from router", "hello world echo", result);
-    }
-    
-        
-    
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/TimeoutTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/TimeoutTest.java
deleted file mode 100644
index 00a0d76..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/TimeoutTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.servicemix.nmr.api.AbortedException;
-import org.junit.Test;
-
-/**
- * A basic test to ensure that the 'timeout' property on the endpoint works fine.
- */
-public class TimeoutTest extends AbstractComponentTest {
-
-    private static final String SLOW_MESSAGE = "Take the slow route, please!";
-    private static final String FAST_MESSAGE = "Get me there as quickly as you can!";
-    private static final String RESPONSE_MESSAGE = "You've arrived at your destination!";
-
-    private static final Long TIMEOUT = 1000l;
-
-    @Test
-    public void testFastInOutWithTimeout() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:timeout");
-        mock.expectedMessageCount(1);
-
-        Exchange result = template.request("direct:timeout", new Processor() {
-
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setBody(FAST_MESSAGE);
-            }
-
-        });
-
-        assertMockEndpointsSatisfied();
-        assertFalse("Exchange got finished successfully", result.isFailed());
-        assertEquals("Response message got set", RESPONSE_MESSAGE, result.getOut().getBody());
-    }
-
-    @Test
-    public void testSlowInOutWithTimeout() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:timeout");
-        mock.expectedMessageCount(0);
-
-        Exchange result = template.request("direct:timeout", new Processor() {
-
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setBody(SLOW_MESSAGE);
-            }
-
-        });
-
-        assertTrue("Exchange got finished successfully", result.isFailed());
-        assertFalse("Response message not set", result.hasOut());
-        assertTrue("TimeoutException was thrown", result.getException() instanceof AbortedException);
-    }
-
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("direct:timeout")
-                    .choice()
-                        .when(simple("${body} contains slow")).to("nmr:slow-route?timeout=" + TIMEOUT)
-                        .otherwise().to("nmr:fast-route?timeout=" + TIMEOUT)
-                     .end()
-                     .to("mock:timeout");
-
-                from("nmr:fast-route").process(new ResponseProcessor());
-                from("nmr:slow-route").delay(2 * TIMEOUT).process(new ResponseProcessor());
-            }
-        };
-    }
-
-    private final class ResponseProcessor implements Processor {
-
-        public void process(Exchange exchange) throws Exception {
-            exchange.getOut().setBody(RESPONSE_MESSAGE);
-        }
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java
deleted file mode 100644
index fcba2c9..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.addressing;
-
-import java.util.concurrent.Future;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-import javax.xml.ws.WebServiceContext;
-
-import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.hello_world_soap_http.BadRecordLitFault;
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
-import org.apache.hello_world_soap_http.types.BareDocumentResponse;
-import org.apache.hello_world_soap_http.types.ErrorCode;
-import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
-import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.apache.hello_world_soap_http.types.GreetMeSometimeResponse;
-import org.apache.hello_world_soap_http.types.NoSuchCodeLit;
-import org.apache.hello_world_soap_http.types.SayHiResponse;
-import org.apache.hello_world_soap_http.types.TestDocLitFaultResponse;
-import org.apache.hello_world_soap_http.types.TestNillableResponse;
-
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
-
-
-@WebService(serviceName = "SOAPServiceAddressing", 
-            portName = "SoapPort", 
-            endpointInterface = "org.apache.hello_world_soap_http.Greeter", 
-            targetNamespace = "http://apache.org/hello_world_soap_http",
-            wsdlLocation = "org/apache/servicemix/camel/ws/addressing/hello_world.wsdl")
-public class GreeterImpl implements Greeter, VerificationCache {
-    
-    private String verified;
-    /**
-     * Injectable context.
-     */
-    @Resource
-    private WebServiceContext context;
-
-
-    public String greetMe(String me) {
-        System.out.println("\n\n*** GreetMe called with: " + me + "***\n\n");
-        verifyMAPs();
-        return "Hello " + me;
-    }
-
-    public String greetMeLater(long delay) {
-        System.out.println("\n\n*** GreetMeLater called with: " + delay + "***\n\n");
-        if (delay > 0) {
-            try {
-                Thread.sleep(delay);
-            } catch (InterruptedException ex) {
-                // ignore
-            }
-        }
-        verifyMAPs();
-        return "Hello, finally";
-    }
-
-    public void greetMeOneWay(String requestType) {   
-        System.out.println("\n\n*** GreetMeOneWay called with: " + requestType + "***\n\n");
-        verifyMAPs();
-    }
-
-    public String sayHi() {
-        verifyMAPs();
-        return "sayHi:Bonjour";
-    }
-    
-    public void testDocLitFault(String faultType) throws BadRecordLitFault, NoSuchCodeLitFault {
-        verifyMAPs();
-        if (faultType.equals(BadRecordLitFault.class.getSimpleName())) {
-            throw new BadRecordLitFault("TestBadRecordLit", "BadRecordLitFault");
-        }
-        if (faultType.equals(NoSuchCodeLitFault.class.getSimpleName())) {
-            ErrorCode ec = new ErrorCode();
-            ec.setMajor((short)1);
-            ec.setMinor((short)1);
-            NoSuchCodeLit nscl = new NoSuchCodeLit();
-            nscl.setCode(ec);
-            throw new NoSuchCodeLitFault("TestNoSuchCodeLit", nscl);
-        }
-    }
-
-    public BareDocumentResponse testDocLitBare(String in) {
-        BareDocumentResponse res = new BareDocumentResponse();
-        res.setCompany("Celtix");
-        res.setId(1);
-        return res;
-    }
-
-    private void verifyMAPs() {
-        if (context.getMessageContext() != null) {
-            String property = SERVER_ADDRESSING_PROPERTIES_INBOUND;
-            AddressingProperties maps = (AddressingProperties)
-                context.getMessageContext().get(property);
-            put(WSAddressingTest.verifyMAPs(maps, this));
-        }
-    }
-
-    public String greetMeSometime(String me) {
-        return "greetMeSomeTime:How are you " + me;
-    }
-    
-    public Future<?>  greetMeSometimeAsync(String requestType, 
-                                           AsyncHandler<GreetMeSometimeResponse> asyncHandler) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Response<TestDocLitFaultResponse> testDocLitFaultAsync(String faultType) {  
-        return null; 
-        /*not called */
-    }
-    
-    public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler ah) {  
-        return null; 
-        /*not called */
-    }
-    
-    public Future<?> testDocLitBareAsync(String bare, AsyncHandler ah) {
-        return null;
-        /* not called */
-    }
-    
-    public Response<BareDocumentResponse> testDocLitBareAsync(String bare) {
-        return null;
-        /* not called */
-    }
-    
-    public Future<?> greetMeAsync(String requestType, AsyncHandler<GreetMeResponse> asyncHandler) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Response<GreetMeResponse> greetMeAsync(String requestType) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Future<?> greetMeLaterAsync(long requestType, AsyncHandler<GreetMeLaterResponse> asyncHandler) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Response<GreetMeLaterResponse> greetMeLaterAsync(long requestType) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Future<?> sayHiAsync(AsyncHandler<SayHiResponse> asyncHandler) { 
-        return null; 
-        /*not called */
-    }
-    
-    public Response<SayHiResponse> sayHiAsync() { 
-        return null; 
-        /*not called */
-    }
-
-    public String testNillable(String nillElem, int intElem) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Response<TestNillableResponse> testNillableAsync(String nillElem,
-                                                            int intElem) {
-        return null;
-    }
-    
-    public Future<?> testNillableAsync(String nillElem, 
-                                       int intElem,
-                                       AsyncHandler<TestNillableResponse> asyncHandler) {
-        return null;
-    }
-    
-    protected boolean verify(Logger log) {
-        if (verified != null) {
-            System.out.println("MAP/Header verification failed: " + verified);
-            log.log(Level.WARNING, 
-                    "MAP/Header verification failed: {0}",
-                    verified);
-        }
-        return verified == null;
-    }
-    
-
-    public void put(String verification) {
-        if (verification != null) {
-            verified = verified == null
-                       ? verification
-                : verified + "; " + verification;
-        }
-    }
-}
-
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java
deleted file mode 100644
index 510b85f..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.addressing;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.binding.soap.SoapVersion;
-import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
-import org.apache.cxf.headers.Header;
-import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AttributedURIType;
-import org.apache.cxf.ws.addressing.ContextUtils;
-import org.apache.cxf.ws.addressing.Names;
-import org.apache.cxf.ws.addressing.soap.VersionTransformer;
-import org.apache.cxf.ws.addressing.v200408.AttributedURI;
-
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
-
-
-/**
- * Verifies presence of expected SOAP headers.
- */
-public class HeaderVerifier extends AbstractSoapInterceptor {
-    VerificationCache verificationCache = new GreeterImpl();
-    String currentNamespaceURI;
-    
-    public HeaderVerifier() {
-        super(Phase.POST_PROTOCOL);
-    }
-    
-    public Set<QName> getUnderstoodHeaders() {
-        return Names.HEADERS;
-    }
-
-    public void handleMessage(SoapMessage message) {
-        mediate(message);
-    }
-
-    public void handleFault(SoapMessage message) {
-        mediate(message);
-    }
-    
-    private void mediate(SoapMessage message) {
-        boolean outgoingPartialResponse = isOutgoingPartialResponse(message);
-        if (outgoingPartialResponse) {
-            addPartialResponseHeader(message);
-        }
-        verify(message, outgoingPartialResponse);
-    }
-
-    private void addPartialResponseHeader(SoapMessage message) {
-        try {
-            // add piggybacked wsa:From header to partial response
-            List<Header> header = message.getHeaders();
-            Document doc = DOMUtils.createDocument();
-            SoapVersion ver = message.getVersion();
-            Element hdr = doc.createElementNS(ver.getHeader().getNamespaceURI(), 
-                ver.getHeader().getLocalPart());
-            hdr.setPrefix(ver.getHeader().getPrefix());
-            
-            marshallFrom("urn:piggyback_responder", hdr, getMarshaller());
-            NodeList nl = hdr.getChildNodes();
-            for (int i = 0; i < nl.getLength(); i++) {
-                Object obj = nl.item(i);
-                if (obj instanceof Element) {
-                    Element elem = (Element) obj;
-                    Header holder = new Header(
-                            new QName(elem.getNamespaceURI(), elem.getLocalName()), 
-                            elem, null);
-                    header.add(holder);
-                }
-            }
-            
-        } catch (Exception e) {
-            verificationCache.put("SOAP header addition failed: " + e);
-            e.printStackTrace();
-        }
-    }
-
-    private void verify(SoapMessage message, boolean outgoingPartialResponse) {
-        try {
-            List<String> wsaHeaders = new ArrayList<String>();
-            List<Header> headers = message.getHeaders();
-            if (headers != null) {
-                recordWSAHeaders(headers,
-                                 wsaHeaders,
-                                 Names.WSA_NAMESPACE_NAME);
-                recordWSAHeaders(headers,
-                                 wsaHeaders,
-                                 VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
-                recordWSAHeaders(headers,
-                                 wsaHeaders,
-                                 WSAddressingTest.CUSTOMER_NAME.getNamespaceURI());
-            }
-            boolean partialResponse = isIncomingPartialResponse(message)
-                                      || outgoingPartialResponse;
-            verificationCache.put(WSAddressingTest.verifyHeaders(wsaHeaders, 
-                                                        partialResponse,
-                                                        isRequestLeg(message)));
-        } catch (SOAPException se) {
-            verificationCache.put("SOAP header verification failed: " + se);
-        }
-    }
-
-    private void recordWSAHeaders(List<Header> headers,
-                                  List<String> wsaHeaders,
-                                  String namespaceURI) {
-        Iterator<Header> iter = headers.iterator();
-        while (iter.hasNext()) {
-            Object obj = iter.next().getObject();
-            if (obj instanceof Element) {
-                Element hdr = (Element) obj;
-                if (namespaceURI.equals(hdr.getNamespaceURI())) {
-                    if (namespaceURI.endsWith("addressing")) {
-                        currentNamespaceURI = namespaceURI;
-                        wsaHeaders.add(hdr.getLocalName());
-                    } else if (WSAddressingTest.CUSTOMER_NAME.getNamespaceURI().equals(namespaceURI)) {
-                        String headerText = hdr.getTextContent();
-                        if (WSAddressingTest.CUSTOMER_KEY.equals(headerText)) {
-                            wsaHeaders.add(hdr.getLocalName());
-                        }
-                    }
-                }
-            }
-            
-        }
-    }
-
-    private boolean isRequestLeg(SoapMessage message) {
-        return (ContextUtils.isRequestor(message) && ContextUtils.isOutbound(message))
-               || (!ContextUtils.isRequestor(message) && !ContextUtils.isOutbound(message));     
-    }
-
-    private boolean isOutgoingPartialResponse(SoapMessage message) {
-        AddressingProperties maps = 
-            (AddressingProperties)message.get(SERVER_ADDRESSING_PROPERTIES_OUTBOUND);
-        return ContextUtils.isOutbound(message)
-               && !ContextUtils.isRequestor(message)
-               && maps != null
-               && Names.WSA_ANONYMOUS_ADDRESS.equals(maps.getTo().getValue());
-    }
-    
-    private boolean isIncomingPartialResponse(SoapMessage message) 
-        throws SOAPException {
-        AddressingProperties maps = 
-            (AddressingProperties)message.get(CLIENT_ADDRESSING_PROPERTIES_INBOUND);
-        return !ContextUtils.isOutbound(message)
-               && ContextUtils.isRequestor(message)
-               && maps != null
-               && Names.WSA_ANONYMOUS_ADDRESS.equals(maps.getTo().getValue());
-    }
-    
-    private Marshaller getMarshaller() throws JAXBException {
-        JAXBContext jaxbContext =
-            VersionTransformer.getExposedJAXBContext(currentNamespaceURI);
-        Marshaller marshaller = jaxbContext.createMarshaller();
-        marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
-        return marshaller;
-    }
-
-    private void marshallFrom(String from, Element header, Marshaller marshaller) 
-        throws JAXBException {
-        if (Names.WSA_NAMESPACE_NAME.equals(currentNamespaceURI)) {
-            String u = "urn:piggyback_responder";
-            AttributedURIType value =
-                org.apache.cxf.ws.addressing.ContextUtils.getAttributedURI(u);
-            marshaller.marshal(
-                new JAXBElement<AttributedURIType>(Names.WSA_FROM_QNAME,
-                                                   AttributedURIType.class,
-                                                   value),
-                header);
-        } else if (VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(
-                                                      currentNamespaceURI)) {
-            AttributedURI value =
-                VersionTransformer.Names200408.WSA_OBJECT_FACTORY.createAttributedURI();
-            value.setValue(from);
-            QName qname = new QName(VersionTransformer.Names200408.WSA_NAMESPACE_NAME, 
-                                    Names.WSA_FROM_NAME);
-            marshaller.marshal(
-                new JAXBElement<AttributedURI>(qname,
-                                               AttributedURI.class,
-                                               value),
-                header);
-        }                                                                    
-    }
-    
-    public void setVerificationCache(VerificationCache cache) {
-        verificationCache = cache;
-    }
-    
-    
-}
-
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
deleted file mode 100644
index 1a97737..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.addressing;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
-import org.apache.cxf.ws.addressing.ContextUtils;
-import org.apache.cxf.ws.addressing.Names;
-
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
-
-
-/**
- * Verifies presence of MAPs in the context.
- */
-public class MAPVerifier extends AbstractPhaseInterceptor<Message> {
-    VerificationCache verificationCache = new GreeterImpl();
-    List<String> expectedExposedAs = new ArrayList<String>();
-    private Map<String, Object> mapProperties;
-
-    public MAPVerifier() {
-        super(Phase.POST_LOGICAL);
-        mapProperties = new HashMap<String, Object>();
-        mapProperties.put(WSAddressingTest.INBOUND_KEY, CLIENT_ADDRESSING_PROPERTIES_INBOUND);
-        mapProperties.put(WSAddressingTest.OUTBOUND_KEY, CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
-    }
-    
-    public void handleMessage(Message message) {
-        verify(message);
-    }
-
-    public void handleFault(Message message) {
-        verify(message);
-    }
-
-    private void verify(Message message) {
-        boolean isOutbound = ContextUtils.isOutbound(message);
-        String mapProperty = 
-            (String)mapProperties.get(isOutbound 
-                                      ? WSAddressingTest.OUTBOUND_KEY
-                                      : WSAddressingTest.INBOUND_KEY);
-        AddressingProperties maps = 
-            (AddressingPropertiesImpl)message.get(mapProperty);
-        if (ContextUtils.isRequestor(message)) {
-            if (isOutbound) {
-                String exposeAs = getExpectedExposeAs(false);
-                if (exposeAs != null) {
-                    maps.exposeAs(exposeAs);
-                }
-            } else {
-                String exposeAs = getExpectedExposeAs(true);
-                String expected = exposeAs != null
-                                  ? exposeAs
-                                  : Names.WSA_NAMESPACE_NAME;
-                if (maps.getNamespaceURI() != expected) {
-                    verificationCache.put("Incoming version mismatch"
-                                          + " expected: " + expected
-                                          + " got: " + maps.getNamespaceURI());
-                }
-                exposeAs = null;
-            }
-        }
-        verificationCache.put(WSAddressingTest.verifyMAPs(maps, this));
-    }
-    
-    private String getExpectedExposeAs(boolean remove) {
-        int size = expectedExposedAs.size();
-        return  size == 0 
-                ? null
-                : remove
-                  ? expectedExposedAs.remove(size - 1)
-                  : expectedExposedAs.get(size - 1);
-    }
-    
-    public void setVerificationCache(VerificationCache cache) {
-        verificationCache = cache;
-    }
-    
-    public void addToExpectedExposedAs(String str) {
-        expectedExposedAs.add(str);
-    }
-}
-
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java
deleted file mode 100644
index 4292def..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.addressing;
-
-public interface VerificationCache {
-    void put(String verification);
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
deleted file mode 100644
index 59dbc72..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.addressing;
-
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.jaxws.ServiceImpl;
-import org.apache.cxf.jaxws.support.ServiceDelegateAccessor;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.ContextUtils;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.Names;
-import org.apache.cxf.ws.addressing.ReferenceParametersType;
-import org.apache.cxf.ws.addressing.VersionTransformer;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
-import org.apache.hello_world_soap_http.BadRecordLitFault;
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
-import org.apache.hello_world_soap_http.SOAPService;
-import org.apache.servicemix.camel.nmr.ServiceMixComponent;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.core.ServiceMix;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class WSAddressingTest extends CamelTestSupport implements VerificationCache {
-    
-    
-    
-    protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
-
-    static final String INBOUND_KEY = "inbound";
-    static final String OUTBOUND_KEY = "outbound";
-    static final String ADDRESS = "http://localhost:9008/SoapContext/SoapPort";
-    static final QName CUSTOMER_NAME =
-        new QName("http://example.org/customer", "CustomerKey", "customer");
-    static final String CUSTOMER_KEY = "Key#123456789";
-
-    private static Bus staticBus;
-
-    
-    private static MAPVerifier mapVerifier;
-    private static HeaderVerifier headerVerifier;
-
-    private static final QName SERVICE_NAME = 
-        new QName("http://apache.org/hello_world_soap_http", "SOAPServiceAddressing");
-    
-    private static final java.net.URL WSDL_LOC;
-    private static final String CONFIG;
-    
-    
-    private static Map<Object, Map<String, String>> messageIDs =
-        new HashMap<Object, Map<String, String>>();
-    protected Greeter greeter;
-    private String verified;
-
-    
-    protected AbstractXmlApplicationContext applicationContext;
-
-    
-    private ServerImpl server;
-    private CamelContext camelContext;
-    private ServiceMixComponent smxComponent;
-    private NMR nmr;
-    private Endpoint endpoint;
-
-    static {
-        CONFIG = "org/apache/servicemix/camel/ws/addressing/addressing" 
-            + (("HP-UX".equals(System.getProperty("os.name"))
-                || "Windows XP".equals(System.getProperty("os.name"))) ? "-hpux" : "")
-            + ".xml";
-        
-        java.net.URL tmp = null;
-        try {
-            tmp = WSAddressingTest.class.getClassLoader().getResource(
-                "org/apache/servicemix/camel/ws/addressing/hello_world.wsdl"
-            );
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        WSDL_LOC = tmp;
-    }
-    
-    @Override
-    protected void setUp() throws Exception {
-        applicationContext = createApplicationContext();
-        super.setUp();        
-        startService();
-        
-        if (staticBus == null) {
-            SpringBusFactory bf = new SpringBusFactory();
-            staticBus = bf.createBus(getConfigFileName());
-        }
-        messageIDs.clear();
-        mapVerifier = new MAPVerifier();
-        headerVerifier = new HeaderVerifier();
-        Interceptor[] interceptors = {mapVerifier, headerVerifier };
-        addInterceptors(staticBus.getInInterceptors(), interceptors);
-        addInterceptors(staticBus.getOutInterceptors(), interceptors);
-        addInterceptors(staticBus.getOutFaultInterceptors(), interceptors);
-        addInterceptors(staticBus.getInFaultInterceptors(), interceptors);
-        
-        EndpointReferenceType target = 
-            EndpointReferenceUtils.getEndpointReference(ADDRESS);
-        ReferenceParametersType params = 
-            ContextUtils.WSA_OBJECT_FACTORY.createReferenceParametersType();
-        JAXBElement<String> param =
-             new JAXBElement<String>(CUSTOMER_NAME, String.class, CUSTOMER_KEY);
-        params.getAny().add(param);
-        target.setReferenceParameters(params);
-        
-        ServiceImpl serviceImpl = 
-            ServiceDelegateAccessor.get(new SOAPService(WSDL_LOC, SERVICE_NAME));
-        greeter = serviceImpl.getPort(target, Greeter.class);
-
-        mapVerifier.verificationCache = this;
-        headerVerifier.verificationCache = this;
-    }
-    
-    protected void startService() {       
-        Object implementor = new GreeterImpl();
-        endpoint = javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (applicationContext != null) {
-            applicationContext.destroy();
-        }
-        if (server != null) {
-            server.stop();
-        }
-        if (endpoint != null) {
-            endpoint.stop();
-        }
-        Interceptor[] interceptors = {mapVerifier, headerVerifier };
-        removeInterceptors(staticBus.getInInterceptors(), interceptors);
-        removeInterceptors(staticBus.getOutInterceptors(), interceptors);
-        removeInterceptors(staticBus.getOutFaultInterceptors(), interceptors);
-        removeInterceptors(staticBus.getInFaultInterceptors(), interceptors);
-        mapVerifier = null;
-        headerVerifier = null;
-        verified = null;
-        messageIDs.clear();
-        super.tearDown();
-        BusFactory.setDefaultBus(null);
-        Thread.sleep(5000);
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                // configure the route from spring application
-                errorHandler(noErrorHandler());
-                from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
-                from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");       
-            }
-        };
-    }
-    
-    protected CamelContext createCamelContext() throws Exception {
-        camelContext = SpringCamelContext.springCamelContext(applicationContext);
-        smxComponent = new ServiceMixComponent();
-        nmr = new ServiceMix();
-        ((ServiceMix)nmr).init();
-        smxComponent.setNmr(nmr);
-        camelContext.addComponent("smx", smxComponent);
-        return camelContext;
-    }
-    
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/ws/addressing/server.xml");
-    }
-
-    
-    public void testImplicitMAPs() throws Exception {
-        try {
-            String greeting = greeter.greetMe("implicit1");
-            assertEquals("unexpected response received from service", 
-                         "Hello implicit1",
-                         greeting);
-            checkVerification();
-            greeting = greeter.greetMe("implicit2");
-            assertEquals("unexpected response received from service", 
-                         "Hello implicit2",
-                         greeting);
-            checkVerification();
-        } catch (UndeclaredThrowableException ex) {
-            throw (Exception)ex.getCause();
-        }
-    }
-    
-    
-    
-    
-    public void testOneway() throws Exception {
-        try {
-            greeter.greetMeOneWay("implicit_oneway1");
-            checkVerification();
-        } catch (UndeclaredThrowableException ex) {
-            throw (Exception)ex.getCause();
-        }
-    }
-
-    public void testApplicationFault() throws Exception {
-        try {
-            greeter.testDocLitFault("BadRecordLitFault");
-            fail("expected fault from service");
-        } catch (BadRecordLitFault brlf) {
-            checkVerification();
-        } catch (UndeclaredThrowableException ex) {
-            throw (Exception)ex.getCause();
-        }
-        String greeting = greeter.greetMe("intra-fault");
-        assertEquals("unexpected response received from service", 
-                     "Hello intra-fault",
-                     greeting);
-        try {
-            greeter.testDocLitFault("NoSuchCodeLitFault");
-            fail("expected NoSuchCodeLitFault");
-        } catch (NoSuchCodeLitFault nsclf) {
-            checkVerification();
-        } catch (UndeclaredThrowableException ex) {
-            throw (Exception)ex.getCause();
-        }
-    }
-    
-
-    public void testVersioning() throws Exception {
-        try {
-            // expect two MAPs instances versioned with 200408, i.e. for both 
-            // the partial and full responses
-            mapVerifier.expectedExposedAs.add(VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
-            mapVerifier.expectedExposedAs.add(VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
-            String greeting = greeter.greetMe("versioning1");
-            assertEquals("unexpected response received from service", 
-                         "Hello versioning1",
-                         greeting);
-            checkVerification();
-            greeting = greeter.greetMe("versioning2");
-            assertEquals("unexpected response received from service", 
-                         "Hello versioning2",
-                         greeting);
-            checkVerification();
-        } catch (UndeclaredThrowableException ex) {
-            throw (Exception)ex.getCause();
-        }
-    }
-
-    protected static String verifyMAPs(AddressingProperties maps,
-            Object checkPoint) {
-        if (maps == null) {
-            return "expected MAPs";
-        }
-        String id = maps.getMessageID().getValue();
-        if (id == null) {
-            return "expected MessageID MAP";
-        }
-        if (!id.startsWith("urn:uuid")) {
-            return "bad URN format in MessageID MAP: " + id;
-        }
-        // ensure MessageID is unique for this check point
-        Map<String, String> checkPointMessageIDs = messageIDs.get(checkPoint);
-        if (checkPointMessageIDs != null) {
-            if (checkPointMessageIDs.containsKey(id)) {
-                // return "MessageID MAP duplicate: " + id;
-                return null;
-            }
-        } else {
-            checkPointMessageIDs = new HashMap<String, String>();
-            messageIDs.put(checkPoint, checkPointMessageIDs);
-        }
-        checkPointMessageIDs.put(id, id);
-        // To
-        if (maps.getTo() == null) {
-            return "expected To MAP";
-        }
-        return null;
-    }
-    
-    public String getConfigFileName() {
-        return CONFIG;
-    }
-    
-    public static void shutdownBus() throws Exception {
-        staticBus.shutdown(true);
-    }
-    
-    private void addInterceptors(List<Interceptor<? extends Message>> chain,
-                                     Interceptor[] interceptors) {
-        for (int i = 0; i < interceptors.length; i++) {
-            chain.add(interceptors[i]);
-        }
-    }
-    
-    private void removeInterceptors(List<Interceptor<? extends Message>> chain,
-                                 Interceptor[] interceptors) {
-        for (int i = 0; i < interceptors.length; i++) {
-            chain.add(interceptors[i]);
-        }
-    }
-
-    public void put(String verification) {
-        if (verification != null) {
-            verified = verified == null
-                       ? verification
-                : verified + "; " + verification;
-        }
-    }
-    
-    /**
-     * Verify presence of expected MAP headers.
-     *
-     * @param wsaHeaders a list of the wsa:* headers present in the SOAP
-     * message
-     * @param parial true if partial response
-     * @return null if all expected headers present, otherwise an error string.
-     */
-    protected static String verifyHeaders(List<String> wsaHeaders,
-                                          boolean partial,
-                                          boolean requestLeg) {
-        
-        String ret = null;
-        if (!wsaHeaders.contains(Names.WSA_MESSAGEID_NAME)) {
-            ret = "expected MessageID header"; 
-        }
-        if (!wsaHeaders.contains(Names.WSA_TO_NAME)) {
-            ret = "expected To header";
-        }
-       
-        if (!(wsaHeaders.contains(Names.WSA_REPLYTO_NAME)
-              || wsaHeaders.contains(Names.WSA_RELATESTO_NAME))) {
-            ret = "expected ReplyTo or RelatesTo header";
-        }
-        if (partial) { 
-            if (!wsaHeaders.contains(Names.WSA_FROM_NAME)) {
-                //ret = "expected From header";
-            }
-        } else {
-            // REVISIT Action missing from full response
-            //if (!wsaHeaders.contains(Names.WSA_ACTION_NAME)) {
-            //    ret = "expected Action header";
-            //}            
-        }
-        if (requestLeg && !(wsaHeaders.contains(CUSTOMER_NAME.getLocalPart()))) {
-            ret = "expected CustomerKey header";
-        }
-        return ret;
-    }
-
-    private void checkVerification() {
-        assertNull("MAP/Header verification failed: " + verified, verified);
-    }
-
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java
deleted file mode 100644
index 811e986..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.policy;
-
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.ConnectionType;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
-public final class ConnectionHelper {
-    private ConnectionHelper() {
-    }
-
-    public static void setKeepAliveConnection(Object proxy, boolean keepAlive) {
-        Client client = ClientProxy.getClient(proxy);
-        HTTPConduit hc = (HTTPConduit) client.getConduit();
-        HTTPClientPolicy cp = hc.getClient();
-        cp.setConnection(keepAlive ? ConnectionType.KEEP_ALIVE
-                : ConnectionType.CLOSE);
-    }
-
-    public static boolean isKeepAliveConnection(Object proxy) {
-        Client client = ClientProxy.getClient(proxy);
-        HTTPConduit hc = (HTTPConduit) client.getConduit();
-        HTTPClientPolicy cp = hc.getClient();
-        return cp.getConnection() == ConnectionType.KEEP_ALIVE;
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java
deleted file mode 100644
index 892e920..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.policy;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.greeter_control.AbstractGreeterImpl;
-
-@WebService(serviceName = "BasicGreeterService", 
-        portName = "GreeterPort", 
-        endpointInterface = "org.apache.cxf.greeter_control.Greeter", 
-        targetNamespace = "http://cxf.apache.org/greeter_control")
-public class GreeterImpl extends AbstractGreeterImpl {
-    
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
deleted file mode 100644
index c6baaa2..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.policy;
-
-import java.net.URL;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.endpoint.ClientImpl;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.greeter_control.BasicGreeterService;
-import org.apache.cxf.greeter_control.Greeter;
-import org.apache.cxf.greeter_control.PingMeFault;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.servicemix.camel.nmr.ServiceMixComponent;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.core.ServiceMix;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class WSPolicyTest extends CamelTestSupport {
-    
-    private static final Logger LOG = LogUtils.getL7dLogger(WSPolicyTest.class);
-    
-    protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
-
-    
-    protected AbstractXmlApplicationContext applicationContext;
-
-    
-    private ServerImpl server;
-    private CamelContext camelContext;
-    private ServiceMixComponent smxComponent;
-    private NMR nmr;
-    private Bus bus;
-    
-    @Override
-    protected void setUp() throws Exception {
-        applicationContext = createApplicationContext();
-        super.setUp();        
-        startService();
-    }
-    
-
-    
-    protected void startService() throws Exception {
-        Object implementor = new GreeterImpl();
-        javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (applicationContext != null) {
-            applicationContext.destroy();
-        }
-        if (server != null) {
-            server.stop();
-        }
-        super.tearDown();
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                errorHandler(noErrorHandler());
-                from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
-                from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");  
-                
-                
-            }
-        };
-    }
-    
-    
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        camelContext = SpringCamelContext.springCamelContext(applicationContext);
-        
-        smxComponent = new ServiceMixComponent();
-        nmr = new ServiceMix();
-        ((ServiceMix)nmr).init();
-        smxComponent.setNmr(nmr);
-        camelContext.addComponent("smx", smxComponent);
-        return camelContext;
-    }
-    
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/ws/policy/server.xml");
-    }
-    
-    public void testUsingAddressing() throws Exception {
-        SpringBusFactory bf = new SpringBusFactory();
-        bus = bf
-            .createBus("/org/apache/servicemix/camel/ws/policy/addr.xml");
-        LoggingInInterceptor in = new LoggingInInterceptor();
-        bus.getInInterceptors().add(in);
-        bus.getInFaultInterceptors().add(in);
-        LoggingOutInterceptor out = new LoggingOutInterceptor();
-        bus.getOutInterceptors().add(out);
-        bus.getOutFaultInterceptors().add(out);
-        URL wsdl = getClass().getResource("/wsdl/greeter_control.wsdl");
-        QName serviceName = new QName("http://cxf.apache.org/greeter_control",
-                                      "BasicGreeterService");
-        BasicGreeterService gs = new BasicGreeterService(wsdl, serviceName);
-        final Greeter greeter = gs.getGreeterPort();
-        LOG.info("Created greeter client.");
-        if ("HP-UX".equals(System.getProperty("os.name"))) {
-            ConnectionHelper.setKeepAliveConnection(greeter, true);
-        }
-
-        //set timeout to 30 secs to avoid intermitly failed
-        ((ClientImpl)ClientProxy.getClient(greeter)).setSynchronousTimeout(30000);
-        
-        // oneway
-        greeter.greetMeOneWay("CXF");
-
-        // two-way
-
-        assertEquals("CXF", greeter.greetMe("cxf"));
-
-        // exception
-
-        try {
-            greeter.pingMe();
-        } catch (PingMeFault ex) {
-            fail("First invocation should have succeeded.");
-        }
-
-        try {
-            greeter.pingMe();
-            fail("Expected PingMeFault not thrown.");
-        } catch (PingMeFault ex) {
-            assertEquals(2, (int) ex.getFaultInfo().getMajor());
-            assertEquals(1, (int) ex.getFaultInfo().getMinor());
-        }
-    }
-    
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java
deleted file mode 100644
index bb98de6..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.rm;
-
-import java.util.concurrent.Future;
-import java.util.logging.Logger;
-
-import javax.jws.WebService;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.greeter_control.PingMeFault;
-import org.apache.cxf.greeter_control.types.FaultDetail;
-import org.apache.cxf.greeter_control.types.GreetMeResponse;
-import org.apache.cxf.greeter_control.types.PingMeResponse;
-import org.apache.cxf.greeter_control.types.SayHiResponse;
-@WebService(serviceName = "GreeterService",
-        portName = "GreeterPort",
-        endpointInterface = "org.apache.cxf.greeter_control.Greeter",
-        targetNamespace = "http://cxf.apache.org/greeter_control")
-public class GreeterImpl {
-    private static final Logger LOG = LogUtils.getL7dLogger(GreeterImpl.class);
-    private long delay;
-    private String lastOnewayArg;
-    private boolean throwAlways;
-    private boolean useLastOnewayArg;
-    private int pingMeCount;
-     
-    public long getDelay() {
-        return delay;
-    }
-
-    public void setDelay(long d) {
-        delay = d;
-    }
-
-    public void resetLastOnewayArg() {
-        lastOnewayArg = null;
-    }
-
-    public void useLastOnewayArg(Boolean use) {
-        useLastOnewayArg = use;
-    }
-
-    public void setThrowAlways(boolean t) {
-        throwAlways = t;
-    }
-
-    public String greetMe(String arg0) {
-        LOG.info("Executing operation greetMe with parameter: " + arg0);
-        if ("twoway".equals(arg0)) {
-            useLastOnewayArg(true);
-            setDelay(5000);
-        }
-        if (delay > 0) {
-            try {
-                Thread.sleep(delay);
-            } catch (InterruptedException ex) {
-                // ignore
-            }
-        }
-        String result = null;
-        synchronized (this) {
-            result = useLastOnewayArg ? lastOnewayArg : arg0.toUpperCase();
-        }
-        LOG.fine("returning: " + result);
-        return result;
-    }
-
-    public Future<?> greetMeAsync(String arg0, AsyncHandler<GreetMeResponse> arg1) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Response<GreetMeResponse> greetMeAsync(String arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void greetMeOneWay(String arg0) {
-        synchronized (this) {
-            lastOnewayArg = arg0;
-        }
-        LOG.info("Executing operation greetMeOneWay with parameter: " + arg0);
-    }
-
-    public void pingMe() throws PingMeFault {
-        pingMeCount++;
-        if ((pingMeCount % 2) == 0 || throwAlways) {
-            LOG.fine("Throwing PingMeFault while executiong operation pingMe");
-            FaultDetail fd = new FaultDetail();
-            fd.setMajor((short)2);
-            fd.setMinor((short)1);
-            throw new PingMeFault("Pings succeed only every other time.", fd);
-        } else {
-            LOG.fine("Executing operation pingMe");        
-        }
-    }
-
-    public Response<PingMeResponse> pingMeAsync() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Future<?> pingMeAsync(AsyncHandler<PingMeResponse> arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String sayHi() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Response<SayHiResponse> sayHiAsync() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Future<?> sayHiAsync(AsyncHandler<SayHiResponse> arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
-
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java
deleted file mode 100644
index 277fa6a..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.rm;
-
-import org.apache.cxf.greeter_control.Greeter;
-
-public class TwowayThread extends Thread {
-    
-    private String response;
-    private Greeter greeter;
-    public TwowayThread(Greeter gr) {
-        greeter = gr;
-    }
-    @Override
-    public void run() {
-        
-        response = greeter.greetMe("twoway");
-    }
-    
-    public String getResponse() {
-        return response;
-    }
-
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
deleted file mode 100644
index 1ffe062..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.rm;
-
-import java.net.URL;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.greeter_control.Greeter;
-import org.apache.cxf.greeter_control.GreeterService;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.servicemix.camel.nmr.ServiceMixComponent;
-import org.apache.servicemix.camel.nmr.ws.policy.ConnectionHelper;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.core.ServiceMix;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.ClassPathResource;
-
-public class WSRMTest extends CamelTestSupport {
-    
-    private static final Logger LOG = LogUtils.getL7dLogger(WSRMTest.class);
-    
-    protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
-
-    
-    protected AbstractXmlApplicationContext applicationContext;
-
-    
-    private ServerImpl server;
-    private CamelContext camelContext;
-    private ServiceMixComponent smxComponent;
-    private NMR nmr;
-    private Bus bus;
-    
-    @Override
-    protected void setUp() throws Exception {
-        applicationContext = createApplicationContext();
-        super.setUp();        
-        startService();
-
-    }
-    
-
-    
-    protected void startService() {
-        Object implementor = new GreeterImpl();
-        javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
- 
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (applicationContext != null) {
-            applicationContext.destroy();
-        }
-        if (server != null) {
-            server.stop();
-        }
-        super.tearDown();
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
-                from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");       
-            }
-        };
-    }
-    
-    protected CamelContext createCamelContext() throws Exception {
-        camelContext = SpringCamelContext.springCamelContext(applicationContext);
-        smxComponent = new ServiceMixComponent();
-        nmr = new ServiceMix();
-        ((ServiceMix)nmr).init();
-        smxComponent.setNmr(nmr);
-        camelContext.addComponent("smx", smxComponent);
-        return camelContext;
-    }
-    
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/ws/rm/server.xml");
-    }
-    
-
-    public void testDecoupled() throws Exception {
-        SpringBusFactory bf = new SpringBusFactory();
-        bus = bf.createBus("/org/apache/servicemix/camel/ws/rm/decoupled.xml");
-        LoggingInInterceptor in = new LoggingInInterceptor();
-        bus.getInInterceptors().add(in);
-        bus.getInFaultInterceptors().add(in);
-        LoggingOutInterceptor out = new LoggingOutInterceptor();
-        bus.getOutInterceptors().add(out);
-        bus.getOutFaultInterceptors().add(out);
-        QName serviceName = new QName("http://cxf.apache.org/greeter_control", "GreeterService");
-        URL wsdl = new ClassPathResource("/wsdl/greeter_control.wsdl").getURL();
-        GreeterService gs = new GreeterService(wsdl, serviceName);
-        final Greeter greeter = gs.getGreeterPort();
-        LOG.fine("Created greeter client.");
-
-        ConnectionHelper.setKeepAliveConnection(greeter, true);
-
-
-        TwowayThread t = new TwowayThread(greeter);
-        t.start();
-
-        // allow for partial response to twoway request to arrive
-
-        long wait = 3000;
-        while (wait > 0) {
-            long start = System.currentTimeMillis();
-            try {
-                Thread.sleep(wait);
-            } catch (InterruptedException ex) {
-                // ignore
-            }
-            wait -= System.currentTimeMillis() - start;
-        }
-
-        greeter.greetMeOneWay("oneway");
-        t.join();
-        
-        assertEquals("Unexpected response to twoway request", "oneway", t.getResponse());
-    }
-}
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java
deleted file mode 100644
index 70d5308..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.security;
-
-@javax.jws.WebService(
-        serviceName = "SOAPServiceWSSecurity", 
-        portName = "TimestampSignEncrypt", 
-        endpointInterface = "org.apache.hello_world_soap_http.Greeter",
-        targetNamespace = "http://apache.org/hello_world_soap_http",
-        wsdlLocation = "org/apache/servicemix/camel/ws/security/hello_world.wsdl"
-    )
-    public class GreeterImpl 
-        extends org.apache.hello_world_soap_http.GreeterImpl {
-
-        public String greetMe(String me) {
-            System.out.println("\n\n*** GreetMe called with: " + me + "***\n\n");
-            return "Hello " + me;
-        }
-        
-    }
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
deleted file mode 100644
index 892a658..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.security;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-public class KeystorePasswordCallback implements CallbackHandler {
-    
-    private Map<String, String> passwords = 
-        new HashMap<String, String>();
-    
-    public KeystorePasswordCallback() {
-        passwords.put("alice", "password");
-        passwords.put("bob", "password");
-    }
-
-    /**
-     * It attempts to get the password from the private 
-     * alias/passwords map.
-     */
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
-            String pass = passwords.get(pc.getIdentifier());
-            if (pass != null) {
-                pc.setPassword(pass);
-                return;
-            }
-        }
-    }
-    
-    /**
-     * Add an alias/password pair to the callback mechanism.
-     */
-    public void setAliasPassword(String alias, String password) {
-        passwords.put(alias, password);
-    }
-}
-
diff --git a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java b/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java
deleted file mode 100644
index 7e95dbb..0000000
--- a/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr.ws.security;
-
-import java.util.logging.Logger;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.servicemix.camel.nmr.ServiceMixComponent;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.core.ServiceMix;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class WSSecurityTest extends CamelTestSupport {
-    
-    private static final Logger LOG = LogUtils.getL7dLogger(WSSecurityTest.class);
-    
-    private static final java.net.URL WSDL_LOC;
-    static {
-        java.net.URL tmp = null;
-        try {
-            tmp = WSSecurityTest.class.getClassLoader().getResource(
-                "org/apache/servicemix/camel/ws/security/hello_world.wsdl"
-            );
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        WSDL_LOC = tmp;
-    }
-    
-
-    protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
-
-    
-    protected AbstractXmlApplicationContext applicationContext;
-
-    
-    private ServerImpl server;
-    private CamelContext camelContext;
-    private ServiceMixComponent smxComponent;
-    private NMR nmr;
-    
-    @Override
-    protected void setUp() throws Exception {
-        applicationContext = createApplicationContext();
-        super.setUp();        
-        startService();
-
-    }
-    
-
-    
-    protected void startService() {
-        Object implementor = new GreeterImpl();
-        javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
- 
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        if (applicationContext != null) {
-            applicationContext.destroy();
-        }
-        if (server != null) {
-            server.stop();
-        }
-        super.tearDown();
-    }
-  
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
-                from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");       
-            }
-        };
-    }
-    
-    protected CamelContext createCamelContext() throws Exception {
-        camelContext = SpringCamelContext.springCamelContext(applicationContext);
-        
-        smxComponent = new ServiceMixComponent();
-        nmr = new ServiceMix();
-        ((ServiceMix)nmr).init();
-        smxComponent.setNmr(nmr);
-        camelContext.addComponent("smx", smxComponent);
-        return camelContext;
-    }
-    
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/ws/security/server.xml");
-    }
-    
-    public void testTimestampSignEncrypt() {
-        LOG.info("test security");
-        Bus bus = new SpringBusFactory().createBus(
-                "org/apache/servicemix/camel/ws/security/client.xml"); 
-        BusFactory.setDefaultBus(bus);
-        LoggingInInterceptor in = new LoggingInInterceptor();
-        bus.getInInterceptors().add(in);
-        bus.getInFaultInterceptors().add(in);
-        LoggingOutInterceptor out = new LoggingOutInterceptor();
-        bus.getOutInterceptors().add(out);
-        bus.getOutFaultInterceptors().add(out);
-        final javax.xml.ws.Service svc = javax.xml.ws.Service.create(WSDL_LOC,
-                new javax.xml.namespace.QName(
-                        "http://apache.org/hello_world_soap_http",
-                        "SOAPServiceWSSecurity"));
-        final Greeter greeter = svc.getPort(new javax.xml.namespace.QName(
-                "http://apache.org/hello_world_soap_http",
-                "TimestampSignEncrypt"), Greeter.class);
-        String ret = greeter.sayHi();
-        assertEquals(ret, "Bonjour");
-        ret = greeter.greetMe("ffang");
-        assertEquals(ret, "Hello ffang");
-    }
-    
-}
diff --git a/camel/servicemix-camel/src/test/resources/log4j.properties b/camel/servicemix-camel/src/test/resources/log4j.properties
deleted file mode 100644
index db2051e..0000000
--- a/camel/servicemix-camel/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-# Separate loggers for Camel and ServiceMix to reduce lock contention
-log4j.org.apache.camel=INFO, out
-#log4j.org.apache.servicemix=DEBUG,out
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/servicemix-test.log
-log4j.appender.out.append=true
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
deleted file mode 100644
index 4099665..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:cxf="http://camel.apache.org/schema/cxf"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-
-  
-  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:8192/PersonService/" 
-                   serviceClass="org.apache.servicemix.samples.wsdl_first.Person"
-                   endpointName="person:soap"
-                   serviceName="person:PersonService"
-                   xmlns:person="http://servicemix.apache.org/samples/wsdl-first"/>
-  
-    
-  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:19000/PersonService/" 
-                   serviceClass="org.apache.servicemix.samples.wsdl_first.Person"
-                   endpointName="person:soap"
-                   serviceName="person:PersonService"
-                   xmlns:person="http://servicemix.apache.org/samples/wsdl-first"/>
-
-   <camelContext xmlns="http://camel.apache.org/schema/spring">
-      <route>
-            <from uri="cxf:bean:routerEndpoint?dataFormat=MESSAGE"/>
-            <to uri="smx:bean:testEndpoint"/>
-      </route>
-
-      <route>
-            <from uri="smx:bean:testEndpoint"/>
-            <to uri="cxf:bean:serviceEndpoint?dataFormat=MESSAGE"/>
-      </route>
-
-    </camelContext>
-
-  <bean id="org.apache.servicemix.nmr.api.NMR" class="org.apache.servicemix.nmr.core.ServiceMix" init-method="init" />
-
-</beans>
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/DummyBean.xml b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/DummyBean.xml
deleted file mode 100644
index 475dfa3..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/DummyBean.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    ">
-
-  
-
-  <bean id="org.apache.servicemix.nmr.api.NMR" class="org.apache.servicemix.nmr.core.ServiceMix" init-method="init" />
-
-</beans>
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
deleted file mode 100644
index 92af3a2..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:cxf="http://camel.apache.org/schema/cxf"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-
-  
-  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:19000/router" 
-                   serviceClass="org.apache.servicemix.camel.nmr.HelloService">
-       <cxf:properties>
-           <entry key="setDefaultBus" value="true"/>
-       </cxf:properties>
-  </cxf:cxfEndpoint>
-  
-    
-  <cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/helloworld" 
-                   serviceClass="org.apache.servicemix.camel.nmr.HelloService">
-       <cxf:properties>
-           <entry key="setDefaultBus" value="true"/>
-       </cxf:properties>
-  </cxf:cxfEndpoint>
-
-  <camel:camelContext>
-  </camel:camelContext>
-
-  <bean id="org.apache.servicemix.nmr.api.NMR" class="org.apache.servicemix.nmr.core.ServiceMix" init-method="init" />
-
-</beans>
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
deleted file mode 100644
index cc532dc..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:cxf="http://camel.apache.org/schema/cxf"      
-       xmlns:mtom="http://cxf.apache.org/mime"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
-    ">
-
-  
-  <cxf:cxfEndpoint id="routerEndpoint"
-                   address="http://localhost:9036/mime-test"
-                   serviceClass="org.apache.cxf.mime.TestMtom"
-                   wsdlURL="/wsdl/mtom_xop.wsdl"
-                   serviceName="mtom:TestMtomService">
-       <cxf:properties>
-           <entry key="setDefaultBus" value="true"/>
-       </cxf:properties>
-  </cxf:cxfEndpoint> 
-    
-  <cxf:cxfEndpoint id="serviceEndpoint"
-                   address="local://smx/attachment"
-                   serviceClass="org.apache.cxf.mime.TestMtom"
-                   wsdlURL="/wsdl/mtom_xop.wsdl"
-                   serviceName="mtom:TestMtomService"
-                   transportId="http://cxf.apache.org/transports/local">
-       <cxf:properties>
-           <entry key="setDefaultBus" value="true"/>
-       </cxf:properties>
-  </cxf:cxfEndpoint>
-
-  <bean id="org.apache.servicemix.nmr.api.NMR" class="org.apache.servicemix.nmr.core.ServiceMix" init-method="init" />
-
-</beans>
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing-hpux.xml b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing-hpux.xml
deleted file mode 100644
index d371e1e..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing-hpux.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  
-    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-      <http:client Connection="Keep-Alive" DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
-    </http:conduit>
-    
-    <import resource="wsa_interceptors.xml"/>
-</beans>
-
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing.xml b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing.xml
deleted file mode 100644
index ff15fbb..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  
-    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
-    </http:conduit>
-    
-    <import resource="wsa_interceptors.xml"/>
-</beans>
-
diff --git a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl b/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
deleted file mode 100644
index d51693c..0000000
--- a/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:tns="http://apache.org/hello_world_soap_http"
-    xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types"> <!--elementFormDefault="qualified"-->
-            <element name="sayHi">
-                <complexType/>
-            </element>
-            <element name="sayHiResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="testNillable">
-                <complexType>
-                    <sequence>
-                        <element name="NillElem" nillable="true" type="string"/>
-                        <element name="intElem" type="int"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="testNillableResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" nillable="true" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="greetMeLater">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="long"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeLaterResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeSometime">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeSometimeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeOneWay">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="testDocLitFault">
-                <complexType>
-                    <sequence>
-                        <element name="faultType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="testDocLitFaultResponse">
-                <complexType>
-                    <sequence/>
-                </complexType>
-            </element>
-            <complexType name="ErrorCode">
-                <sequence>
-                    <element name="minor" type="short"/>
-                    <element name="major" type="short"/>
-                </sequence>
-            </complexType>
-            <element name="NoSuchCodeLit">
-                <complexType>
-                    <sequence>
-                        <element name="code" type="x1:ErrorCode"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="BadRecordLit" type="string"/>
-            <complexType name="BadRecord">
-                <sequence>
-                    <element name="reason" type="string"/>
-                    <element name="code" type="short"/>
-                </sequence>
-            </complexType>
-            <complexType name="addNumbers">
-                <sequence>
-                    <element name="arg0" type="int"/>
-                    <element name="arg1" type="int"/>
-                </sequence>
-            </complexType>
-            <element name="addNumbers" type="x1:addNumbers"/>
-            <complexType name="addNumbersResponse">
-                <sequence>
-                    <element name="return" type="int"/>
-                </sequence>
-            </complexType>
-            <element name="addNumbersResponse" type="x1:addNumbersResponse"/>
-            <complexType name="stringStruct">
-                <sequence>
-                    <element name="arg0" type="string"/>
-                    <element name="arg1" type="string"/>
-                </sequence>
-            </complexType>
-            <element name="BareDocument" type="string"/>
-            <element name="BareDocumentResponse">
-                <complexType>
-                    <sequence>
-                        <element name="company" type="string"/>
-                    </sequence>
-                    <attribute name="id" type="int"/>
-                </complexType>
-            </element>      
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiRequest">
-        <wsdl:part name="in" element="x1:sayHi"/>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part name="out" element="x1:sayHiResponse"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part name="in" element="x1:greetMe"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part name="out" element="x1:greetMeResponse"/>
-    </wsdl:message>
-    <wsdl:message name="testNillableRequest">
-        <wsdl:part name="in" element="x1:testNillable"/>
-    </wsdl:message>
-    <wsdl:message name="testNillableResponse">
-        <wsdl:part name="out" element="x1:testNillableResponse"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeLaterRequest">
-        <wsdl:part name="in" element="x1:greetMeLater"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeLaterResponse">
-        <wsdl:part name="out" element="x1:greetMeLaterResponse"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeSometimeRequest">
-        <wsdl:part name="in" element="x1:greetMeSometime"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeSometimeResponse">
-        <wsdl:part name="out" element="x1:greetMeSometimeResponse"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeOneWayRequest">
-        <wsdl:part name="in" element="x1:greetMeOneWay"/>
-    </wsdl:message>
-    <wsdl:message name="testDocLitFaultRequest">
-        <wsdl:part name="in" element="x1:testDocLitFault"/>
-    </wsdl:message>
-    <wsdl:message name="testDocLitFaultResponse">
-        <wsdl:part name="out" element="x1:testDocLitFaultResponse"/>
-    </wsdl:message>
-    <wsdl:message name="NoSuchCodeLitFault">
-        <wsdl:part name="NoSuchCodeLit" element="x1:NoSuchCodeLit"/>
-    </wsdl:message>
-    <wsdl:message name="BadRecordLitFault">
-        <wsdl:part name="BadRecordLit" element="x1:BadRecordLit"/>
-    </wsdl:message>
-    <wsdl:message name="testDocLitBareRequest">
-        <wsdl:part name="in" element="x1:BareDocument"/>
-    </wsdl:message>
-    <wsdl:message name="testDocLitBareResponse">
-        <wsdl:part name="out" element="x1:BareDocumentResponse"/>
-    </wsdl:message> 
-    <wsdl:portType name="Greeter">
-        <wsdl:operation name="sayHi">
-            <wsdl:input name="sayHiRequest" message="tns:sayHiRequest"/>
-            <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"/>
-        </wsdl:operation>
-        <wsdl:operation name="greetMe">
-            <wsdl:input name="greetMeRequest" message="tns:greetMeRequest"/>
-            <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
-        </wsdl:operation>
-        <wsdl:operation name="testNillable">
-            <wsdl:input name="testNillableRequest" message="tns:testNillableRequest"/>
-            <wsdl:output name="testNillableResponse" message="tns:testNillableResponse"/>
-        </wsdl:operation>
-        <wsdl:operation name="greetMeLater">
-            <wsdl:input name="greetMeLaterRequest" message="tns:greetMeLaterRequest"/>
-            <wsdl:output name="greetMeLaterResponse" message="tns:greetMeLaterResponse"/>
-        </wsdl:operation>
-       <wsdl:operation name="greetMeSometime">
-            <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
-            <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
-        </wsdl:operation>
-        <wsdl:operation name="greetMeOneWay">
-            <wsdl:input name="greetMeOneWayRequest" message="tns:greetMeOneWayRequest"/>
-        </wsdl:operation>
-        <wsdl:operation name="testDocLitFault">
-            <wsdl:input name="testDocLitFaultRequest" message="tns:testDocLitFaultRequest"/>
-            <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse"/>
-            <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
-            <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
-        </wsdl:operation>
-
-    </wsdl:portType>
-
-    <wsdl:portType name="DocLitBare">
-        <wsdl:operation name="testDocLitBare">
-            <wsdl:input name="testDocLitBareRequest" message="tns:testDocLitBareRequest"/>
-            <wsdl:output name="testDocLitBareResponse" message="tns:testDocLitBareResponse"/>
-        </wsdl:operation>       
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="sayHi">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="greetMe">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="testNillable">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="greetMeLater">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="greetMeSometime">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="greetMeOneWay">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-        <wsdl:operation name="testDocLitFault">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="NoSuchCodeLitFault">
-                <soap:fault name="NoSuchCodeLitFault" use="literal"/>
-            </wsdl:fault>
-            <wsdl:fault name="BadRecordLitFault">
-                <soap:fault name="BadRecordLitFault" use="literal"/>
-            <