[maven-scm] copy for tag features-4.3.0

git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/tags/features-4.3.0@1075005 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README b/README
index 419bf1e..1eae65c 100644
--- a/README
+++ b/README
@@ -30,10 +30,10 @@
 Getting Started

 ===============

 For an Apache ServiceMix 4 source distribution, please read 

-BUILDING.txt for instructions on building Apache ServiceMix 4. 

+BUILDING for instructions on building Apache ServiceMix 4.

 

 For an Apache ServiceMix 4 binary distribution, please read 

-RELEASE-NOTES.txt for installation instructions and list of supported 

+RELEASE-NOTES for installation instructions and list of supported

 and unsupported features.

 

 Alternatively, you can also find out how to get started here:

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ecc2558..3723d6b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -34,13 +34,16 @@
   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.

@@ -86,6 +89,10 @@
 * [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

@@ -136,6 +143,7 @@
 * [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

diff --git a/assembly/pom.xml b/assembly/pom.xml
index e198f69..b3d0223 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -32,6 +32,10 @@
     <packaging>pom</packaging>
     <name>Apache ServiceMix :: Features :: Assembly</name>
 
+    <properties>
+        <felix.framework.version>3.0.9</felix.framework.version>
+    </properties>
+
     <dependencies>
         
         <!-- Karaf -->
@@ -55,6 +59,15 @@
             <groupId>org.apache.karaf.deployer</groupId>
             <artifactId>org.apache.karaf.deployer.war</artifactId>
         </dependency>
+
+        <!-- Felix -->
+        <!-- SMX4-764 - Override the Felix Framework version to use 3.0.8 -->
+        <!-- SMX4-766 - Upgrade to Felix Framework 3.0.9 -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>${felix.framework.version}</version>
+        </dependency>
         
         <!-- ServiceMix Components -->
         <dependency>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 72480c8..19aaf95 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -35,6 +35,10 @@
               <exclude>etc/users.properties</exclude>
               <exclude>etc/custom.properties</exclude>
               <exclude>etc/jre.properties</exclude>
+              <!-- SMX4-764 - Override Felix Framework version -->
+              <!-- begin snippet -->
+              <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
+              <!-- end snippet -->
               <exclude>LICENSE</exclude>
               <exclude>NOTICE</exclude>
               <exclude>README</exclude>
@@ -146,6 +150,7 @@
                 <exclude>**/.settings/**</exclude>
                 <exclude>**/wsdl-first/**</exclude>
                 <exclude>**/loan-broker-bpel/**</exclude>
+                <exclude>**/web/**</exclude>
             </excludes>
         </fileSet>
         
@@ -437,6 +442,18 @@
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
             </includes>
         </dependencySet>
+        <!-- SMX4-764 - Override Felix Framework to 3.0.8 version -->
+        <!-- begin snippet -->
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.framework</include>
+            </includes>
+        </dependencySet>
+        <!-- end snippet -->
 
     </dependencySets>
 
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index a818abc..ee55ba2 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -34,6 +34,10 @@
              <exclude>etc/users.properties</exclude>
              <exclude>etc/custom.properties</exclude>
              <exclude>etc/jre.properties</exclude>
+             <!-- SMX4-764 - Override the Felix Framework version -->
+             <!-- begin snippet -->
+             <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
+             <!-- end snippet -->
              <exclude>LICENSE</exclude>
              <exclude>NOTICE</exclude>
              <exclude>README</exclude>
@@ -126,6 +130,7 @@
               <exclude>**/.settings/**</exclude>
               <exclude>**/wsdl-first/**</exclude>
               <exclude>**/loan-broker-bpel/**</exclude>
+              <exclude>**/web/**</exclude>
           </excludes>
       </fileSet>
 
@@ -428,6 +433,18 @@
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
             </includes>
         </dependencySet>
+        <!-- SMX4-764 - Override the Felix Framework version -->
+        <!-- begin snippet -->
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.framework</include>
+            </includes>
+        </dependencySet>
+        <!-- end snippet -->
 
     </dependencySets>
 
diff --git a/assembly/src/main/filtered-resources/camel-features.xml b/assembly/src/main/filtered-resources/camel-features.xml
index 85c285f..5347c40 100644
--- a/assembly/src/main/filtered-resources/camel-features.xml
+++ b/assembly/src/main/filtered-resources/camel-features.xml
@@ -42,7 +42,9 @@
     <feature name="camel-blueprint" version="${camel.version}">
         <feature version="${camel.version}">camel-core</feature>
         <bundle>mvn:org.apache.camel/camel-blueprint/${camel.version}</bundle>
-        <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
+        <!-- this should be already installed in Karaf, let's ignore it 
+        <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle> 
+        -->
     </feature>
     <feature name='camel-test' version='${camel.version}'>
         <feature version='${camel.version}'>camel-spring</feature>
diff --git a/assembly/src/main/filtered-resources/etc/custom.properties b/assembly/src/main/filtered-resources/etc/custom.properties
index 73c2594..7c8c7cb 100644
--- a/assembly/src/main/filtered-resources/etc/custom.properties
+++ b/assembly/src/main/filtered-resources/etc/custom.properties
@@ -22,6 +22,8 @@
 # All the values specified here will override the default value.
 #
 
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+
 karaf.systemBundlesStartLevel=50
 
 obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 046c353..6291108 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -25,5 +25,5 @@
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config,activemq-broker,camel,camel-activemq,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
+featuresBoot=config,activemq-broker,camel,camel-activemq,camel-nmr,camel-cxf,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/examples/camel-nmr/README.txt b/examples/camel-nmr/README.txt
index 53ea247..96dc528 100644
--- a/examples/camel-nmr/README.txt
+++ b/examples/camel-nmr/README.txt
@@ -54,7 +54,7 @@
 
    - JDK 1.5 or higher
 
-   - Maven 2.0.9 or higher (for building)
+   - Maven 2.2.1 or higher (for building)
    
   For more information, see the README in the top-level examples
   directory.
diff --git a/examples/cxf-camel-nmr/pom.xml b/examples/cxf-camel-nmr/pom.xml
index e5bb36a..01e9b9e 100644
--- a/examples/cxf-camel-nmr/pom.xml
+++ b/examples/cxf-camel-nmr/pom.xml
@@ -58,11 +58,19 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Description>${project.description}</Bundle-Description>
                         <Import-Package>
-                           javax.jws,javax.wsdl,META-INF.cxf,META-INF.cxf.transport.nmr,
-                           org.apache.cxf.bus,org.apache.servicemix.camel.nmr,
+                           javax.jws,
+                           javax.xml.namespace,
+                           javax.wsdl,
+                           META-INF.cxf,
+                           META-INF.cxf.transport.nmr,
+                           org.apache.cxf.bus,
+                           org.apache.servicemix.camel.nmr,
                            org.apache.servicemix.cxf.transport.nmr,
-                           org.apache.servicemix.nmr.api,org.apache.servicemix.nmr.api.event,org.apache.servicemix.nmr.api.internal,
-                           org.springframework.beans.factory.config, *
+                           org.apache.servicemix.nmr.api,
+                           org.apache.servicemix.nmr.api.event,
+                           org.apache.servicemix.nmr.api.internal,
+                           org.springframework.beans.factory.config,
+                           *
                         </Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxfcamel</Private-Package>
                         <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
diff --git a/examples/cxf-nmr/pom.xml b/examples/cxf-nmr/pom.xml
index 56cec01..dc74c3d 100644
--- a/examples/cxf-nmr/pom.xml
+++ b/examples/cxf-nmr/pom.xml
@@ -49,11 +49,16 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Description>${project.description}</Bundle-Description>
                         <Import-Package>
-                            javax.jws, javax.wsdl,
-                            META-INF.cxf,META-INF.cxf.transport.nmr,
+                            javax.jws,
+                            javax.xml.namespace,
+                            javax.wsdl,
+                            META-INF.cxf,
+                            META-INF.cxf.transport.nmr,
                             org.springframework.beans.factory.config,
                             org.apache.servicemix.cxf.transport.nmr,
-                            org.apache.servicemix.nmr.api,org.apache.servicemix.nmr.api.event,org.apache.servicemix.nmr.api.internal
+                            org.apache.servicemix.nmr.api,
+                            org.apache.servicemix.nmr.api.event,
+                            org.apache.servicemix.nmr.api.internal
                         </Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
                         <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
diff --git a/examples/cxf-ws-security-osgi/pom.xml b/examples/cxf-ws-security-osgi/pom.xml
index 99db228..18695b9 100644
--- a/examples/cxf-ws-security-osgi/pom.xml
+++ b/examples/cxf-ws-security-osgi/pom.xml
@@ -59,6 +59,7 @@
                         <Import-Package>
                             javax.jws,
                             javax.xml.bind.annotation,
+                            javax.xml.namespace,
                             javax.wsdl,
                             META-INF.cxf,
                             META-INF.cxf.osgi,
diff --git a/examples/web/pom.xml b/examples/web/pom.xml
index f4179db..d76994f 100644
--- a/examples/web/pom.xml
+++ b/examples/web/pom.xml
@@ -48,13 +48,13 @@
     </dependency>

     <dependency>

       <groupId>org.apache.geronimo.specs</groupId>

-      <artifactId>geronimo-servlet_2.5_spec</artifactId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

       <scope>provided</scope>

     </dependency>

     <dependency>

       <groupId>org.apache.servicemix</groupId>

       <artifactId>apache-servicemix</artifactId>

-      <version>${pom.version}</version>

+      <version>${project.version}</version>

       <type>zip</type>

     </dependency>

   </dependencies>

@@ -84,7 +84,6 @@
       <plugin>

         <groupId>org.mortbay.jetty</groupId>

         <artifactId>maven-jetty-plugin</artifactId>

-        <version>6.1.26RC0</version>

         <configuration>

           <connectors>

             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

diff --git a/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java b/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
index c49f246..7f3e107 100644
--- a/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
+++ b/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
@@ -49,7 +49,7 @@
         try {

             System.err.println("contextDestroyed");

             if (main != null) {

-                main.destroy(false);

+                main.destroy();

             }

         } catch (Exception e) {

             e.printStackTrace();

diff --git a/trunk/.gitignore b/trunk/.gitignore
deleted file mode 100644
index 8e39efc..0000000
--- a/trunk/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.settings
-.classpath
-.project
-target
-*.i??
-velocity.log
\ No newline at end of file
diff --git a/trunk/BUILDING b/trunk/BUILDING
deleted file mode 100644
index c218581..0000000
--- a/trunk/BUILDING
+++ /dev/null
@@ -1,52 +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.
- */
-
-Building Apache ServiceMix 4
-============================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.2.1, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-
-Building
---------
-
-1) Change to the top level directory of Apache ServiceMix 4 source distribution.
-2) Run
-         $> mvn
-   This will compile Apache ServiceMix 4 and run all of the tests in the 
-   Apache ServiceMix Kernel source distribution. Alternatively, you can run
-         $> mvn -Pfastinstall
-   This will compile Apache ServiceMix 4 without running the tests and takes less
-   time to build.
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times until the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build.
-3) The distributions will be available under "assembly/target" directory.
-
diff --git a/trunk/LICENSE b/trunk/LICENSE
deleted file mode 100644
index 6b0b127..0000000
--- a/trunk/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) 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. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/trunk/NOTICE b/trunk/NOTICE
deleted file mode 100644
index f5c80bf..0000000
--- a/trunk/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================

-   ==  NOTICE file for use with the Apache License, Version 2.0,          ==

-   ==  in this case for the Apache ServiceMix distribution.               ==

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

-

-   This product contains software developed by

-   The Apache Software Foundation (http://www.apache.org/).

-

-   This product contains software developed by

-   Open Participation Software for Java (http://www.ops4j.org/).

-

diff --git a/trunk/README b/trunk/README
deleted file mode 100644
index 419bf1e..0000000
--- a/trunk/README
+++ /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.

- */

-

-Welcome to Apache ServiceMix 4 

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

-Apache ServiceMix is an open source ESB (Enterprise Service Bus) that combines 

-the functionality of a Service Oriented Architecture (SOA) and an Event Driven

-Architecture (EDA)  to create an agile, enterprise ESB.

-

-Apache ServiceMix is an open source distributed ESB built from the ground up on 

-the  Java Business Integration (JBI) specification JSR 208 and released under 

-the Apache license. The goal of JBI is to allow components and services to be 

-integrated in a vendor independent way, allowing users and vendors to plug and 

-play.

-

-Getting Started

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

-For an Apache ServiceMix 4 source distribution, please read 

-BUILDING.txt for instructions on building Apache ServiceMix 4. 

-

-For an Apache ServiceMix 4 binary distribution, please read 

-RELEASE-NOTES.txt for installation instructions and list of supported 

-and unsupported features.

-

-Alternatively, you can also find out how to get started here:

-    http://servicemix.apache.org/smx4/

-

-If you need more help try talking to us on our mailing lists

-    http://servicemix.apache.org/mailing-lists.html

-

-If you find any issues with ServiceMix 4, please submit reports 

-with JIRA here:

-    http://issues.apache.org/activemq/browse/SMX4

-

-We welcome contributions, and encourage you to get involved in the 

-ServiceMix community. If you'd like to learn more about how you can 

-contribute, please see:

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

-

-Many thanks for using Apache ServiceMix.

-

-

-The ServiceMix Team

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

diff --git a/trunk/RELEASE-NOTES b/trunk/RELEASE-NOTES
deleted file mode 100644
index e315d43..0000000
--- a/trunk/RELEASE-NOTES
+++ /dev/null
@@ -1,186 +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.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.

-

- 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

-

-** 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

-

-** 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/trunk/assembly/pom.xml b/trunk/assembly/pom.xml
deleted file mode 100644
index e198f69..0000000
--- a/trunk/assembly/pom.xml
+++ /dev/null
@@ -1,950 +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.features</groupId>
-        <artifactId>features</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>apache-servicemix</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Assembly</name>
-
-    <dependencies>
-        
-        <!-- Karaf -->
-        <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>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.war</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix Components -->
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-bean</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-camel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-cxf-bc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-cxf-se</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-drools</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-eip</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-exec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-file</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-ftp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-smpp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-osworkflow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-quartz</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-saxon</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-scripting</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-snmp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-vfs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-wsn2005</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix NMR -->
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>apache-servicemix-nmr</artifactId>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>apache-servicemix-nmr</artifactId>
-            <type>tar.gz</type>
-        </dependency>
-       
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>apache-servicemix-nmr</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
- 
-        <!-- ServiceMix Specs -->
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.scripting-api-1.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix Utils and Shared -->
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-soap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-soap2</artifactId>
-        </dependency>
-        
-        <!-- Aries -->
-        <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.transaction</groupId>
-            <artifactId>org.apache.aries.transaction.manager</artifactId>
-        </dependency>
-        
-        <!-- ActiveMQ -->
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-blueprint</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-karaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>kahadb</artifactId>
-        </dependency>
-        
-        <!-- Camel -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring</artifactId>
-        </dependency>
-        
-        <!-- CXF -->
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-bindings-jbi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-jbi</artifactId>
-        </dependency>
-        
-        <!-- Geronimo -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        
-        <!-- PAX Web -->
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-extender-war</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-extender-whiteboard</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-jsp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-spi</artifactId>
-        </dependency>
-        
-        <!-- PAX URL -->
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-war</artifactId>
-        </dependency>
-        
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-asm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-        
-        <!-- Spring OSGi -->
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-extender</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-io</artifactId>
-        </dependency>
-        
-        <!-- Bundles -->
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.abdera</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.antlr-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.drools</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.fastinfoset</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.groovy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jruby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.mvel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.oscore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.osworkflow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.oro</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.propertyset</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-        </dependency>
-        
-        <!-- Other Dependencies -->
-        <dependency>
-            <groupId>com.google.code.scriptengines</groupId>
-            <artifactId>scriptengines-javascript</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.scriptengines</groupId>
-            <artifactId>scriptengines-jruby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.scriptengines</groupId>
-            <artifactId>scriptengines-groovy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.parsers</groupId>
-            <artifactId>jaxp-ri</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.commonman</groupId>
-            <artifactId>commons-management</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-jexl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-blueprint</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-classloader</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ode</groupId>
-            <artifactId>ode-jbi-karaf</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ode</groupId>
-            <artifactId>ode-jbi-karaf</artifactId>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <filters>
-            <filter>target/filter.txt</filter>
-        </filters>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-prop</id>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <tasks>
-                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
-                                <property name="mv" value="${karaf.version}" />
-                                <echo message="Maven version: ${mv}" />
-                                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
-                                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
-                                <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0" />
-                                <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue="" />
-                                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
-                                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
-                                <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
-                                <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
-                                <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
-                                <echo message="OSGi version: ${ov}" />
-                                <mkdir dir="target" />
-                                <echo message="karaf.osgi.version = ${ov}" file="target/filter.txt" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </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>generate-resources</phase>
-                        <goals>
-                            <goal>add-features-to-repo</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-                                <descriptor>file:${basedir}/target/classes/activemq-features.xml</descriptor>
-                                <descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
-                                <descriptor>mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features</descriptor>
-                                <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
-                            </descriptors>
-                            <features>
-                                <feature>activemq</feature>
-                                <feature>activemq-blueprint</feature>
-                                <feature>activemq-broker</feature>
-                                <feature>camel</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>
-                            </features>
-                            <repository>target/features-repo</repository>
-                        </configuration>
-                    </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>
-                </executions>
-            </plugin>
-        
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.features</groupId>
-                                    <artifactId>org.apache.servicemix.features.branding</artifactId>
-                                    <version>${project.version}</version>
-                                    <outputDirectory>target/dependencies</outputDirectory>
-                                    <destFileName>servicemix-version.jar</destFileName>
-                                </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>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.nmr</groupId>
-                                    <artifactId>apache-servicemix-nmr</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>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.nmr</groupId>
-                                    <artifactId>apache-servicemix-nmr</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>target/dependencies/win</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </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>
-                        <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>
-                        </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>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unix-src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/unix-src.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/windows-src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>assembly-src</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>
-                            </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>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
-
diff --git a/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm b/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm
deleted file mode 100644
index 5c6b59b..0000000
--- a/trunk/assembly/src/main/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/trunk/assembly/src/main/appended-resources/META-INF/NOTICE b/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 1c830e3..0000000
--- a/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,35 +0,0 @@
-This product also includes schemas and specification developed by:
-      - the W3C consortium (http://www.w3c.org)
-      (http://www.w3.org/XML/1998/namespace)
-      
-This product also includes WS-* schemas developed by International
-   Business Machines Corporation, Microsoft Corporation, BEA Systems, 
-   TIBCO Software, SAP AG, Sonic Software, and VeriSign
-   (http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd)
-   (http://schemas.xmlsoap.org/ws/2004/08/addressing/)
-   (http://schemas.xmlsoap.org/wsdl/http)
-   (http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm.xsd)
-   (http://www.w3.org/2005/08/addressing/ws-addr.xsd)
-
-This product also includes MTOSI wsdl and schemas developed by the
-TeleManagement Forum (http://www.tmforum.org/browse.aspx). The original
-MTOSI wsdl and schemas can be download from
-(http://sourceforge.net/projects/mtosi-ri)
-
-Java classes (source and binary) under org.apache.cxf.jaxws.javaee
-are generated from schema available here:
-   (http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
-
-Portions of the included XmlSchema library are Copyright 2006 International Business Machines Corp.
-
-Additional copyright notices and license terms applicable are
-present in the licenses directory of this distribution.
-
-This product includes Java classes originally released under the Common 
-Development and Distribution License (CDDL) and relicenced here under the
-Apache Software License. These include:
-  Java Activation API (javax.activation.*)
-  Java Persistence API (javax.persistence.*)
-  Java API for RESTful Web Services (javax.xml.rs.*)
-Any additional rights under the Apache License are offered by this project
-alone, and not by the Initial Developer or Contributor. 
diff --git a/trunk/assembly/src/main/descriptors/unix-bin.xml b/trunk/assembly/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index 72480c8..0000000
--- a/trunk/assembly/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,443 +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></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <fileSets>
-
-        <!-- Expanded ServiceMix Runtime -->
-        <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.ops4j.pax.logging.cfg</exclude>
-              <exclude>etc/users.properties</exclude>
-              <exclude>etc/custom.properties</exclude>
-              <exclude>etc/jre.properties</exclude>
-              <exclude>LICENSE</exclude>
-              <exclude>NOTICE</exclude>
-              <exclude>README</exclude>
-              <exclude>RELEASE-NOTES</exclude>
-              <exclude>karaf-manual*</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Copy over bin/servicemix separately to get the correct file mode -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-              <include>bin/admin</include>
-              <include>bin/karaf</include>  <!-- we need this one in here for admin:create'd instances to work -->
-              <include>bin/start</include>
-              <include>bin/stop</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <!-- Copy over karaf demo to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf-demos</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <includes>
-              <include>pom.xml</include>
-              <include>**/web/**</include>
-            </includes>
-        </fileSet>
-       
-       <!-- Copy over ant files -->
-       <fileSet>
-            <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>unix</lineEnding>
-       </fileSet>
-
-       <!-- Copy over nmr examples files -->
-       <fileSet>
-            <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <exclude>**/itests/**</exclude>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-            </excludes>
-            <lineEnding>unix</lineEnding>
-       </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 jar files -->
-        <fileSet>
-            <directory>target/dependencies</directory>
-            <includes>
-                <include>servicemix-version.jar</include>
-            </includes>
-            <outputDirectory>/lib/</outputDirectory>
-        </fileSet>
-
-        <!-- Copy over everything that needs to get unix line endings -->
-        <fileSet>
-            <directory>src/main/distribution/text</directory>
-            <outputDirectory>/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>        
-        <fileSet>
-            <directory>target/classes/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-       <fileSet>
-            <directory>src/main/distribution/unix-shell</directory>
-            <outputDirectory>/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <!-- Copy over the examples -->
-        <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>**/itests/**</exclude>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/wsdl-first/**</exclude>
-                <exclude>**/loan-broker-bpel/**</exclude>
-            </excludes>
-        </fileSet>
-        
-        <fileSet>
-          <directory>target/features-repo</directory>
-          <outputDirectory>system</outputDirectory>
-        </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/dependencies/servicemix-version.jar</source>
-            <outputDirectory>/lib/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <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>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/activemq-features.xml</source>
-            <outputDirectory>system/org/apache/activemq/activemq-karaf/${activemq.version}</outputDirectory>
-            <destName>activemq-karaf-${activemq.version}-features.xml</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/camel-features.xml</source>
-            <outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
-            <destName>apache-camel-${camel.version}-features.xml</destName>
-            <fileMode>0644</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>
-
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/bridge/README.txt</source>
-            <outputDirectory>/examples/bridge</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-ws-addressing/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-jaxrs/README.txt</source>
-            <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/bridge-camel/README.txt</source>
-            <outputDirectory>/examples/bridge-camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/camel/README.txt</source>
-            <outputDirectory>/examples/camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/camel-blueprint/README.txt</source>
-            <outputDirectory>/examples/camel-blueprint</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-wsdl-first/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/camel-osgi/README.txt</source>
-            <outputDirectory>/examples/camel-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/camel-nmr/README.txt</source>
-            <outputDirectory>/examples/camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-          <source>${basedir}/../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-nmr</outputDirectory>               
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-ws-security-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-ws-rm/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-
-        <file>
-            <source>${basedir}/../examples/cxf-camel-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/simple/README.txt</source>
-            <outputDirectory>/examples/simple</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib/endorsed</outputDirectory>
-            <includes>
-                <include>com.sun.xml.parsers:jaxp-ri</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>org/apache/servicemix/nmr/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>org.apache.servicemix.nmr:apache-servicemix-nmr:xml:features</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>org/apache/ode/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>org.apache.ode:ode-jbi-karaf:xml:features</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.osgi.compendium</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
-
-    </dependencySets>
-
-</assembly>
diff --git a/trunk/assembly/src/main/descriptors/unix-src.xml b/trunk/assembly/src/main/descriptors/unix-src.xml
deleted file mode 100644
index 6195ad7..0000000
--- a/trunk/assembly/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/trunk/assembly/src/main/descriptors/windows-bin.xml b/trunk/assembly/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index a818abc..0000000
--- a/trunk/assembly/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,434 +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></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-
-      <!-- Expanded ServiceMix Runtime -->
-      <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.ops4j.pax.logging.cfg</exclude>
-             <exclude>etc/users.properties</exclude>
-             <exclude>etc/custom.properties</exclude>
-             <exclude>etc/jre.properties</exclude>
-             <exclude>LICENSE</exclude>
-             <exclude>NOTICE</exclude>
-             <exclude>README</exclude>
-             <exclude>RELEASE-NOTES</exclude>
-             <exclude>karaf-manual*</exclude>
-          </excludes>
-      </fileSet>
-
-      <!-- Copy over kernel demo to examples folder -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-          <outputDirectory>/examples/karaf-demos</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-            <include>pom.xml</include>
-            <include>**/web/**</include>
-          </includes>
-      </fileSet>
-      
-      <!-- Copy over ant files -->
-       <fileSet>
-            <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>dos</lineEnding>
-       </fileSet>
-
-      <!-- Copy over nmr examples files -->
-      <fileSet>
-           <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>
-           <outputDirectory>/examples/</outputDirectory>
-           <excludes>
-               <exclude>pom.xml</exclude>
-               <exclude>**/itests/**</exclude>
-               <exclude>**/target/**</exclude>
-               <exclude>**/.classpath</exclude>
-               <exclude>**/.project</exclude>
-               <exclude>**/.settings/**</exclude>
-           </excludes>
-           <lineEnding>dos</lineEnding>
-      </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>src/main/distribution/text</directory>
-          <outputDirectory>/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>        
-      <fileSet>
-          <directory>target/classes/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <!-- Copy over jar files -->
-      <fileSet>
-          <directory>target/dependencies</directory>
-          <includes>
-              <include>servicemix-version.jar</include>
-          </includes>
-          <outputDirectory>/lib/</outputDirectory>
-      </fileSet>
-
-      <!-- Copy over the examples -->
-      <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>**/itests/**</exclude>
-              <exclude>**/target/**</exclude>
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**</exclude>
-              <exclude>**/wsdl-first/**</exclude>
-              <exclude>**/loan-broker-bpel/**</exclude>
-          </excludes>
-      </fileSet>
-
-      <fileSet>
-        <directory>target/features-repo</directory>
-        <outputDirectory>system</outputDirectory>
-      </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/dependencies/servicemix-version.jar</source>
-            <outputDirectory>/lib/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <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>
-        <file>
-            <source>${basedir}/target/classes/activemq-features.xml</source>
-            <outputDirectory>system/org/apache/activemq/activemq-karaf/${activemq.version}</outputDirectory>
-            <destName>activemq-karaf-${activemq.version}-features.xml</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/camel-features.xml</source>
-            <outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
-            <destName>apache-camel-${camel.version}-features.xml</destName>
-            <fileMode>0644</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>
-        
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-
-        <file>
-              <source>${basedir}/../examples/bridge/README.txt</source>
-              <outputDirectory>/examples/bridge</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/cxf-ws-addressing/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/cxf-jaxrs/README.txt</source>
-              <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/bridge-camel/README.txt</source>
-              <outputDirectory>/examples/bridge-camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/camel/README.txt</source>
-              <outputDirectory>/examples/camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/camel-blueprint/README.txt</source>
-              <outputDirectory>/examples/camel-blueprint</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/cxf-wsdl-first/README.txt</source>
-              <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../examples/camel-osgi/README.txt</source>
-              <outputDirectory>/examples/camel-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../examples/camel-nmr/README.txt</source>
-              <outputDirectory>/examples/camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-        <file>
-          <source>${basedir}/../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>dos</lineEnding>
-        </file>
-            <file>
-              <source>${basedir}/../examples/cxf-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../examples/cxf-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../examples/cxf-ws-security-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../examples/cxf-ws-rm/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-            <file>
-              <source>${basedir}/../examples/cxf-camel-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../examples/simple/README.txt</source>
-              <outputDirectory>/examples/simple</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/target/classes/pom.xml</source>
-              <outputDirectory>/examples/</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-    </files>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib/endorsed</outputDirectory>
-            <includes>
-                <include>com.sun.xml.parsers:jaxp-ri</include>
-            </includes>
-        </dependencySet>        
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>org/apache/servicemix/nmr/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>org.apache.servicemix.nmr:apache-servicemix-nmr:xml:features</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>org/apache/ode/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>org.apache.ode:ode-jbi-karaf:xml:features</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>org/apache/camel/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>org.apache.camel.karaf:apache-camel:xml:features</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.osgi.compendium</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
-
-    </dependencySets>
-
-</assembly>
diff --git a/trunk/assembly/src/main/descriptors/windows-src.xml b/trunk/assembly/src/main/descriptors/windows-src.xml
deleted file mode 100644
index 6cc69e1..0000000
--- a/trunk/assembly/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/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml b/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
deleted file mode 100644
index c20115b..0000000
--- a/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
+++ /dev/null
@@ -1,131 +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">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <ext:property-placeholder />
-
-    <broker xmlns="http://activemq.apache.org/schema/core" 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="tcp://localhost:61616"/>
-            <transportConnector name="stomp" uri="stomp://localhost:61613"/>
-        </transportConnectors>
-
-    </broker>
-
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-
-        <property name="brokerURL" value="tcp://localhost:61616" />
-    </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="transactionManager" />
-          <property name="connectionFactory" ref="activemqConnectionFactory" />
-          <property name="resourceName" value="activemq.default" />
-    </bean>
-
-    <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
-
-    <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
-        <service-properties>
-            <entry key="name" value="localhost"/>
-        </service-properties>
-    </service>
-
-</blueprint>
-
diff --git a/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg b/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
deleted file mode 100644
index d8d35aa..0000000
--- a/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
+++ /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.
-#
-#
-aries.transaction.timeout=600
-aries.transaction.howl.logFileDir=${karaf.data}/txlog/
diff --git a/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg b/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg
deleted file mode 100644
index d462e8c..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg b/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg
deleted file mode 100644
index 4125cfe..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg b/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 515fdc8..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/etc/system.properties b/trunk/assembly/src/main/distribution/text/etc/system.properties
deleted file mode 100644
index 30515d5..0000000
--- a/trunk/assembly/src/main/distribution/text/etc/system.properties
+++ /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.
-#
-################################################################################
-
-#
-# 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
-
-#
-# 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}
diff --git a/trunk/assembly/src/main/distribution/text/etc/users.properties b/trunk/assembly/src/main/distribution/text/etc/users.properties
deleted file mode 100644
index 0348fae..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/licenses/asm.txt b/trunk/assembly/src/main/distribution/text/licenses/asm.txt
deleted file mode 100644
index 6eff43a..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/licenses/bsd.txt b/trunk/assembly/src/main/distribution/text/licenses/bsd.txt
deleted file mode 100644
index 1568be2..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt b/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt
deleted file mode 100644
index 4830da9..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt b/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt
deleted file mode 100644
index c9990a7..0000000
--- a/trunk/assembly/src/main/distribution/text/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/trunk/assembly/src/main/filtered-resources/activemq-features.xml b/trunk/assembly/src/main/filtered-resources/activemq-features.xml
deleted file mode 100644
index bb65b36..0000000
--- a/trunk/assembly/src/main/filtered-resources/activemq-features.xml
+++ /dev/null
@@ -1,62 +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="activemq-${activemq.version}">
-    <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
-    
-    <feature name="activemq" version="${activemq.version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.activemq/kahadb/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-console/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-ra/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-karaf/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
-    </feature>
-    
-    <feature name="activemq-spring" version="${activemq.version}">
-        <feature version="${spring.osgi.version}">spring-dm</feature>
-        <feature version="${activemq.version}">activemq</feature>
-        <bundle>mvn:org.apache.activemq/activemq-spring/${activemq.version}</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
-    </feature>
-    
-    <feature name="activemq-blueprint" version="${activemq.version}">
-        <feature version="${activemq.version}">activemq</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-blueprint/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq.version}</bundle>
-    </feature>
-    
-    <!-- do "features:install war" before installing this one -->
-    <feature name="activemq-web-console" version="${activemq.version}">
-        <bundle>war:mvn:org.apache.activemq/activemq-web-console/${activemq.version}/war?Webapp-Context=activemq-web-console</bundle>
-    </feature>
-    
-</features>
diff --git a/trunk/assembly/src/main/filtered-resources/camel-features.xml b/trunk/assembly/src/main/filtered-resources/camel-features.xml
deleted file mode 100644
index 85c285f..0000000
--- a/trunk/assembly/src/main/filtered-resources/camel-features.xml
+++ /dev/null
@@ -1,590 +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>
-    <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
-    <feature name='camel' version='${camel.version}'>
-        <feature version='${camel.version}'>camel-core</feature>
-        <feature version='${camel.version}'>camel-spring</feature>
-        <feature version='${camel.version}'>camel-blueprint</feature>
-    </feature>
-    <feature name='camel-core' version='${camel.version}'>
-        <feature version="${spring.version}">spring</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
-        <bundle>mvn:org.fusesource.commonman/commons-management/${commons-management.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
-    </feature>
-    <feature name='camel-spring' version='${camel.version}'>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <feature version='${spring.version}'>spring</feature>
-        <feature version='${spring.osgi.version}'>spring-dm</feature>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <feature version='${camel.version}'>camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-spring/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-blueprint" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-blueprint/${camel.version}</bundle>
-        <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
-    </feature>
-    <feature name='camel-test' version='${camel.version}'>
-        <feature version='${camel.version}'>camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-test/${camel.version}</bundle>
-    </feature>
-    <feature name='camel-cxf' version='${camel.version}'>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
-        <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
-        <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
-        <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
-        <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.camel/camel-cxf/${camel.version}</bundle>
-    </feature>
-    <feature name='camel-cache' version='${camel.version}'>
-        <feature version='${camel.version}'>camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-cache/${camel.version}</bundle>
-    </feature>
-    <feature name='camel-castor' version='${camel.version}'>
-        <feature version='${camel.version}'>camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.regexp/${regexp.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-castor/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-crypto" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-crypto/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-http" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-http/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-http4" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcomponents.version}</bundle>
-        <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpcomponents.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-http4/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-mina" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-mina/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jetty" version="${camel.version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <feature version="${camel.version}">camel-http</feature>
-        <bundle>mvn:org.apache.camel/camel-jetty/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-servlet" version="${camel.version}">
-        <features version="${camel.version}">camel-http</features>
-        <bundle>mvn:org.apache.camel/camel-servlet/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jms" version="${camel.version}">
-        <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jms/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-amqp" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.camel/camel-amqp/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-atom" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-atom/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-bam" version="${camel.version}">
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-sqlmap.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-bam/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-bean-validator" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-bean-validator/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-bindy" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-bindy/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-cometd" version="${camel.version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-cometd/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-csv" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-csv/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-dozer" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dozer/${dozer.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-dozer/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-exec" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.commons/commons-exec/${commons-exec.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-exec/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-flatpack" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-flatpack/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-freemarker" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-freemarker/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-ftp" version="${camel.version}">
-        <bundle>mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-ftp/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-guice" version="${camel.version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guiceyfruit.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-guice/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-groovy" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-groovy/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-hl7" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-hl7/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-hawtdb" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:http://repo.fusesource.com/nexus/content/groups/public!org.fusesource.hawtdb/hawtdb/${hawtdb.version}</bundle>
-        <bundle>mvn:http://repo.fusesource.com/nexus/content/groups/public!org.fusesource.hawtbuf/hawtbuf/${hawtbuf.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-hawtdb/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-ibatis" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-sqlmap.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-ibatis/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-irc" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-irc/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jackson" version="${camel.version}">
-        <bundle>mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
-        <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jackson/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jasypt" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jasypt/${camel.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
-    </feature>
-    <feature name="camel-jaxb" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jaxb/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jcr" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-api.bundle.version}</bundle>
-        <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jcr/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jing" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-jing/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jdbc" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jdbc/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-josql" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-josql/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jpa" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa.bundle.version}</bundle>
-        <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jpa/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-jxpath" version="${camel.version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:commons-jxpath/commons-jxpath/${commons-jxpath.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-jxpath/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-juel" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-juel/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-ldap" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-ldap/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-lucene" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-lucene/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-mail" version="${camel.version}">
-        <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-        <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-mail/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-msv" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-msv/${camel.version}</bundle>
-        <feature version="${camel.version}">camel-spring</feature>
-    </feature>
-    <feature name="camel-mvel" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-mvel/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-nagios" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-core.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-nagios/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-netty" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-netty/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-ognl" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl.bundle.version}</bundle>
-        <bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/${javassist.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-ognl/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-printer" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-printer/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-protobuf" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-protobuf/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-quartz" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-quartz/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-restlet" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-restlet/${camel.version}</bundle>
-        <bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet.version}</bundle>
-        <bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet.version}</bundle>
-    </feature>
-    <feature name="camel-rmi" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-rmi/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-rss" version="${camel.version}">
-        <feature version="${camel.version}">camel-atom</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-rss/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-saxon" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-saxon/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-scala" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-library.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-scala/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-script" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-script/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-sip" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix.specs.version}</bundle>
-	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-sip/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-shiro" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.shiro/${shiro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-shiro/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-smpp" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-smpp/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-snmp" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-snmp/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-soap" version="${camel.version}">
-        <feature version="${camel.version}">camel-jaxb</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-soap/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-spring-integration" version="${camel.version}">
-        <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/1.0.4.RELEASE
-        </bundle>
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.camel/camel-spring-integration/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-spring-javaconfig" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.springframework/spring-test/${spring.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-spring-security" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.springframework.security/spring-security-core/${spring.version}</bundle>
-        <bundle>mvn:org.springframework.security/spring-security-config/${spring.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-spring-security/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-sql" version="${camel.version}">
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-sql/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-stream" version="${camel.version}">
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-stream/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-string-template" version="${camel.version}">
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-stringtemplate/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-tagsoup" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/${tagsoup.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-tagsoup/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-velocity" version="${camel.version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-spring</feature>
-        <bundle>mvn:org.apache.camel/camel-velocity/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-xmlbeans" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-xmlbeans/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-xmlsecurity" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-xmlsecurity/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-xmpp" version="${camel.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack.bundle.version}</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.camel/camel-xmpp/${camel.version}</bundle>
-    </feature>
-    <feature name="camel-xstream" version="${camel.version}">
-        <bundle>mvn:org.codehaus.jettison/jettison/1.2</bundle>
-        <feature version="${camel.version}">camel-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${joda-time.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version}</bundle>
-        <bundle>mvn:org.apache.camel/camel-xstream/${camel.version}</bundle>
-    </feature>
-</features>
diff --git a/trunk/assembly/src/main/filtered-resources/etc/custom.properties b/trunk/assembly/src/main/filtered-resources/etc/custom.properties
deleted file mode 100644
index 73c2594..0000000
--- a/trunk/assembly/src/main/filtered-resources/etc/custom.properties
+++ /dev/null
@@ -1,35 +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
-
-obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
-
-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
diff --git a/trunk/assembly/src/main/filtered-resources/etc/jre.properties b/trunk/assembly/src/main/filtered-resources/etc/jre.properties
deleted file mode 100644
index f1779d8..0000000
--- a/trunk/assembly/src/main/filtered-resources/etc/jre.properties
+++ /dev/null
@@ -1,315 +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.5= \
- javax.accessibility, \
- javax.activity, \
- 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.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.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.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
-
-# Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute 
-#   - javax.activation, javax.annotation*, javax.jws*, javax.script*, javax.xml.bind*, javax.xml.soap, javax.xml.ws* packages are not exported
-jre-1.6= \
- 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, \
- javax.accessibility, \
-# javax.activation, \
- javax.activity, \
-# javax.annotation, \
-# javax.annotation.processing, \
- 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.jws, \
-# javax.jws.soap, \
- 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.bind, \
-# javax.xml.bind.annotation, \
-# javax.xml.bind.annotation.adapters, \
-# javax.xml.bind.attachment, \
-# javax.xml.bind.helpers, \
-# javax.xml.bind.util, \
- 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.soap, \
-# javax.xml.stream, \
-# javax.xml.stream.events, \
-# javax.xml.stream.util, \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
-# javax.xml.ws, \
-# javax.xml.ws.handler, \
-# javax.xml.ws.handler.soap, \
-# javax.xml.ws.http, \
-# javax.xml.ws.soap, \
-# javax.xml.ws.spi, \
- 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
diff --git a/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
deleted file mode 100644
index 046c353..0000000
--- a/trunk/assembly/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/apache-karaf/${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.ode/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot=config,activemq-broker,camel,camel-activemq,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/trunk/assembly/src/main/filtered-resources/features.xml b/trunk/assembly/src/main/filtered-resources/features.xml
deleted file mode 100644
index d3341aa..0000000
--- a/trunk/assembly/src/main/filtered-resources/features.xml
+++ /dev/null
@@ -1,356 +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>
-    <repository>mvn:org.apache.karaf/apache-karaf/${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}">
-        <feature version="${aries.transaction.version}">transaction</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
-    </feature>
-    <feature name="cxf" version="${cxf.version}">
-        <feature>transaction</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
-        <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
-        <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom.version}</bundle>
-        <bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
-    </feature>
-    <feature name="cxf-osgi" version="${version}">
-        <feature version="${cxf.version}">cxf</feature>
-        <feature version="${karaf.version}">war</feature>
-    </feature>
-    <feature name="cxf-jaxrs" version="${version}">
-        <feature version="${version}">cxf-osgi</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
-        <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
-    </feature>
-    <feature name="cxf-nmr" version="${version}">
-        <feature version="${cxf.version}">cxf</feature>
-        <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}">
-        <feature version="${camel.version}">camel</feature>
-        <feature version="${servicemix.nmr.version}">nmr</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
-    </feature>
-    <feature name="camel-activemq" version="${version}">
-        <feature version="${activemq.version}">activemq</feature>
-        <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.activemq/activemq-camel/${activemq.version}</bundle>
-    </feature>
-
-    <!--
-      -
-      -  Examples
-      -
-    -->
-
-    <feature name="examples-cxf-osgi" version="${version}">
-        <feature version="${version}">cxf-osgi</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
-        <bundle>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}">
-        <feature version="${version}">cxf-jaxrs</feature>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-nmr" version="${version}">
-        <feature version="${version}">cxf-nmr</feature>
-        <bundle>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}">
-        <feature version="${camel.version}">camel</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-blueprint" version="${version}">
-        <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}">
-        <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}">
-        <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}">
-        <feature version="${version}">camel-nmr</feature>
-        <feature version="${version}">cxf-nmr</feature>
-        <bundle>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}">
-        <feature>cxf-osgi</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-    </feature>
-    <feature name="examples-cxf-wsdl-first-osgi-package" version="${version}">
-        <feature version="${servicemix-cxf-bc.version}">servicemix-cxf-bc</feature>
-        <feature version="${servicemix-cxf-se.version}">servicemix-cxf-se</feature>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/${version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-security-osgi" version="${version}">
-        <feature>cxf-osgi</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
-        <bundle>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-rm" version="${version}">
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
-    </feature>
-
-    <!--
-      -
-      -  JBI Components
-      -
-    -->
-
-    <feature name="servicemix-shared" version="${servicemix-shared.version}">
-        <feature version="${servicemix.nmr.version}">jbi</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix-shared.version}</bundle>
-    </feature>
-    <feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
-        <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix-cxf-bc.version}</bundle>
-    </feature>
-    <feature name="servicemix-file" version="${servicemix-file.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix-file.version}</bundle>
-    </feature>
-    <feature name="servicemix-ftp" version="${servicemix-ftp.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-        <bundle>mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp.version}</bundle>
-    </feature>
-    <feature name="servicemix-http" version="${servicemix-http.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http.version}</bundle>
-    </feature>
-    <feature name="servicemix-jms" version="${servicemix-jms.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
-        <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix-jms.version}</bundle>
-    </feature>
-    <feature name="servicemix-mail" version="${servicemix-mail.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail.version}</bundle>
-    </feature>
-    <feature name="servicemix-bean" version="${servicemix-bean.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean.version}</bundle>
-    </feature>
-    <feature name="servicemix-camel" version="${servicemix-camel.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <feature version="${camel.version}">camel</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix-camel.version}</bundle>
-    </feature>
-    <feature name="servicemix-drools" version="${servicemix-drools.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt-core.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix-drools.version}</bundle>
-    </feature>
-    <feature name="servicemix-cxf-se" version="${servicemix-cxf-se.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-jbi/${cxf.version}</bundle>
-        <bundle>mvn:org.apache.cxf/cxf-rt-transports-jbi/${cxf.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix-cxf-se.version}</bundle>
-    </feature>
-    <feature name="servicemix-eip" version="${servicemix-eip.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix-eip.version}</bundle>
-    </feature>
-    <feature name="servicemix-osworkflow" version="${servicemix-osworkflow.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscore/${oscore.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.propertyset/${propertyset.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.osworkflow/${osworkflow.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix-osworkflow.version}</bundle>
-    </feature>
-    <feature name="servicemix-quartz" version="${servicemix-quartz.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix-quartz.version}</bundle>
-    </feature>
-    <feature name="servicemix-scripting" version="${servicemix-scripting.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.groovy/${groovy.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby.bundle.version}</bundle>
-        <bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
-        <bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
-        <bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix-scripting.version}</bundle>
-    </feature>
-    <feature name="servicemix-validation" version="${servicemix-validation.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix-validation.version}</bundle>
-    </feature>
-    <feature name="servicemix-saxon" version="${servicemix-saxon.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix-saxon.version}</bundle>
-    </feature>
-    <feature name="servicemix-wsn2005" version="${servicemix-wsn2005.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <feature version="${activemq.version}">activemq</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005.version}</bundle>
-    </feature>
-    <feature name="servicemix-snmp" version="${servicemix-snmp.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix-snmp.version}</bundle>
-    </feature>
-    <feature name="servicemix-vfs" version="${servicemix-vfs.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix-vfs.version}</bundle>
-    </feature>
-    <feature name="servicemix-smpp" version="${servicemix-smpp.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix-smpp.version}</bundle>
-    </feature>
-    <feature name="servicemix-exec" version="${servicemix-exec.version}">
-        <feature version="${servicemix-shared.version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix-exec.version}</bundle>
-    </feature>
-
-    <!-- Default broker configuration -->
-    <feature name="activemq-broker" version="${version}">
-        <feature version="${activemq.version}">activemq-blueprint</feature>
-        <bundle>blueprint:file:etc/activemq-broker.xml</bundle>
-    </feature>
-</features>
diff --git a/trunk/assembly/src/main/filtered-resources/pom.xml b/trunk/assembly/src/main/filtered-resources/pom.xml
deleted file mode 100644
index e43182e..0000000
--- a/trunk/assembly/src/main/filtered-resources/pom.xml
+++ /dev/null
@@ -1,52 +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.features</groupId>
-        <artifactId>features</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>bridge</module>
-        <module>bridge-camel</module>
-        <module>camel</module>
-        <module>cxf-wsdl-first</module>
-        <module>camel-nmr</module>
-        <module>camel-osgi</module>
-        <module>cxf-camel-nmr</module>
-        <module>cxf-nmr</module>
-        <module>cxf-osgi</module>
-        <module>cxf-ws-addressing</module>
-        <module>cxf-jaxrs</module>
-        <module>cxf-wsdl-first-osgi-package</module>
-        <module>cxf-ws-security-osgi</module>
-        <module>cxf-ws-rm</module> 
-   </modules>
-
-</project>
diff --git a/trunk/branding/pom.xml b/trunk/branding/pom.xml
deleted file mode 100644
index f7f6c39..0000000
--- a/trunk/branding/pom.xml
+++ /dev/null
@@ -1,65 +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.features</groupId>
-        <artifactId>features</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <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/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties b/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties
deleted file mode 100644
index 5bbf7f0..0000000
--- a/trunk/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/trunk/camel/pom.xml b/trunk/camel/pom.xml
deleted file mode 100644
index 56a046d..0000000
--- a/trunk/camel/pom.xml
+++ /dev/null
@@ -1,39 +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.features</groupId>
-        <artifactId>features</artifactId>
-        <version>4.3.0</version>
-    </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/trunk/camel/servicemix-camel/pom.xml b/trunk/camel/servicemix-camel/pom.xml
deleted file mode 100644
index fc4def4..0000000
--- a/trunk/camel/servicemix-camel/pom.xml
+++ /dev/null
@@ -1,248 +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.3.0</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>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>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</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>
-        </dependency>
-        <dependency>
-            <groupId>bouncycastle</groupId>
-            <artifactId>bcprov-jdk14</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-        </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>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</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.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>
-                </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-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/test/java</sourceRoot>
-                            <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>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java b/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
deleted file mode 100644
index 150e4c3..0000000
--- a/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
+++ /dev/null
@@ -1,164 +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.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Pattern;
-
-/**
- * The binding object will help us to deal with copying between the NMR exchange and camel exchange
- */
-public class ServiceMixBinding {
-    private final transient Log LOG = LogFactory.getLog(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/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java b/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
deleted file mode 100644
index 00145aa..0000000
--- a/trunk/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 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/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java b/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
deleted file mode 100644
index 5887675..0000000
--- a/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
+++ /dev/null
@@ -1,129 +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());
-        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);
-
-                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/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java b/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
deleted file mode 100644
index e14b0f6..0000000
--- a/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
+++ /dev/null
@@ -1,82 +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;
-
-/**
- * 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";
-
-    private String endpointName;
-    private boolean synchronous;
-
-    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));
-    }
-
-    public ServiceMixComponent getComponent() {
-        return (ServiceMixComponent)super.getComponent();
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public boolean isSynchronous() {
-        return synchronous;
-    }
-
-    public Producer createProducer() throws Exception {
-        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;
-    }
-}
diff --git a/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java b/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
deleted file mode 100644
index a077170..0000000
--- a/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
+++ /dev/null
@@ -1,201 +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.UUID;
-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);
-
-        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())));
-
-            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) {
-            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() + "-" + UUID.randomUUID(),
-                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;
-        }
-    }
-}
diff --git a/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr b/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
deleted file mode 100644
index 17e2f92..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx b/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
deleted file mode 100644
index 17e2f92..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml b/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
deleted file mode 100644
index 439aae8..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
deleted file mode 100644
index b3eaead..0000000
--- a/trunk/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.ContextTestSupport;
-import org.apache.camel.impl.JndiRegistry;
-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 ContextTestSupport implements ExchangeListener {
-
-    private ServiceMix nmr;
-    private ServiceMixComponent component;
-    private Channel channel;
-
-    @Override
-    protected 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
-    protected 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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java
deleted file mode 100644
index e7944bb..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java
deleted file mode 100644
index 1d48cfa..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java
+++ /dev/null
@@ -1,130 +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;
-
-/**
- * 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
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        done = new CountDownLatch(COUNT);
-    }
-
-    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));
-    }
-
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java
deleted file mode 100644
index e67bbd0..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java
+++ /dev/null
@@ -1,81 +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;
-
-/**
- * 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";
-
-    public void testInOnlyTryCatch() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:caught");
-        mock.expectedMessageCount(1);
-
-        template.sendBody("direct:inonly", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
deleted file mode 100644
index 2528032..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
deleted file mode 100644
index 25ab6f8..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
+++ /dev/null
@@ -1,176 +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.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=%7bhttp://apache.org/hello_world_soap_http%7dSOAPService";
-
-    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);
-        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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java
deleted file mode 100644
index ebddb7f..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java
deleted file mode 100644
index 77bd20e..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java
deleted file mode 100644
index b231cbc..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
deleted file mode 100644
index 6fd392b..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
+++ /dev/null
@@ -1,72 +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 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;
-
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java
deleted file mode 100644
index 4676e9a..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java
deleted file mode 100644
index ca89ed9..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.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;
-
-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 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
-     */
-    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
-     */
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java
deleted file mode 100644
index 4421331..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java
+++ /dev/null
@@ -1,56 +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;
-
-/**
- * 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();
-
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
deleted file mode 100644
index 638103d..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.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;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-
-/**
- * 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";
-
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java
deleted file mode 100644
index 505465e..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java
+++ /dev/null
@@ -1,101 +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;
-
-/**
- * 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";
-
-    public void testSimpleInOnly() throws InterruptedException {
-        MockEndpoint mock = getMockEndpoint("mock:simple");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        template.sendBody("direct:simple", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    public void testSimpleInOnlyWithMultipleHops() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:hops");
-        mock.expectedBodiesReceived(REQUEST_MESSAGE);
-
-        template.sendBody("direct:hops", REQUEST_MESSAGE);
-
-        assertMockEndpointsSatisfied();        
-    }
-
-    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);
-    }
-
-    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);
-    }
-
-    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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java
deleted file mode 100644
index cf729f3..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
deleted file mode 100644
index e2684e2..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java
deleted file mode 100644
index fcba2c9..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java
deleted file mode 100644
index 510b85f..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
deleted file mode 100644
index 29990d5..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
+++ /dev/null
@@ -1,106 +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.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);
-        AddressingPropertiesImpl 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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java
deleted file mode 100644
index 4292def..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
deleted file mode 100644
index 59dbc72..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java
deleted file mode 100644
index 811e986..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java
deleted file mode 100644
index 892e920..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
deleted file mode 100644
index c6baaa2..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java
deleted file mode 100644
index bb98de6..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java
deleted file mode 100644
index 277fa6a..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
deleted file mode 100644
index 63a8654..0000000
--- a/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
+++ /dev/null
@@ -1,152 +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");
-        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);
-        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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java
deleted file mode 100644
index 70d5308..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
deleted file mode 100644
index 892a658..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java b/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java
deleted file mode 100644
index 7e95dbb..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/log4j.properties b/trunk/camel/servicemix-camel/src/test/resources/log4j.properties
deleted file mode 100644
index db2051e..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
deleted file mode 100644
index 4099665..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/DummyBean.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/DummyBean.xml
deleted file mode 100644
index 475dfa3..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
deleted file mode 100644
index 92af3a2..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
deleted file mode 100644
index cc532dc..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing-hpux.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing-hpux.xml
deleted file mode 100644
index d371e1e..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/addressing.xml
deleted file mode 100644
index ff15fbb..0000000
--- a/trunk/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/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
deleted file mode 100644
index d51693c..0000000
--- a/trunk/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"/>
-            </wsdl:fault>
-        </wsdl:operation>
-
-    </wsdl:binding>
-    <wsdl:binding name="Doc_Lit_Bare_SOAPBinding" type="tns:DocLitBare">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="testDocLitBare">
-            <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
-            <wsdl:input name="testDocLitBareRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="testDocLitBareResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-
-    <wsdl:service name="SOAPService">
-    <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:19000/SoapContext/SoapPort"/>
-        </wsdl:port>
-
-    <wsdl:port name="SoapPort1" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:7000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <wsdl:service name="SOAPProviderService">
-        <wsdl:port name="SoapProviderPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9003/SoapContext/SoapProviderPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-        <wsdl:service name="SOAPDispatchService">
-        <wsdl:port name="SoapDispatchPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9006/SOAPDispatchService/SoapDispatchPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <wsdl:service name="SOAPService_DocLitBare">
-        <wsdl:port name="SoapPort2" binding="tns:Doc_Lit_Bare_SOAPBinding">
-            <soap:address location="http://localhost:7600/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceAddressingDocLitBare">
-        <wsdl:port name="SoapPort" binding="tns:Doc_Lit_Bare_SOAPBinding">
-            <soap:address location="http://localhost:7600/SoapContext/SoapPort"/>
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPService_Test1">
-        <wsdl:port name="SoapPort_Test1" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9100"/>
-        </wsdl:port>
-        <wsdl:port name="SoapPort_Test2" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9101"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceAddressing">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9008/SoapContext/SoapPort"/>
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceConcurrencyTest">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9009/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceBogusAddressTest">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="FOO"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceMultiPortTypeTest">
-        <wsdl:port name="GreeterPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9020/MultiPort/GreeterPort"/>
-        </wsdl:port>
-        <wsdl:port name="DocLitBarePort" binding="tns:Doc_Lit_Bare_SOAPBinding">
-            <soap:address location="http://localhost:9021/MultiPort/DocBarePort"/>
-        </wsdl:port>        
-    </wsdl:service>
-</wsdl:definitions>
-
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml
deleted file mode 100644
index 39aea19..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml
+++ /dev/null
@@ -1,92 +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:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:test="http://cxf.apache.org/greeter_control"
-    xmlns:cxf="http://camel.apache.org/schema/cxf"
-    xmlns:smx="http://servicemix.apache.org/camelEndpoint/"
-    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://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd
-        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
-        http://servicemix.apache.org/camelEndpoint/ http://servicemix.apache.org/camelEndpoint/.xsd
-        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-    
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
-    
-    <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="camelContext" ref="camel_context"/>
-        <property name="transportIds">
-            <list>
-              <value>http://cxf.apache.org/transports/camel</value>
-            </list>
-        </property>
-    </bean>
-        
-    <camel:camelContext id="camel_context">
-    </camel:camelContext>
-   
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-    <bean class="org.apache.servicemix.camel.nmr.ws.addressing.MAPVerifier" id="mapVerifier"/>
-    <bean class="org.apache.servicemix.camel.nmr.ws.addressing.HeaderVerifier" id="headVerifier"/>
-    <cxf:cxfEndpoint id="routerEndpoint" name="test:GreeterPort" address="camel://jetty:http://localhost:9008/SoapContext/SoapPort"  bus="cxf" serviceClass="org.apache.hello_world_soap_http.Greeter">
-        <cxf:properties>
-            <entry key="dataFormat" value="POJO"/>
-        </cxf:properties>
-        <cxf:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
-        </cxf:features>
-        <cxf:outInterceptors>
-            <ref bean="mapVerifier"/>
-            <ref bean="headVerifier"/>
-        </cxf:outInterceptors>
-        <cxf:inInterceptors>
-            <ref bean="mapVerifier"/>
-            <ref bean="headVerifier"/>
-        </cxf:inInterceptors>
-        
-        <cxf:outFaultInterceptors>
-            <ref bean="mapVerifier"/>
-            <ref bean="headVerifier"/>
-        </cxf:outFaultInterceptors>
-        <cxf:inFaultInterceptors>
-            <ref bean="mapVerifier"/>
-            <ref bean="headVerifier"/>
-        </cxf:inFaultInterceptors>
-
-    </cxf:cxfEndpoint>
-
-
-    <cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/hello_world"
-      serviceClass="org.apache.hello_world_soap_http.Greeter">
-        <cxf:properties>
-            <entry key="dataFormat" value="POJO"/>
-        </cxf:properties>
-    </cxf:cxfEndpoint>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml
deleted file mode 100644
index dd3eb4e..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml
+++ /dev/null
@@ -1,69 +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-conf="http://cxf.apache.org/transports/http/configuration"
-       xmlns:jaxws="http://cxf.apache.org/jaxws"
-       xsi:schemaLocation="
-http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-    <bean id="loggingIn" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
-
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="loggingIn"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-    </bean>
-
-    <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" 
-                  createdFromAPI="true">
-        <jaxws:conduitSelector>
-            <bean class="org.apache.cxf.endpoint.DeferredConduitSelector"/>
-        </jaxws:conduitSelector>
-    </jaxws:client>
-    
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr-external.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr-external.xml
deleted file mode 100644
index 4742a68..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr-external.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.
--->
-<attachments xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
-    <wsp:PolicyAttachment>
-        <wsp:AppliesTo>
-            <wsa:EndpointReference>
-                <wsa:Address>http://localhost:9020/SoapContext/GreeterPort</wsa:Address>
-            </wsa:EndpointReference>
-        </wsp:AppliesTo>
-        <wsp:Policy>
-            <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata">
-                <wsp:Policy/>
-            </wsam:Addressing>
-        </wsp:Policy>
-    </wsp:PolicyAttachment>    
-</attachments>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml
deleted file mode 100644
index a2c58f3..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       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://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
-    </http:conduit>
-
-    <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
-        <property name="bus" ref="cxf"/>
-        <property name="enabled" value="true"/>
-    </bean>
-
-    <bean class="org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider">
-        <constructor-arg ref="cxf"/>
-        <property name="location" value="org/apache/servicemix/camel/ws/policy/addr-external.xml"/>
-    </bean>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml
deleted file mode 100644
index 4ce9dba..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml
+++ /dev/null
@@ -1,69 +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:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:test="http://cxf.apache.org/greeter_control"
-    xmlns:cxf="http://camel.apache.org/schema/cxf"
-    xmlns:camel="http://camel.apache.org/schema/spring"
-    xmlns:smx="http://servicemix.apache.org/camelEndpoint/"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans                     http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-        http://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd
-        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
-        http://servicemix.apache.org/camelEndpoint/ http://servicemix.apache.org/camelEndpoint/.xsd
-        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-    
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
-    
-    <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="camelContext" ref="camel_context"/>
-        <property name="transportIds">
-            <list>
-              <value>http://cxf.apache.org/transports/camel</value>
-            </list>
-        </property>
-    </bean>
-        
-    <camel:camelContext id="camel_context">
-    </camel:camelContext>
-   
-    <cxf:cxfEndpoint id="routerEndpoint" name="test:GreeterPort" address="camel://jetty:http://localhost:9020/SoapContext/GreeterPort"  serviceClass="org.apache.cxf.greeter_control.Greeter">
-        <cxf:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
-        </cxf:features>
-        <cxf:properties>
-            <entry key="setDefaultBus" value="true"/>
-        </cxf:properties>
-    </cxf:cxfEndpoint>
-
-
-    <cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/hello_world"
-      serviceClass="org.apache.cxf.greeter_control.Greeter">
-        <cxf:properties>
-            <entry key="setDefaultBus" value="true"/>
-        </cxf:properties>
-    </cxf:cxfEndpoint>
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/xbean.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/xbean.xml
deleted file mode 100644
index b53b44b..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/xbean.xml
+++ /dev/null
@@ -1,69 +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:sm="http://servicemix.apache.org/config/1.0"
-       xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:cxfbc="http://servicemix.apache.org/cxfbc/1.0"
-       xmlns:test="urn:test"
-       xmlns:greeter="http://cxf.apache.org/greeter_control">
-  
-  <sm:container id="jbi" embedded="true">
-    
-    <sm:endpoints>
-      <cxfse:endpoint>
-        <cxfse:pojo>
-          <bean class="org.apache.servicemix.cxfbc.ws.policy.GreeterImpl" />
-        </cxfse:pojo>
-        <cxfse:inInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfse:inInterceptors>
-        <cxfse:outInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfse:outInterceptors>
-        <cxfse:inFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfse:inFaultInterceptors>
-        <cxfse:outFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfse:outFaultInterceptors>
-      </cxfse:endpoint>
-      <cxfbc:consumer wsdl="/wsdl/greeter_control.wsdl"
-                      targetEndpoint="GreeterPort"
-                      targetService="greeter:BasicGreeterService"
-              targetInterface="greeter:Greeter"
-                      busCfg="org/apache/servicemix/cxfbc/ws/policy/addr.xml"
-                      >
-        <cxfbc:inInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfbc:inInterceptors>
-        <cxfbc:outInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfbc:outInterceptors>
-        <cxfbc:inFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfbc:inFaultInterceptors>
-        <cxfbc:outFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfbc:outFaultInterceptors>
-      </cxfbc:consumer>
-    </sm:endpoints>
-    
-  </sm:container>
-  
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/atmostonce.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/atmostonce.xml
deleted file mode 100644
index a33631f..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/atmostonce.xml
+++ /dev/null
@@ -1,45 +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:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-    xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-policy:RMAssertion>
-            <wsrm-policy:BaseRetransmissionInterval Milliseconds="60000" />
-            <wsrm-policy:AcknowledgementInterval Milliseconds="10000" />
-        </wsrm-policy:RMAssertion>
-        <wsrm-mgr:deliveryAssurance>
-            <wsrm-mgr:AtMostOnce />
-        </wsrm-mgr:deliveryAssurance>
-        <wsrm-mgr:destinationPolicy>
-            <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
-        </wsrm-mgr:destinationPolicy>
-    </wsrm-mgr:rmManager>
-
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml
deleted file mode 100644
index 77bed1e..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml
+++ /dev/null
@@ -1,63 +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://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
-    </http:conduit>
-    
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
-
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/deferred.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/deferred.xml
deleted file mode 100644
index 86d75db..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/deferred.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-       xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <import resource="rminterceptors.xml"/>
-    
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-    <wsrm-policy:RMAssertion>         
-          <wsrm-policy:BaseRetransmissionInterval Milliseconds="10000"/>           
-          <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>                                                        
-      </wsrm-policy:RMAssertion>
-      <wsrm-mgr:destinationPolicy>
-          <wsrm-mgr:acksPolicy intraMessageThreshold="0"/>                    
-      </wsrm-mgr:destinationPolicy>      
-    </wsrm-mgr:rmManager>
-    
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/inactivity-timeout.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/inactivity-timeout.xml
deleted file mode 100644
index b4f5dd1..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/inactivity-timeout.xml
+++ /dev/null
@@ -1,38 +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:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-    xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-policy:RMAssertion>
-            <wsrm-policy:InactivityTimeout Milliseconds="200" />
-        </wsrm-policy:RMAssertion>
-    </wsrm-mgr:rmManager>
-
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml
deleted file mode 100644
index cce5fd8..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml
+++ /dev/null
@@ -1,89 +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:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-    xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
-    xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-    <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
-    <bean id="messageLoss" class="org.apache.servicemix.cxfbc.ws.rm.MessageLossSimulator"/>
-
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
-
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalIn"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalIn"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalOut"/>
-                <ref bean="rmCodec"/>
-                <ref bean="messageLoss"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalOut"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-    </bean>
-    
-    
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-policy:RMAssertion>
-            <!-- avoid server side resends, change programatically for client -->
-            <wsrm-policy:BaseRetransmissionInterval Milliseconds="2000" />
-        </wsrm-policy:RMAssertion>
-    </wsrm-mgr:rmManager>
-
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss.xml
deleted file mode 100644
index 946fdef..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-    xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
-    xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-policy:RMAssertion>
-            <!-- avoid server side resends, change programatically for client -->
-            <wsrm-policy:BaseRetransmissionInterval Milliseconds="60000" />
-            <wsrm-policy:AcknowledgementInterval Milliseconds="2000" />
-        </wsrm-policy:RMAssertion>
-    </wsrm-mgr:rmManager>
-
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/no-offer.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/no-offer.xml
deleted file mode 100644
index 938b0b6..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/no-offer.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-    xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">        
-        <wsrm-policy:RMAssertion>
-            <wsrm-policy:BaseRetransmissionInterval Milliseconds="60000" />
-            <wsrm-policy:AcknowledgementInterval Milliseconds="60000" />
-        </wsrm-policy:RMAssertion>
-        <wsrm-mgr:sourcePolicy includeOffer="false"/>
-        <wsrm-mgr:destinationPolicy>
-            <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
-        </wsrm-mgr:destinationPolicy>
-    </wsrm-mgr:rmManager>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml
deleted file mode 100644
index 6d3cb8f..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml
+++ /dev/null
@@ -1,70 +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.xsd">
-
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-    <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
-
-
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalIn"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalIn"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalOut"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="rmLogicalOut"/>
-                <ref bean="rmCodec"/>
-            </list>
-        </property>
-    </bean>
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/seqlength1.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/seqlength1.xml
deleted file mode 100644
index 4af5c7e..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/seqlength1.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:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-       xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-mgr:sourcePolicy>
-            <wsrm-mgr:sequenceTerminationPolicy maxLength="1" />
-        </wsrm-mgr:sourcePolicy>
-    </wsrm-mgr:rmManager>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/seqlength10.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/seqlength10.xml
deleted file mode 100644
index f83070f..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/seqlength10.xml
+++ /dev/null
@@ -1,36 +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:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:http="http://cxf.apache.org/transports/http/configuration"
-    xsi:schemaLocation="
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-mgr:sourcePolicy>
-            <wsrm-mgr:sequenceTerminationPolicy maxLength="10" />
-        </wsrm-mgr:sourcePolicy>
-    </wsrm-mgr:rmManager>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/sequence.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/sequence.xml
deleted file mode 100644
index 99c0d85..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/sequence.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.
-  
--->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
-       xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:cxfbc="http://servicemix.apache.org/cxfbc/1.0"
-       xmlns:greeter="http://cxf.apache.org/greeter_control">
-  
-  <sm:container id="jbi" embedded="true">
-    
-    <sm:endpoints>
-      <cxfse:endpoint>
-        <cxfse:pojo>
-          <bean class="org.apache.servicemix.cxfbc.ws.rm.ControlImpl" />
-        </cxfse:pojo>
-        <cxfse:inInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfse:inInterceptors>
-        <cxfse:outInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfse:outInterceptors>
-        <cxfse:inFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfse:inFaultInterceptors>
-        <cxfse:outFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfse:outFaultInterceptors>
-      </cxfse:endpoint>
-      <cxfse:endpoint>
-        <cxfse:pojo>
-          <bean class="org.apache.servicemix.cxfbc.ws.rm.GreeterImpl" />
-        </cxfse:pojo>
-        <cxfse:inInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfse:inInterceptors>
-        <cxfse:outInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfse:outInterceptors>
-        <cxfse:inFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfse:inFaultInterceptors>
-        <cxfse:outFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfse:outFaultInterceptors>
-      </cxfse:endpoint>
-      <cxfbc:consumer wsdl="/wsdl/greeter_control.wsdl"
-                      targetEndpoint="ControlPort"
-                      targetService="greeter:ControlService"
-              targetInterface="greeter:Control"
-                      >
-        <cxfbc:inInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfbc:inInterceptors>
-        <cxfbc:outInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfbc:outInterceptors>
-        <cxfbc:inFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfbc:inFaultInterceptors>
-        <cxfbc:outFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfbc:outFaultInterceptors>
-      </cxfbc:consumer>
-      <cxfbc:consumer wsdl="/wsdl/greeter_control.wsdl"
-                      targetEndpoint="GreeterPort"
-                      targetService="greeter:GreeterService"
-                      targetInterface="greeter:Greeter"
-                      busCfg="org/apache/servicemix/cxfbc/ws/rm/rminterceptors.xml"
-                      >
-        <cxfbc:inInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfbc:inInterceptors>
-        <cxfbc:outInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-          <!--WrappedOutInterceptor and BareOutInterceptor are used for send back ws-rm message-->
-          <bean class="org.apache.cxf.interceptor.WrappedOutInterceptor"/>
-          <bean class="org.apache.cxf.interceptor.BareOutInterceptor"/>
-        </cxfbc:outInterceptors>
-        <cxfbc:inFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-        </cxfbc:inFaultInterceptors>
-        <cxfbc:outFaultInterceptors>
-          <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-        </cxfbc:outFaultInterceptors>
-      </cxfbc:consumer>
-    </sm:endpoints>
-    
-  </sm:container>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
deleted file mode 100644
index c6de264..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
+++ /dev/null
@@ -1,94 +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:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:test="http://cxf.apache.org/greeter_control"
-    xmlns:cxf="http://camel.apache.org/schema/cxf"
-    xmlns:camel="http://camel.apache.org/schema/spring"
-    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-2.0.xsd
-        http://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.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
-    ">
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
-    
-    <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="camelContext" ref="camel_context"/>
-        <property name="transportIds">
-            <list>
-              <value>http://cxf.apache.org/transports/camel</value>
-            </list>
-        </property>
-    </bean>
-    <http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
-      <http:client AllowChunking="false" DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
-    </http:conduit>    
-    <camel:camelContext id="camel_context">
-    </camel:camelContext>
-
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-    <cxf:cxfEndpoint id="routerEndpoint" name="test:GreeterPort" address="camel://jetty:http://localhost:9020/SoapContext/GreeterPort"  serviceClass="org.apache.cxf.greeter_control.Greeter">
-        <cxf:properties>
-            <entry key="dataFormat" value="POJO"/>
-            <entry key="setDefaultBus" value="true"/>
-        </cxf:properties>
-        <cxf:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
-        </cxf:features>
-        <cxf:outInterceptors>
-            <ref bean="mapAggregator"/>
-            <ref bean="mapCodec"/>
-        </cxf:outInterceptors>
-        <cxf:inInterceptors>
-            <ref bean="mapCodec"/>
-            <ref bean="mapAggregator"/>
-        </cxf:inInterceptors>
-        
-        <cxf:outFaultInterceptors>
-            <ref bean="mapAggregator"/>
-            <ref bean="mapCodec"/>
-        </cxf:outFaultInterceptors>
-        <cxf:inFaultInterceptors>
-            <ref bean="mapCodec"/>
-            <ref bean="mapAggregator"/>
-        </cxf:inFaultInterceptors>
-
-    </cxf:cxfEndpoint>
-
-
-    <cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/hello_world"
-      serviceClass="org.apache.cxf.greeter_control.Greeter">
-        <cxf:properties>
-            <entry key="dataFormat" value="POJO"/>
-            <entry key="setDefaultBus" value="true"/>
-        </cxf:properties>
-    </cxf:cxfEndpoint>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/suppressed.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/suppressed.xml
deleted file mode 100644
index df97f46..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/suppressed.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-    xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-    xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="rminterceptors.xml" />
-    
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-        <wsrm-policy:RMAssertion>
-            <wsrm-policy:BaseRetransmissionInterval Milliseconds="3000" />
-            <wsrm-policy:AcknowledgementInterval Milliseconds="99999999" />
-        </wsrm-policy:RMAssertion>
-        <wsrm-mgr:destinationPolicy>
-            <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
-        </wsrm-mgr:destinationPolicy>        
-    </wsrm-mgr:rmManager>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/terminate-on-shutdown.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/terminate-on-shutdown.xml
deleted file mode 100644
index 2b3948d..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/terminate-on-shutdown.xml
+++ /dev/null
@@ -1,44 +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:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-       xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xsi:schemaLocation="
-http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <import resource="rminterceptors.xml"/>
-    
-    <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
-      <wsrm-policy:RMAssertion>         
-          <wsrm-policy:BaseRetransmissionInterval Milliseconds="10000"/>           
-          <wsrm-policy:AcknowledgementInterval Milliseconds="10000"/>                                                        
-      </wsrm-policy:RMAssertion>      
-      <wsrm-mgr:sourcePolicy>
-          <wsrm-mgr:sequenceTerminationPolicy terminateOnShutdown="true"/>                    
-      </wsrm-mgr:sourcePolicy>
-      <wsrm-mgr:destinationPolicy>
-          <wsrm-mgr:acksPolicy intraMessageThreshold="0"/>                    
-      </wsrm-mgr:destinationPolicy>      
-    </wsrm-mgr:rmManager>
-    
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml
deleted file mode 100644
index f60dbb2..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml
+++ /dev/null
@@ -1,96 +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.xsd">
-  
-  
-    <!-- Endpoint Level Interceptors-->
-    <!-- Inserted From JaxWsEndpointImpl, EndpointImpl-->
-    <bean id="wrapperClassIn" class="org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor"/>
-    <bean id="wrapperClassOut" class="org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor"/>
-    <bean id="holderIn" class="org.apache.cxf.jaxws.interceptors.HolderInInterceptor"/>
-    <bean id="holderOut" class="org.apache.cxf.jaxws.interceptors.HolderOutInterceptor"/>
-    <bean id="clientFaultConv" class="org.apache.cxf.interceptor.ClientFaultConverter"/>
-    <bean id="messageSender" class="org.apache.cxf.interceptor.MessageSenderInterceptor"/>
-    <!-- Cannot use via config -->
-    <!--
-    <bean id="soapHandler" class="org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor"/>
-    <bean id="logicalHandler" class="org.apache.cxf.jaxws.handler.LogicalHandlerInterceptor"/>
-    -->
-    
-    <!-- WSA Interceptors-->
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-
-    <!-- WS-RM Interceptors-->
-    <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
-
-    <!-- Logging and Utility Interceptor-->
-    <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-    <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-
-    <!--WS-A Interceptors not required in Fault Chain-->
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="rmLogicalIn"/>
-                <ref bean="rmCodec"/>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="wrapperClassIn"/>
-                <ref bean="holderIn"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="clientFaultConv"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="rmLogicalOut"/>
-                <ref bean="rmCodec"/>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="wrapperClassOut"/>
-                <ref bean="holderOut"/>
-                <ref bean="messageSender"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="rmLogicalOut"/>
-                <ref bean="rmCodec"/>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="messageSender"/>
-            </list>
-        </property>
-    </bean> 
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/alice.jks b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/alice.jks
deleted file mode 100644
index 5bd162b..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/alice.jks
+++ /dev/null
Binary files differ
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/alice.properties b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/alice.properties
deleted file mode 100644
index 1063fe1..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/alice.properties
+++ /dev/null
@@ -1,23 +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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.file=src/test/resources/org/apache/servicemix/camel/ws/security/alice.jks
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/bob.jks b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/bob.jks
deleted file mode 100644
index a4f49c5..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/bob.jks
+++ /dev/null
Binary files differ
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/bob.properties b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/bob.properties
deleted file mode 100644
index f10ab82..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/bob.properties
+++ /dev/null
@@ -1,23 +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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.file=src/test/resources/org/apache/servicemix/camel/ws/security/bob.jks
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml
deleted file mode 100644
index c8f9d4d..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml
+++ /dev/null
@@ -1,89 +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:jaxws="http://cxf.apache.org/jaxws"
-       xsi:schemaLocation="
-          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
-          http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd
-          ">
-
-    <jaxws:client name="{http://apache.org/hello_world_soap_http}TimestampSignEncrypt" createdFromAPI="true">
-        <jaxws:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
-        </jaxws:features>
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
-            <ref bean="TimestampSignEncrypt_Request"/>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <ref bean="TimestampSignEncrypt_Response"/>
-            <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
-        </jaxws:inInterceptors>
-    </jaxws:client>
-
-    <!-- -->
-    <!-- This bean is an Out interceptor which will add a Timestamp, -->
-    <!-- sign the Timstamp and Body, and then encrypt the Timestamp -->
-    <!-- and Body.  It uses 3DES as the symmetric key algorithm. -->
-    <!-- -->
-    <bean 
-        class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
-        id="TimestampSignEncrypt_Request">
-        <constructor-arg>
-            <map>
-                <entry key="action" value="Timestamp Signature Encrypt"/>
-                <!-- <entry key="action" value="Timestamp Signature"/> -->
-                <entry key="user" value="alice"/>
-                <entry key="signaturePropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
-                <entry key="encryptionPropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
-                <entry key="encryptionUser" value="Bob"/>
-                <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
-                <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
-                <!-- -->
-                <!-- Recommendation: signatures should be encrypted -->
-                <!-- -->
-                <entry key="encryptionParts" value="{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
-                <!-- <entry key="encryptionKeyTransportAlgorithm" value="RSA15"/> -->
-                <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-            </map>
-        </constructor-arg>
-    </bean>
-    
-    <!-- -->
-    <!-- This bean is an In interceptor which validated a signed, -->
-    <!-- encrypted resposne, and timestamped. -->
-    <!-- -->
-    <!-- -->
-    <bean 
-        class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
-        id="TimestampSignEncrypt_Response">
-        <constructor-arg>
-            <map>
-                <entry key="action" value="Timestamp Signature Encrypt"/>
-                <entry key="signaturePropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
-                <entry key="decryptionPropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
-                <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
-            </map>
-        </constructor-arg>
-    </bean>
-
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl
deleted file mode 100644
index a3c1d24..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl
+++ /dev/null
@@ -1,43 +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:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    targetNamespace="http://apache.org/hello_world_soap_http" 
-    name="WSSecurity"
-    >
-
-    <wsdl:import 
-        namespace="http://apache.org/hello_world_soap_http"
-        location="hello_world_base.wsdl"
-    />
-
-    <wsdl:service name="SOAPServiceWSSecurity">
-        <wsdl:port 
-            name="TimestampSignEncrypt" 
-            binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:19000/SOAPServiceWSSecurity/TimestampSignEncrypt"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
-
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl
deleted file mode 100644
index 94144c9..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.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"/>
-            </wsdl:fault>
-        </wsdl:operation>
-
-    </wsdl:binding>
-    <wsdl:binding name="Doc_Lit_Bare_SOAPBinding" type="tns:DocLitBare">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="testDocLitBare">
-            <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
-            <wsdl:input name="testDocLitBareRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="testDocLitBareResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-
-    <wsdl:service name="SOAPService">
-    <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:19000/SoapContext/SoapPort"/>
-        </wsdl:port>
-
-    <wsdl:port name="SoapPort1" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:7000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <wsdl:service name="SOAPProviderService">
-        <wsdl:port name="SoapProviderPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9003/SoapContext/SoapProviderPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-        <wsdl:service name="SOAPDispatchService">
-        <wsdl:port name="SoapDispatchPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9006/SOAPDispatchService/SoapDispatchPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <wsdl:service name="SOAPService_DocLitBare">
-        <wsdl:port name="SoapPort2" binding="tns:Doc_Lit_Bare_SOAPBinding">
-            <soap:address location="http://localhost:7600/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceAddressingDocLitBare">
-        <wsdl:port name="SoapPort" binding="tns:Doc_Lit_Bare_SOAPBinding">
-            <soap:address location="http://localhost:7600/SoapContext/SoapPort"/>
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPService_Test1">
-        <wsdl:port name="SoapPort_Test1" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9100"/>
-        </wsdl:port>
-        <wsdl:port name="SoapPort_Test2" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9101"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceAddressing">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9008/SoapContext/SoapPort"/>
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceConcurrencyTest">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9009/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceBogusAddressTest">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="FOO"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsdl:service name="SOAPServiceMultiPortTypeTest">
-        <wsdl:port name="GreeterPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9020/MultiPort/GreeterPort"/>
-        </wsdl:port>
-        <wsdl:port name="DocLitBarePort" binding="tns:Doc_Lit_Bare_SOAPBinding">
-            <soap:address location="http://localhost:9021/MultiPort/DocBarePort"/>
-        </wsdl:port>        
-    </wsdl:service>
-</wsdl:definitions>
-
diff --git a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml b/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
deleted file mode 100644
index ee5e197..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
+++ /dev/null
@@ -1,117 +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:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:test="http://apache.org/hello_world_soap_http"
-    xmlns:cxf="http://camel.apache.org/schema/cxf"
-    xmlns:smx="http://servicemix.apache.org/camelEndpoint/"
-    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://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd
-        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
-        http://servicemix.apache.org/camelEndpoint/ http://servicemix.apache.org/camelEndpoint/.xsd
-        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
-    
-    <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="camelContext" ref="camel_context"/>
-        <property name="transportIds">
-            <list>
-              <value>http://cxf.apache.org/transports/camel</value>
-            </list>
-        </property>
-    </bean>
-        
-    <camel:camelContext id="camel_context">
-    </camel:camelContext>
-    
-    <cxf:cxfEndpoint id="routerEndpoint" name="test:TimestampSignEncrypt" address="camel://jetty:http://localhost:19000/SOAPServiceWSSecurity/TimestampSignEncrypt"  serviceClass="org.apache.hello_world_soap_http.Greeter">
-        <cxf:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
-        </cxf:features>
-        <cxf:outInterceptors>
-            <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
-            <ref bean="TimestampSignEncrypt_Response"/>
-        </cxf:outInterceptors>
-        <cxf:inInterceptors>
-            <ref bean="TimestampSignEncrypt_Request"/>
-            <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
-        </cxf:inInterceptors>
-        <cxf:properties>
-            <entry key="setDefaultBus" value="true"/>
-        </cxf:properties>
-    </cxf:cxfEndpoint>
-
-
-    <cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/hello_world"
-      serviceClass="org.apache.hello_world_soap_http.Greeter">
-        <cxf:properties>
-            <entry key="setDefaultBus" value="true"/>
-        </cxf:properties>
-    </cxf:cxfEndpoint>
-
-
-    <bean 
-        class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
-        id="TimestampSignEncrypt_Response">
-        <constructor-arg>
-            <map>
-                <entry key="action" value="Timestamp Signature Encrypt"/>
-                <entry key="user" value="bob"/>
-                <entry key="signaturePropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
-                <entry key="encryptionPropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
-                <entry key="encryptionUser" value="Alice"/>
-                <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
-                <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
-                <!-- -->
-                <!-- Recommendation: signatures should be encrypted -->
-                <!-- -->
-                <entry key="encryptionParts" value="{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
-                <!-- <entry key="encryptionKeyTransportAlgorithm" value="RSA15"/> -->
-                <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-            </map>
-        </constructor-arg>
-    </bean>
-    <bean 
-        class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
-        id="TimestampSignEncrypt_Request">
-        <constructor-arg>
-            <map>
-                <!-- Use this action order for local clients -->
-                <entry key="action" value="Timestamp Signature Encrypt"/>
-                <!-- Use this action spec for WCF clients 
-                <entry key="action" value="Signature Encrypt Timestamp"/>
-                -->
-                <entry key="signaturePropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
-                <entry key="decryptionPropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
-                <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
-            </map>
-        </constructor-arg>
-    </bean>
-    
-</beans>
diff --git a/trunk/camel/servicemix-camel/src/test/resources/person.wsdl b/trunk/camel/servicemix-camel/src/test/resources/person.wsdl
deleted file mode 100644
index ed8e29a..0000000
--- a/trunk/camel/servicemix-camel/src/test/resources/person.wsdl
+++ /dev/null
@@ -1,97 +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 name="wsdl-first"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"
-    xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"
-    targetNamespace="http://servicemix.apache.org/samples/wsdl-first">
-
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types"
-                    elementFormDefault="qualified">
-            <xsd:element name="GetPerson">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="GetPersonResponse">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                        <xsd:element name="ssn" type="xsd:string"/>
-                        <xsd:element name="name" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="UnknownPersonFault">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-  </wsdl:types>
-    
-    <wsdl:message name="GetPersonRequest">
-        <wsdl:part name="payload" element="typens:GetPerson"/>
-    </wsdl:message>
-    <wsdl:message name="GetPersonResponse">
-        <wsdl:part name="payload" element="typens:GetPersonResponse"/>
-    </wsdl:message>
-    <wsdl:message name="UnknownPersonFault">
-        <wsdl:part name="payload" element="typens:UnknownPersonFault"/>
-    </wsdl:message>
-
-    <wsdl:portType name="Person">
-        <wsdl:operation name="GetPerson">
-            <wsdl:input message="tns:GetPersonRequest"/>
-            <wsdl:output message="tns:GetPersonResponse"/>
-            <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    
-    <wsdl:binding name="PersonSOAPBinding" type="tns:Person">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="GetPerson">
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="UnknownPerson">
-                <soap:fault use="literal" name="UnknownPerson" />
-            </wsdl:fault>
-       </wsdl:operation>
-   </wsdl:binding>
-
-    <wsdl:service name="PersonService">
-        <wsdl:port binding="tns:PersonSOAPBinding" name="soap">
-           <soap:address location="http://localhost:8192/PersonService/" />
-       </wsdl:port>
-   </wsdl:service>
-
-</wsdl:definitions>
diff --git a/trunk/cxf/cxf-binding-nmr/pom.xml b/trunk/cxf/cxf-binding-nmr/pom.xml
deleted file mode 100644
index 40d4be5..0000000
--- a/trunk/cxf/cxf-binding-nmr/pom.xml
+++ /dev/null
@@ -1,225 +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.cxf</groupId>
-        <artifactId>cxf</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.cxf.binding.nmr</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: CXF Support :: Binding For NMR</name>
-    <description>Apache CXF Binding integration in the NMR </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- Bundle generation -->
-            <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>
-                            javax.xml.stream;version="[0.0,2)",
-                            *
-                        </Import-Package>
-                        <!-- Needed for jaxb annotations classes -->
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                        <Export-Package>
-                            ${project.artifactId}*,
-                            '=META-INF.cxf.binding.nmr'
-                        </Export-Package>
-                        <Private-Package />
-                        <_failok>true</_failok>
-                        <Spring-Context>*;publish-context:=false</Spring-Context>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <!-- generate dependencies versions -->
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>depends-maven-plugin</artifactId>
-                <version>${depends-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-depends-file</id>
-                        <goals>
-                            <goal>generate-depends-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </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>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/hello_world_nmr.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-verbose</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>ibmjdk</id>
-            <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>IBM Corporation</value>
-                </property>
-            </activation>
-            <!-- Add the Sun jaxp-ri as a dependency when using the ibm jdk, so that 
-                cxf's dependency on the Sun saaj can work with the ibm jdk. -->
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.xml.parsers</groupId>
-                    <artifactId>jaxp-ri</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/*Test*</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/*$*</exclude>
-                            </excludes>
-                            <forkMode>${surefire.fork.mode}</forkMode>
-                            <systemProperties>
-                                <property>
-                                    <name>derby.system.home</name>
-                                    <value>${basedir}/target/derby</value>
-                                </property>
-                                <!-- With Maven 2.0.7, it's possible that jaxp-ri will be placed 
-                                    in front of woodstox on the classpath. If this happens, cxf will not use 
-                                    woodstox, causing test failures (e.g., CxfBcProviderConsumerMtomTest). So, 
-                                    set these properties to ensure woodstox is used. Maven 2.0.9 doesn't require 
-                                    this work-around since it consistently places jaxp-ri at the end of the dependencies. -->
-                                <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>
-                        </configuration>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBinding.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBinding.java
deleted file mode 100644
index 33e4c7a..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBinding.java
+++ /dev/null
@@ -1,50 +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.cxf.binding.nmr;
-
-import org.apache.cxf.binding.Binding;
-import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.model.BindingInfo;
-
-public class NMRBinding extends AbstractBasicInterceptorProvider implements Binding {
-
-    private NMRBindingInfo bindingInfo;
-    
-    public NMRBinding(NMRBindingInfo bindingInfo) {
-        this.bindingInfo = bindingInfo;
-    }
-    
-    public Message createMessage() {
-        return createMessage(new MessageImpl());
-    }
-
-    public Message createMessage(Message m) {
-        if (!m.containsKey(Message.CONTENT_TYPE)) {
-            m.put(Message.CONTENT_TYPE, "text/xml");
-        }
-        return new NMRMessage(m);
-    }
-
-    public BindingInfo getBindingInfo() {
-        return bindingInfo;
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingFactory.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingFactory.java
deleted file mode 100644
index d2e3b49..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingFactory.java
+++ /dev/null
@@ -1,67 +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.cxf.binding.nmr;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.binding.AbstractBindingFactory;
-import org.apache.cxf.binding.Binding;
-import org.apache.cxf.interceptor.StaxInInterceptor;
-import org.apache.cxf.interceptor.StaxOutInterceptor;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRFaultInInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRFaultOutInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMROperationInInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRWrapperInInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRWrapperOutInterceptor;
-
-public class NMRBindingFactory extends AbstractBindingFactory {
-
-    public Binding createBinding(BindingInfo binding) {
-        NMRBinding jb = new NMRBinding((NMRBindingInfo) binding);
-        jb.getInInterceptors().add(new StaxInInterceptor());
-        jb.getInInterceptors().add(new NMROperationInInterceptor());
-        jb.getInInterceptors().add(new NMRWrapperInInterceptor());
-        jb.getOutInterceptors().add(new StaxOutInterceptor());
-        jb.getOutInterceptors().add(new NMRWrapperOutInterceptor());
-        jb.getOutFaultInterceptors().add(new StaxOutInterceptor());
-        jb.getOutFaultInterceptors().add(new NMRFaultOutInterceptor());
-        
-        jb.getInFaultInterceptors().add(new NMRFaultInInterceptor());
-        return jb;
-    }
-
-    public BindingInfo createBindingInfo(ServiceInfo service, String namespace, Object config) {
-        NMRBindingInfo info = new NMRBindingInfo(service, NMRConstants.NS_NMR_BINDING);
-        info.setName(new QName(service.getName().getNamespaceURI(), 
-                               service.getName().getLocalPart() + "NMRBinding"));
-
-        for (OperationInfo op : service.getInterface().getOperations()) {                       
-            BindingOperationInfo bop = 
-                info.buildOperation(op.getName(), op.getInputName(), op.getOutputName());
-            info.addOperation(bop);
-        }
-        
-        return info;
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingInfo.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingInfo.java
deleted file mode 100644
index 60fbe4e..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingInfo.java
+++ /dev/null
@@ -1,30 +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.cxf.binding.nmr;
-
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-
-public class NMRBindingInfo extends BindingInfo {
-
-    public NMRBindingInfo(ServiceInfo service, String bindingId) {
-        super(service, bindingId);
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java
deleted file mode 100644
index 6afc2c4..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java
+++ /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.
- */
-package org.apache.servicemix.cxf.binding.nmr;
-
-import javax.xml.namespace.QName;
-
-
-public final class NMRConstants {
-
-    public static final String NS_NMR_BINDING = "http://cxf.apache.org/bindings/nmr";
-
-    public static final String NS_JBI_WRAPPER = "http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper";
-    
-    public static final QName JBI_WRAPPER_MESSAGE = new QName(NS_JBI_WRAPPER, "message");
-
-    public static final QName JBI_WRAPPER_PART = new QName(NS_JBI_WRAPPER, "part");
-
-    private NMRConstants() {
-        //utility class
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRFault.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRFault.java
deleted file mode 100644
index edf29d7..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRFault.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.cxf.binding.nmr;
-
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.interceptor.Fault;
-
-public class NMRFault extends Fault {
-    public static final String NMR_FAULT_PREFIX = "jfns";
-
-    public static final String NMR_FAULT_ROOT = "NMRFault";
-    public static final String NMR_FAULT_STRING = "faultstring";
-
-    public static final String NMR_FAULT_DETAIL = "detail";
-
-    public static final String NMR_FAULT_CODE_SERVER = "SERVER";
-
-    public static final String NMR_FAULT_CODE_CLIENT = "CLIENT";
-
-    
-    static final long serialVersionUID = 100000;
-
-    public NMRFault(Message message, Throwable throwable) {
-        super(message, throwable);        
-    }
-
-    public NMRFault(Message message) {
-        super(message);        
-    }
-
-    public NMRFault(String message) {
-        super(new Message(message, (ResourceBundle) null));        
-    }
-
-    public static NMRFault createFault(Fault f) {
-        if (f instanceof NMRFault) {
-            return (NMRFault) f;
-        }
-        Throwable th = f.getCause();
-        NMRFault jbiFault = new NMRFault(new Message(f.getMessage(), (ResourceBundle) null), th);
-        jbiFault.setDetail(f.getDetail());
-        return jbiFault;
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRMessage.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRMessage.java
deleted file mode 100644
index 465bc62..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRMessage.java
+++ /dev/null
@@ -1,35 +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.cxf.binding.nmr;
-
-import org.apache.cxf.message.AbstractWrappedMessage;
-import org.apache.cxf.message.Message;
-import org.apache.servicemix.nmr.api.Exchange;
-
-public class NMRMessage extends AbstractWrappedMessage {
-
-    public NMRMessage(Message msg) {
-        super(msg);
-    }
-    
-    public Exchange getNmrExchange() {
-        return get(Exchange.class);
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultInInterceptor.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultInInterceptor.java
deleted file mode 100644
index 0ed3167..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultInInterceptor.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.cxf.binding.nmr.interceptors;
-
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.w3c.dom.Element;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.staxutils.DepthXMLStreamReader;
-import org.apache.cxf.staxutils.FragmentStreamReader;
-import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.servicemix.cxf.binding.nmr.NMRFault;
-import org.apache.servicemix.cxf.binding.nmr.NMRMessage;
-
-
-public class NMRFaultInInterceptor extends AbstractPhaseInterceptor<NMRMessage> {
-    
-    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(NMRFaultInInterceptor.class);
-    public NMRFaultInInterceptor() {
-        super(Phase.UNMARSHAL);
-        addBefore("*");
-    }
-    
-    public void handleMessage(NMRMessage message) throws Fault {
-        XMLStreamReader xsr = message.getContent(XMLStreamReader.class);
-        DepthXMLStreamReader reader = new DepthXMLStreamReader(xsr);
-
-        try {            
-            
-            if (!StaxUtils.toNextElement(reader)) {
-                throw new Fault(new org.apache.cxf.common.i18n.Message("ILLEGAL_JBIFAULT_FORMAT", BUNDLE));
-            }
-            Fault fault = new NMRFault(new org.apache.cxf.common.i18n.Message(NMRFault.NMR_FAULT_STRING,
-                                                                              (ResourceBundle) null));
-            
-            if (StaxUtils.toNextElement(reader)) {
-                // handling detail
-                Element detail = StaxUtils.read(new FragmentStreamReader(reader)).getDocumentElement();
-                fault.setDetail(detail);
-            }
-            message.setContent(Exception.class, fault);
-        } catch (XMLStreamException xse) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", BUNDLE));
-        }
-
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultOutInterceptor.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultOutInterceptor.java
deleted file mode 100644
index 30642af..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultOutInterceptor.java
+++ /dev/null
@@ -1,103 +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.cxf.binding.nmr.interceptors;
-
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.helpers.NSStack;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.servicemix.cxf.binding.nmr.NMRConstants;
-import org.apache.servicemix.cxf.binding.nmr.NMRFault;
-import org.apache.servicemix.cxf.binding.nmr.NMRMessage;
-
-public class NMRFaultOutInterceptor extends AbstractPhaseInterceptor<NMRMessage> {
-
-    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(NMRFaultOutInterceptor.class);
-
-    public NMRFaultOutInterceptor() {
-        super(Phase.MARSHAL);
-    }
-
-    public void handleMessage(NMRMessage message) throws Fault {
-        message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
-        NSStack nsStack = new NSStack();
-        nsStack.push();
-
-        
-        
-        try {
-            XMLStreamWriter writer = getWriter(message);
-            Fault fault = getFault(message);
-            NMRFault jbiFault = NMRFault.createFault(fault);
-            nsStack.add(NMRConstants.NS_NMR_BINDING);
-            String prefix = nsStack.getPrefix(NMRConstants.NS_NMR_BINDING);
-            StaxUtils.writeStartElement(writer, prefix, NMRFault.NMR_FAULT_ROOT,
-                                        NMRConstants.NS_NMR_BINDING);
-            if (!jbiFault.hasDetails()) {
-                writer.writeEmptyElement("fault");
-            } else {
-                Element detail = jbiFault.getDetail();
-                NodeList details = detail.getChildNodes();
-                for (int i = 0; i < details.getLength(); i++) {
-                    if (details.item(i) instanceof Element) {
-                        StaxUtils.writeNode(details.item(i), writer, true);
-                        break;
-                    }
-                }
-            }
-            writer.writeEndElement();
-            writer.flush();
-            
-        } catch (XMLStreamException xe) {
-            throw new Fault(new Message("XML_WRITE_EXC", BUNDLE), xe);
-        }
-    }
-
-    protected Fault getFault(NMRMessage message) {
-        Exception e = message.getContent(Exception.class);
-        Fault fault;
-        if (e == null) {
-            throw new IllegalStateException(new Message("NO_EXCEPTION", BUNDLE).toString());
-        } else if (e instanceof Fault) {
-            fault = (Fault) e;
-        } else {
-            fault = new Fault(e);
-        }
-        return fault;
-    }
-    
-    protected XMLStreamWriter getWriter(NMRMessage message) {
-        XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
-        if (writer == null) {
-            throw new IllegalStateException(new Message("NO_XML_STREAM_WRITER", BUNDLE).toString());
-        }
-        return writer;
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMROperationInInterceptor.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMROperationInInterceptor.java
deleted file mode 100644
index ce66c59..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMROperationInInterceptor.java
+++ /dev/null
@@ -1,72 +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.cxf.binding.nmr.interceptors;
-
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessageInfo;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.servicemix.cxf.binding.nmr.NMRMessage;
-
-public class NMROperationInInterceptor extends AbstractPhaseInterceptor<NMRMessage> {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMROperationInInterceptor.class);
-
-    private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
-
-    public NMROperationInInterceptor() {
-        super(Phase.PRE_PROTOCOL);
-    }
-
-    public void handleMessage(NMRMessage message) throws Fault {
-        Exchange ex = message.getExchange();
-        Endpoint ep = ex.get(Endpoint.class);
-        BindingOperationInfo boi = ex.get(BindingOperationInfo.class);
-        if (boi == null && message.getNmrExchange()!= null 
-                && message.getNmrExchange().getOperation() != null) {
-            BindingInfo service = ep.getEndpointInfo().getBinding();
-            boi = getBindingOperationInfo(service, message.getNmrExchange().getOperation());
-            if (boi == null) {
-                throw new Fault(new Message("UNKNOWN_OPERATION", BUNDLE, 
-                        message.getNmrExchange().getOperation().toString()));
-            }
-            ex.put(BindingOperationInfo.class, boi);
-            ex.put(OperationInfo.class, boi.getOperationInfo());
-            ex.setOneWay(boi.getOperationInfo().isOneWay());
-            message.put(MessageInfo.class, boi.getInput().getMessageInfo());
-        }
-    }
-
-    protected BindingOperationInfo getBindingOperationInfo(BindingInfo service, QName operation) {
-        return service.getOperation(operation);
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRWrapperInInterceptor.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRWrapperInInterceptor.java
deleted file mode 100644
index 8169fec..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRWrapperInInterceptor.java
+++ /dev/null
@@ -1,139 +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.cxf.binding.nmr.interceptors;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.servicemix.cxf.binding.nmr.NMRBindingInfo;
-import org.apache.servicemix.cxf.binding.nmr.NMRConstants;
-import org.apache.servicemix.cxf.binding.nmr.NMRFault;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.databinding.DataReader;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.BindingMessageInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessageInfo;
-import org.apache.cxf.service.model.MessagePartInfo;
-import org.apache.cxf.staxutils.DepthXMLStreamReader;
-import org.apache.cxf.staxutils.StaxUtils;
-
-public class NMRWrapperInInterceptor extends AbstractInDatabindingInterceptor {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRWrapperInInterceptor.class);
-
-    private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
-
-    public NMRWrapperInInterceptor() {
-        super(Phase.UNMARSHAL);
-    }
-
-    public void handleMessage(Message message) throws Fault {
-        if (isGET(message)) {
-            LOG.info("JbiMessageInInterceptor skipped in HTTP GET method");
-            return;
-        }
-        XMLStreamReader xsr = message.getContent(XMLStreamReader.class);
-
-        DepthXMLStreamReader reader = new DepthXMLStreamReader(xsr);
-
-        Endpoint ep = message.getExchange().get(Endpoint.class);
-        BindingInfo binding = ep.getEndpointInfo().getBinding();
-        if (!(binding instanceof NMRBindingInfo)) {
-            throw new IllegalStateException(
-                  new org.apache.cxf.common.i18n.Message("NEED_JBIBINDING", BUNDLE).toString());
-        }
-
-        if (!StaxUtils.toNextElement(reader)) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("NO_OPERATION_ELEMENT", BUNDLE));
-        }
-
-        Exchange ex = message.getExchange();
-        QName startQName = reader.getName();
-
-        // handling jbi fault message
-        if (startQName.getLocalPart().equals(NMRFault.NMR_FAULT_ROOT)) {
-            message.getInterceptorChain().abort();
-
-            if (ep.getInFaultObserver() != null) {
-                ep.getInFaultObserver().onMessage(message);
-                return;
-            }
-        }
-
-
-        // handling xml normal inbound message
-        if (!startQName.equals(NMRConstants.JBI_WRAPPER_MESSAGE)) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message(
-                    "NO_JBI_MESSAGE_ELEMENT", BUNDLE));
-        }
-
-        try {
-            BindingOperationInfo bop = ex.get(BindingOperationInfo.class);
-            DataReader<XMLStreamReader> dr = getDataReader(message);
-            List<Object> parameters = new ArrayList<Object>();
-            reader.next();
-            BindingMessageInfo messageInfo = !isRequestor(message) ? bop.getInput() : bop.getOutput();
-            message.put(MessageInfo.class, messageInfo.getMessageInfo());
-            for (MessagePartInfo part : messageInfo.getMessageParts()) {
-                if (!StaxUtils.skipToStartOfElement(reader)) {
-                    throw new Fault(new org.apache.cxf.common.i18n.Message("NOT_ENOUGH_PARTS", BUNDLE));
-                }
-                startQName = reader.getName();
-                if (!startQName.equals(NMRConstants.JBI_WRAPPER_PART)) {
-                    throw new Fault(new org.apache.cxf.common.i18n.Message("NO_JBI_PART_ELEMENT", BUNDLE));
-                }
-                if (part.isElement()) {
-                    reader.next();
-                    if (!StaxUtils.toNextElement(reader)) {
-                        throw new Fault(new org.apache.cxf.common.i18n.Message("EXPECTED_ELEMENT_IN_PART", BUNDLE));
-                    }
-                }
-                parameters.add(dr.read(part, reader));
-                // skip end element
-                if (part.isElement()) {
-                    reader.next();
-                }
-            }
-            int ev = reader.getEventType();
-            while (ev != XMLStreamConstants.END_ELEMENT 
-                    && ev != XMLStreamConstants.START_ELEMENT
-                    && ev != XMLStreamConstants.END_DOCUMENT) {
-                ev = reader.next();
-            }
-            message.setContent(List.class, parameters);
-        } catch (XMLStreamException e) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", BUNDLE), e);
-        }
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRWrapperOutInterceptor.java b/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRWrapperOutInterceptor.java
deleted file mode 100644
index 35d5305..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRWrapperOutInterceptor.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.cxf.binding.nmr.interceptors;
-
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessagePartInfo;
-import org.apache.servicemix.cxf.binding.nmr.NMRConstants;
-
-public class NMRWrapperOutInterceptor extends AbstractOutDatabindingInterceptor {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRWrapperOutInterceptor.class);
-
-    private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
-
-    public NMRWrapperOutInterceptor() {
-        super(Phase.MARSHAL);
-    }
-
-    public void handleMessage(Message message) throws Fault {
-        BindingOperationInfo bop = message.getExchange().get(BindingOperationInfo.class);
-        XMLStreamWriter xmlWriter = getXMLStreamWriter(message);
-        Service service = message.getExchange().get(Service.class);
-        
-        DataWriter<XMLStreamWriter> dataWriter = getDataWriter(message, service, XMLStreamWriter.class);
-
-        try {
-            xmlWriter.setPrefix("jbi", NMRConstants.NS_JBI_WRAPPER);
-            xmlWriter.writeStartElement(NMRConstants.NS_JBI_WRAPPER,
-                                        NMRConstants.JBI_WRAPPER_MESSAGE.getLocalPart());
-            xmlWriter.writeNamespace("jbi", NMRConstants.NS_JBI_WRAPPER);
-            
-            List<MessagePartInfo> parts = null;
-            if (!isRequestor(message)) {
-                parts = bop.getOutput().getMessageParts();
-            } else {
-                parts = bop.getInput().getMessageParts();
-            }
-            List<?> objs = (List<?>) message.getContent(List.class);                
-            if (objs.size() < parts.size()) {
-                throw new Fault(new org.apache.cxf.common.i18n.Message(
-                        "NOT_EQUAL_ARG_NUM", BUNDLE));
-            }
-            for (int idx = 0; idx < parts.size(); idx++) {
-                MessagePartInfo part = parts.get(idx);
-                Object obj = objs.get(idx);
-                if (!part.isElement()) {
-                    if (part.getTypeClass() == String.class) {
-                        xmlWriter.writeStartElement(NMRConstants.NS_JBI_WRAPPER,
-                                                    NMRConstants.JBI_WRAPPER_PART.getLocalPart());
-                        xmlWriter.writeCharacters(obj.toString());
-                        xmlWriter.writeEndElement();
-                    } else {
-                        part = new MessagePartInfo(part.getName(), part.getMessageInfo());
-                        part.setElement(false);
-                        part.setConcreteName(NMRConstants.JBI_WRAPPER_PART);
-                        dataWriter.write(obj, part, xmlWriter);
-                    }
-                } else {
-                    xmlWriter.writeStartElement(NMRConstants.NS_JBI_WRAPPER,
-                                                NMRConstants.JBI_WRAPPER_PART.getLocalPart());
-                    dataWriter.write(obj, part, xmlWriter);                    
-                    xmlWriter.writeEndElement();
-                }
-            }
-            xmlWriter.writeEndElement();
-        
-        } catch (XMLStreamException e) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_WRITE_EXC", BUNDLE), e);
-        }
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/resources/META-INF/cxf/binding/nmr/cxf-binding-nmr.xml b/trunk/cxf/cxf-binding-nmr/src/main/resources/META-INF/cxf/binding/nmr/cxf-binding-nmr.xml
deleted file mode 100644
index 45e4a62..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/resources/META-INF/cxf/binding/nmr/cxf-binding-nmr.xml
+++ /dev/null
@@ -1,36 +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.xsd">
-
-    <bean class="org.apache.servicemix.cxf.binding.nmr.NMRBindingFactory"
-          id="org.apache.servicemix.cxf.binding.nmr.NMRBindingFactory"
-          lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="activationNamespaces">
-            <set>
-                <value>http://cxf.apache.org/bindings/nmr</value>
-            </set>
-        </property>
-    </bean>
-
-</beans>
diff --git a/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties b/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties
deleted file mode 100644
index 1dc5ac4..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties
+++ /dev/null
@@ -1,61 +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.
-#
-NOT.IMPLEMENTED=not yet implemented
-INVOKE.SERVICE=invoking service\t
-CREATE.MESSAGE.EXCHANGE=create message exchange svc:\t
-EXCHANGE.ENDPOINT=exchange endpoint:\t
-NO.MESSAGE=no message yet
-UNABLE.RETRIEVE.MESSAGE=unable to retrieve message
-CONTEXT.MUST.BE=context must be of type JBIOutputStreamMessageContext
-RECEIVED.MESSAGE=received message:\t
-ACTIVE.JBI.SERVER.TRANSPORT=activating JBI server transport
-BUILDING.DOCUMENT=building document from bytes
-CREATE.NORMALIZED.MESSAGE=creating NormalizedMessage
-POST.DISPATCH=postDispatch sending out message to NWR
-ERROR.SEND.MESSAGE=error sending Out message
-DISPATCH.MESSAGE.ON.CALLBACK=dispatching message on callback:\t
-ERROR.PREPARE.MESSAGE=error preparing message
-RECEIVE.THREAD.START=JBIServerTransport message receiving thread started
-DISPATCH.TO.SU=dispatching to CXF service unit
-NO.SU.FOUND=no CXFServiceUnit found
-ERROR.DISPATCH.THREAD=error running dispatch thread
-JBI.SERVER.TRANSPORT.MESSAGE.PROCESS.THREAD.EXIT=JBIServerTransport message processing thread exiting
-CONFIG.DELIVERY.CHANNEL=configuring DeliveryChannel:\t
-CONFIG.SU.MANAGER=configuring ServiceUnitManager:\t
-JBI.TRANSPORT.FACTORY.NOT.INITIALIZED=JBITransportFactory is not properly initialized
-SU.MANAGER=CXFServiceUnitManager:\t
-DELIVERY.CHANNEL=DeliveryChannel:\t
-JBI.TRANSPORT.FACTORY.NOT.FULLY.INITIALIZED=JBITransport factory not fully initialized
-CREATE.SERVER.TRANSPORT=creating JBI server transport
-CREATE.CLIENT.TRANSPORT=creating JBI client transport
-UNKNOWN_OPERATION=unknown operation {0}
-NO_OPERATION_ELEMENT=no operation element
-NO_JBI_MESSAGE_ELEMENT=no jbi message element
-NOT_ENOUGH_PARTS=not enough parts
-NO_JBI_PART_ELEMENT=no jbi part element
-EXPECTED_ELEMENT_IN_PART=expected element in part
-TOO_MANY_PARTS=too many parts
-ILLEGAL_JBIFAULT_FORMAT=illegal jbi fault format
-STAX_READ_EXC=stax read exception
-XML_WRITE_EXC=xml write exception
-STAX_WRITE_EXC=stax write exception
-NOT_EQUAL_ARG_NUM=The number of arguments is not equal
-NEED_JBIBINDING=BindingInfo should be a JbiBindingInfo
-NO_EXCEPTION=No exception on this message
-NO_XML_STREAM_WRITER=No XMLStreamWriter on this message
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/GreeterImpl.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/GreeterImpl.java
deleted file mode 100644
index 6246d45..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/GreeterImpl.java
+++ /dev/null
@@ -1,55 +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.cxf.binding.nmr;
-
-import javax.jws.WebService;
-
-import org.apache.hello_world.nmr.Greeter;
-import org.apache.hello_world.nmr.PingMeFault;
-import org.apache.hello_world.types.nmr.FaultDetail;
-
-
-@WebService(serviceName = "HelloWorldService", 
-            portName = "SoapPort", 
-            endpointInterface = "org.apache.hello_world.nmr.Greeter",
-            targetNamespace = "http://apache.org/hello_world/nmr"
-            )
-public class GreeterImpl implements Greeter {
-
-    public String sayHi() {
-        return "Bonjour";
-    }
-
-    public String greetMe(String requestType) {
-        return "Hello " + requestType;
-    }
-
-    public void greetMeOneWay(String requestType) {
-        System.out.println("OneWay get invoked");
-    }
-
-    public void pingMe() throws PingMeFault {
-        FaultDetail faultDetail = new FaultDetail();
-        faultDetail.setMajor((short)2);
-        faultDetail.setMinor((short)1);
-        throw new PingMeFault("PingMeFault raised by server", faultDetail);
-        
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/HackOperationInterceptor.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/HackOperationInterceptor.java
deleted file mode 100644
index f127f7a..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/HackOperationInterceptor.java
+++ /dev/null
@@ -1,53 +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.cxf.binding.nmr;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMROperationInInterceptor;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.core.ExchangeImpl;
-
-public class HackOperationInterceptor extends AbstractPhaseInterceptor<NMRMessage> {
-
-    private int index = 1;
-    
-    public HackOperationInterceptor() {
-        super(Phase.PRE_PROTOCOL);
-        addBefore(NMROperationInInterceptor.class.getName());
-    }
-
-    public void handleMessage(NMRMessage message) throws Fault {
-        ExchangeImpl exchange = new ExchangeImpl(Pattern.InOut);
-
-        if (index == 1) {
-            exchange.setOperation(new QName("http://apache.org/hello_world/nmr", "greetMe"));
-            index++;
-        } else if (index == 2) {
-            exchange.setOperation(new QName("http://apache.org/hello_world/nmr", "sayHi"));
-            index++;
-        } else if (index == 3) {
-            exchange.setOperation(new QName("http://apache.org/hello_world/nmr", "pingMe"));
-            index++;
-        }
-        message.put(Exchange.class, exchange);
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingFactoryTest.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingFactoryTest.java
deleted file mode 100644
index 7000406..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/NMRBindingFactoryTest.java
+++ /dev/null
@@ -1,56 +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.cxf.binding.nmr;
-
-
-import org.apache.cxf.binding.Binding;
-import org.apache.cxf.interceptor.StaxOutInterceptor;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRFaultOutInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMROperationInInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRWrapperInInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMRWrapperOutInterceptor;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class NMRBindingFactoryTest extends Assert {
-
-    @Test
-    public void testCreateBinding() {
-        
-        NMRBindingInfo info = new NMRBindingInfo(new ServiceInfo(), "id");
-        Binding binding = new NMRBindingFactory().createBinding(info);
-        assertEquals(3, binding.getInInterceptors().size());
-        //assertEquals(?, binding.getInFaultInterceptors().size());
-        assertEquals(2, binding.getOutInterceptors().size());
-        assertEquals(2, binding.getOutFaultInterceptors().size());
-        assertEquals(NMROperationInInterceptor.class.getName(), 
-                        binding.getInInterceptors().get(1).getClass().getName());
-        assertEquals(NMRWrapperInInterceptor.class.getName(), 
-                        binding.getInInterceptors().get(2).getClass().getName());
-        assertEquals(StaxOutInterceptor.class.getName(), 
-                        binding.getOutInterceptors().get(0).getClass().getName());
-        assertEquals(NMRWrapperOutInterceptor.class.getName(), 
-                        binding.getOutInterceptors().get(1).getClass().getName());
-        assertEquals(StaxOutInterceptor.class.getName(), 
-                        binding.getOutFaultInterceptors().get(0).getClass().getName());
-        assertEquals(NMRFaultOutInterceptor.class.getName(), 
-                        binding.getOutFaultInterceptors().get(1).getClass().getName());
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/NMRClientServerTest.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/NMRClientServerTest.java
deleted file mode 100644
index 194e2a9..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/NMRClientServerTest.java
+++ /dev/null
@@ -1,81 +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.cxf.binding.nmr;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.configuration.spring.ConfigurerImpl;
-import org.apache.cxf.test.TestApplicationContext;
-import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
-import org.apache.hello_world.nmr.Greeter;
-import org.apache.hello_world.nmr.HelloWorldService;
-import org.apache.hello_world.nmr.PingMeFault;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMROperationInInterceptorTest;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class NMRClientServerTest extends AbstractClientServerTestBase {
-    private final QName serviceName = new QName(
-            "http://apache.org/hello_world/nmr",
-                      "HelloWorldService");
-    private static final String S1 = 
-        NMROperationInInterceptorTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
-    private static final String S2 = 
-        NMROperationInInterceptorTest.class.getClassLoader().getResource("cxf-binding-nmr.xml").toString();
-    
-    @BeforeClass
-    public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class, true));
-    }
-    
-
-    @Test
-    public void testNMRBinding() throws Exception {
-        URL wsdl = getClass().getClassLoader().getResource("./hello_world_nmr.wsdl");
-        assertNotNull(wsdl);
-
-        TestApplicationContext ctx = new TestApplicationContext(new String[] {
-                S1, S2 });
-        ConfigurerImpl cfg = new ConfigurerImpl(ctx);
-        Bus bus = (Bus) ctx.getBean(Bus.DEFAULT_BUS_ID);
-        bus.setExtension(cfg, Configurer.class);
-        
-        HelloWorldService ss = new HelloWorldService(wsdl, serviceName);
-        QName portName = new QName("http://apache.org/hello_world/nmr", "SoapPort"); 
-        ss.addPort(portName, NMRConstants.NS_NMR_BINDING, "local://nmrendpoint");
-        
-        Greeter port = ss.getPort(portName, Greeter.class);
-                
-        String rep = port.greetMe("ffang");
-        assertEquals(rep, "Hello ffang");
-        rep = port.sayHi();
-        assertEquals(rep, "Bonjour");
-        try {
-            port.pingMe();
-            fail();
-        } catch (PingMeFault ex) {
-            assertEquals(ex.getFaultInfo().getMajor(), (short)2);
-            assertEquals(ex.getFaultInfo().getMinor(), (short)1);
-        }
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/Server.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/Server.java
deleted file mode 100644
index 3260faf..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/Server.java
+++ /dev/null
@@ -1,66 +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.cxf.binding.nmr;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.configuration.spring.ConfigurerImpl;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.test.TestApplicationContext;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.apache.servicemix.cxf.binding.nmr.interceptors.NMROperationInInterceptorTest;
-
-public class Server extends AbstractBusTestServerBase {
-    private static final String S1 = 
-        NMROperationInInterceptorTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
-    private static final String S2 = 
-        NMROperationInInterceptorTest.class.getClassLoader().getResource("cxf-binding-nmr.xml").toString();
-
-    protected void run() {
-        TestApplicationContext ctx = new TestApplicationContext(new String[] {
-                S1, S2 });
-        ConfigurerImpl cfg = new ConfigurerImpl(ctx);
-        Bus bus = (Bus) ctx.getBean(Bus.DEFAULT_BUS_ID);
-        bus.setExtension(cfg, Configurer.class);
-        
-        
-        Object implementor = new GreeterImpl();
-        String address = "local://nmrendpoint";
-        //EndpointImpl e = (EndpointImpl)Endpoint.publish(address, implementor);
-        EndpointImpl e = new EndpointImpl(bus, implementor, NMRConstants.NS_NMR_BINDING);
-        e.publish(address);
-        e.getServer().getEndpoint().getInInterceptors().add(new LoggingInInterceptor());
-        e.getServer().getEndpoint().getInInterceptors().add(new HackOperationInterceptor());
-        e.getServer().getEndpoint().getOutInterceptors().add(new LoggingOutInterceptor());
-    }
-
-    public static void main(String args[]) {
-        try {
-            Server s = new Server();
-            s.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            System.exit(-1);
-        } finally {
-            System.out.println("done!");
-        }
-    }
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultOutInterceptorTest.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultOutInterceptorTest.java
deleted file mode 100644
index b9a80c6..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMRFaultOutInterceptorTest.java
+++ /dev/null
@@ -1,106 +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.cxf.binding.nmr.interceptors;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.w3c.dom.Document;
-
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptor;
-import org.apache.servicemix.cxf.binding.nmr.NMRMessage;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class NMRFaultOutInterceptorTest extends Assert {
-    
-    @Test
-    public void testPhase() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMRFaultOutInterceptor();
-        assertEquals(Phase.MARSHAL, interceptor.getPhase());
-    }
-    
-    @Test
-    public void testNoWriter() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMRFaultOutInterceptor();
-        try {
-            NMRMessage msg = new NMRMessage(new MessageImpl());
-            interceptor.handleMessage(msg);
-            fail("Should have thrown an exception");
-        } catch (IllegalStateException e) {
-            // ok
-        }
-    }
-
-    @Test
-    public void testNoFault() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMRFaultOutInterceptor();
-        try {
-            NMRMessage msg = new NMRMessage(new MessageImpl());
-            msg.setContent(XMLStreamWriter.class, 
-                    XMLOutputFactory.newInstance().createXMLStreamWriter(new ByteArrayOutputStream()));
-            interceptor.handleMessage(msg);
-            fail("Should have thrown an exception");
-        } catch (IllegalStateException e) {
-            // ok
-        }
-    }
-
-    @Test
-    public void testEmptyFault() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMRFaultOutInterceptor();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(baos); 
-        NMRMessage msg = new NMRMessage(new MessageImpl());
-        msg.setContent(XMLStreamWriter.class, writer);
-        msg.setContent(Exception.class, new Exception("My fault"));
-        interceptor.handleMessage(msg);
-        writer.close();
-        Document doc = DOMUtils.readXml(new ByteArrayInputStream(baos.toByteArray()));
-        assertEquals("fault", doc.getDocumentElement().getFirstChild().getNodeName());
-    }
-
-    @Test
-    public void testDetailedFault() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMRFaultOutInterceptor();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(baos); 
-        NMRMessage msg = new NMRMessage(new MessageImpl());
-        Fault f = new Fault(new Message("FAULT", (ResourceBundle) null));
-        f.getOrCreateDetail();
-        f.getDetail().appendChild(f.getDetail().getOwnerDocument().createElementNS("urn:test", "myDetails"));
-        msg.setContent(XMLStreamWriter.class, writer);
-        msg.setContent(Exception.class, f);
-        interceptor.handleMessage(msg);
-        writer.close();
-        Document doc = DOMUtils.readXml(new ByteArrayInputStream(baos.toByteArray()));
-        assertEquals("urn:test", doc.getDocumentElement().getFirstChild().getNamespaceURI());
-        assertEquals("myDetails", doc.getDocumentElement().getFirstChild().getNodeName());
-    }
-
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMROperationInInterceptorTest.java b/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMROperationInInterceptorTest.java
deleted file mode 100644
index 76d14ef..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/java/org/apache/servicemix/cxf/binding/nmr/interceptors/NMROperationInInterceptorTest.java
+++ /dev/null
@@ -1,98 +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.cxf.binding.nmr.interceptors;
-
-
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.configuration.spring.ConfigurerImpl;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptor;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.test.TestApplicationContext;
-import org.apache.servicemix.cxf.binding.nmr.NMRBindingInfo;
-import org.apache.servicemix.cxf.binding.nmr.NMRConstants;
-import org.apache.servicemix.cxf.binding.nmr.NMRMessage;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.easymock.classextension.EasyMock;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class NMROperationInInterceptorTest extends Assert {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMROperationInInterceptor.class);
-    private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
-    
-    private static final String S1 = 
-        NMROperationInInterceptorTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
-    private static final String S2 = 
-        NMROperationInInterceptorTest.class.getResource("/META-INF/cxf/binding/nmr/cxf-binding-nmr.xml").toString();
-    
-    @Test
-    public void testPhase() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMROperationInInterceptor();
-        assertEquals(Phase.PRE_PROTOCOL, interceptor.getPhase());
-    }
-    
-    @Test
-    public void testUnknownOperation() throws Exception {
-        PhaseInterceptor<NMRMessage> interceptor = new NMROperationInInterceptor();
-        NMRMessage msg = new NMRMessage(new MessageImpl());
-        Exchange me = EasyMock.createMock(Exchange.class);
-        EasyMock.expect(me.getOperation()).andReturn(new QName("urn:test", "SayHi")).times(4);
-        EasyMock.replay(me);
-        msg.put(Exchange.class, me);
-
-        TestApplicationContext ctx = new TestApplicationContext(new String[] {
-                S1, S2 });
-        ConfigurerImpl cfg = new ConfigurerImpl(ctx);
-        Bus bus = (Bus) ctx.getBean(Bus.DEFAULT_BUS_ID);
-        bus.setExtension(cfg, Configurer.class);
-        assertNotNull(bus.getExtension(BindingFactoryManager.class).getBindingFactory(NMRConstants.NS_NMR_BINDING));
-        
-        EndpointInfo endpointInfo = new EndpointInfo();
-        endpointInfo.setBinding(new NMRBindingInfo(null, NMRConstants.NS_NMR_BINDING));
-        Endpoint ep = new EndpointImpl(null, null, endpointInfo);
-        msg.setExchange(new ExchangeImpl());
-        msg.getExchange().put(Endpoint.class, ep);
-        try { 
-            interceptor.handleMessage(msg);
-            fail("shouldn't found SayHi operation");
-        } catch (Fault fault) {
-            assertEquals(fault.getMessage(), new Message("UNKNOWN_OPERATION", BUNDLE, 
-                                                 msg.getNmrExchange().getOperation().toString()).toString());
-        }
-    }
-    
-    
-}
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/resources/cxf-binding-nmr.xml b/trunk/cxf/cxf-binding-nmr/src/test/resources/cxf-binding-nmr.xml
deleted file mode 100644
index 462e5d8..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/resources/cxf-binding-nmr.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"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean class="org.apache.servicemix.cxf.binding.nmr.NMRBindingFactory"
-          id="org.apache.servicemix.cxf.binding.nmr.NMRBindingFactory"
-          lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="activationNamespaces">
-            <set>
-                <value>http://cxf.apache.org/bindings/nmr</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </set>
-        </property>
-    </bean>
-    <bean class="org.apache.cxf.transport.local.LocalTransportFactory"
-              id="org.apache.cxf.transport.local.LocalTransportFactory"
-              lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/trunk/cxf/cxf-binding-nmr/src/test/resources/hello_world_nmr.wsdl b/trunk/cxf/cxf-binding-nmr/src/test/resources/hello_world_nmr.wsdl
deleted file mode 100644
index 3fe5711..0000000
--- a/trunk/cxf/cxf-binding-nmr/src/test/resources/hello_world_nmr.wsdl
+++ /dev/null
@@ -1,165 +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 name="HelloWorld" targetNamespace="http://apache.org/hello_world/nmr" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://apache.org/hello_world/nmr"
-    xmlns:x1="http://apache.org/hello_world/types/nmr"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xformat="http://cxf.apache.org/bindings/xformat"
-    xmlns:nmrFormat="http://cxf.apache.org/bindings/nmr">
-
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world/types/nmr" 
-            xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://apache.org/hello_world/types/nmr"
-            elementFormDefault="qualified">
-        <simpleType name="MyStringType">
-        <restriction base="string">
-            <maxLength value="30" />
-        </restriction>
-        </simpleType>
-
-            <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="tns:MyStringType"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <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="pingMe">
-                <complexType/>
-            </element>
-            <element name="pingMeResponse">
-                <complexType/>
-            </element>
-            <element name="faultDetail">
-                <complexType>
-                    <sequence>
-                        <element name="minor" type="short"/>
-                        <element name="major" type="short"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiRequest">
-        <wsdl:part element="x1:sayHi" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="x1:sayHiResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeOneWayRequest">
-        <wsdl:part element="x1:greetMeOneWay" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeRequest">
-        <wsdl:part name="in" element="x1:pingMe"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeResponse">
-        <wsdl:part name="out" element="x1:pingMeResponse"/>
-    </wsdl:message>        
-    <wsdl:message name="pingMeFault">
-        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
-        </wsdl:operation> 
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <nmrFormat:binding />
-                                                                                                                                                           
-                <wsdl:operation name="sayHi">
-                        <wsdl:input name="sayHiRequest" />
-                        <wsdl:output name="sayHiResponse" />
-                </wsdl:operation>
-                                                                                                                                                             
-                <wsdl:operation name="greetMe">
-                        <wsdl:input name="greetMeRequest" />
-                        <wsdl:output name="greetMeResponse" />
-                </wsdl:operation>
-                                                                                                                                                             
-                <wsdl:operation name="greetMeOneWay">
-                        <wsdl:input name="greetMeOneWayRequest" />
-                </wsdl:operation>
-                                                                                                                                                             
-                <wsdl:operation name="pingMe">
-                        <wsdl:input />
-                        <wsdl:output />
-                        <wsdl:fault name="pingMeFault" />
-                </wsdl:operation>
-
-        
-    </wsdl:binding>
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="local://nmrendpoint"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
-
diff --git a/trunk/cxf/cxf-transport-nmr/pom.xml b/trunk/cxf/cxf-transport-nmr/pom.xml
deleted file mode 100644
index a6cf868..0000000
--- a/trunk/cxf/cxf-transport-nmr/pom.xml
+++ /dev/null
@@ -1,246 +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/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.cxf</groupId>
-        <artifactId>cxf</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: CXF Support :: Transport For NMR</name>
-    <description>Apache CXF Transport integration to NMR</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- Bundle generation -->
-            <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>
-                            javax.xml.bind*;version="[0.0,3)",
-                            javax.activation;version="[0.0,2)",
-                            javax.annotation;version="[0.0,2)",
-                            javax.jws*;version="[0.0,3)",
-                            *
-                        </Import-Package>
-                        <!-- Needed for jaxb annotations classes -->
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                        <Export-Package>
-                            ${project.artifactId}*,
-                            org.apache.cxf.transports.nmr,
-                            '=META-INF.cxf.transport.nmr'
-                        </Export-Package>
-                        <Private-Package />
-                        <_failok>true</_failok>
-                        <Spring-Context>*;publish-context:=false</Spring-Context>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <!-- generate dependencies versions -->
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>depends-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-depends-file</id>
-                        <goals>
-                            <goal>generate-depends-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </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>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-xjc-plugin</artifactId>
-                <version>${cxf.xjc-utils.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <xsdOptions>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/nmr.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/nmr.xjb</bindingFile>
-                                    <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
-
-                            </xsdOptions>
-                        </configuration>
-                        <goals>
-                            <goal>xsdtojava</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common-utilities</artifactId>
-                        <version>${cxf.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <!-- exclude generated class from Cobertura reports -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <configuration>
-                    <instrumentation>
-                        <excludes>
-                            <exclude>org/apache/servicemix/cxf/transport/nmr/ObjectFactory.class</exclude>
-                            <exclude>org/apache/servicemix/cxf/transport/nmr/package-info.class</exclude>
-                            <exclude>org/apache/servicemix/cxf/transport/nmr/AddressType.class</exclude>
-                        </excludes>
-                    </instrumentation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>ibmjdk</id>
-            <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>IBM Corporation</value>
-                </property>
-            </activation>
-            <!-- Add the Sun jaxp-ri as a dependency when using the ibm jdk, so that 
-                cxf's dependency on the Sun saaj can work with the ibm jdk. -->
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.xml.parsers</groupId>
-                    <artifactId>jaxp-ri</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/*Test*</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/*$*</exclude>
-                            </excludes>
-                            <forkMode>${surefire.fork.mode}</forkMode>
-                            <systemProperties>
-                                <property>
-                                    <name>derby.system.home</name>
-                                    <value>${basedir}/target/derby</value>
-                                </property>
-                                <!-- With Maven 2.0.7, it's possible that jaxp-ri will be placed 
-                                    in front of woodstox on the classpath. If this happens, cxf will not use 
-                                    woodstox, causing test failures (e.g., CxfBcProviderConsumerMtomTest). So, 
-                                    set these properties to ensure woodstox is used. Maven 2.0.9 doesn't require 
-                                    this work-around since it consistently places jaxp-ri at the end of the dependencies. -->
-                                <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>
-                        </configuration>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/build-resources/catalog.cat b/trunk/cxf/cxf-transport-nmr/src/main/build-resources/catalog.cat
deleted file mode 100644
index f7f735b..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/build-resources/catalog.cat
+++ /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.
---
-
-SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" "wsdl.xsd"
-SYSTEM "http://schemas.xmlsoap.org/wsdl/" "wsdl.xsd"
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/build-resources/wsdl.xsd b/trunk/cxf/cxf-transport-nmr/src/main/build-resources/wsdl.xsd
deleted file mode 100644
index 67dfd67..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/build-resources/wsdl.xsd
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
-           elementFormDefault="qualified" >
-   
-  <xs:complexType mixed="true" name="tDocumentation" >
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="tDocumented" >
-    <xs:annotation>
-      <xs:documentation>
-      This type is extended by  component types to allow them to be documented
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-     
-  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow attributes from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:anyAttribute namespace="##other" processContents="lax" />    
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tExtensibleDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow elements from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="definitions" type="wsdl:tDefinitions" >
-    <xs:key name="message" >
-      <xs:selector xpath="wsdl:message" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="portType" >
-      <xs:selector xpath="wsdl:portType" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="binding" >
-      <xs:selector xpath="wsdl:binding" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="service" >
-      <xs:selector xpath="wsdl:service" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="import" >
-      <xs:selector xpath="wsdl:import" />
-      <xs:field xpath="@namespace" />
-    </xs:key>
-  </xs:element>
-
-  <xs:group name="anyTopLevelOptionalElement" >
-    <xs:annotation>
-      <xs:documentation>
-      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element name="import" type="wsdl:tImport" />
-      <xs:element name="types" type="wsdl:tTypes" />                     
-      <xs:element name="message"  type="wsdl:tMessage" >
-        <xs:unique name="part" >
-          <xs:selector xpath="wsdl:part" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-      </xs:element>
-      <xs:element name="portType" type="wsdl:tPortType" />
-      <xs:element name="binding"  type="wsdl:tBinding" />
-      <xs:element name="service"  type="wsdl:tService" >
-        <xs:unique name="port" >
-          <xs:selector xpath="wsdl:port" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-      </xs:element>
-    </xs:choice>
-  </xs:group>
-
-  <xs:complexType name="tDefinitions" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tImport" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tTypes" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" />
-    </xs:complexContent>   
-  </xs:complexType>
-     
-  <xs:complexType name="tMessage" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPart" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="element" type="xs:QName" use="optional" />
-        <xs:attribute name="type" type="xs:QName" use="optional" />    
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPortType" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-   
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:choice>
-            <xs:group ref="wsdl:request-response-or-one-way-operation" />
-            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-    
-  <xs:group name="request-response-or-one-way-operation" >
-    <xs:sequence>
-      <xs:element name="input" type="wsdl:tParam" />
-      <xs:sequence minOccurs='0' >
-        <xs:element name="output" type="wsdl:tParam" />
-        <xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:group name="solicit-response-or-notification-operation" >
-    <xs:sequence>
-      <xs:element name="output" type="wsdl:tParam" />
-      <xs:sequence minOccurs='0' >
-        <xs:element name="input" type="wsdl:tParam" />
-        <xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-        
-  <xs:complexType name="tParam" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName"  use="required" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="type" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-    
-  <xs:complexType name="tBindingOperationMessage" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="tBindingOperationFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tBindingOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tService" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tPort" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="binding" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="required" type="xs:boolean" />
-  <xs:complexType name="tExtensibilityElement" abstract="true" >
-    <xs:attribute ref="wsdl:required" use="optional" />
-  </xs:complexType>
-
-</xs:schema>
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduit.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduit.java
deleted file mode 100644
index 1162d8e..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduit.java
+++ /dev/null
@@ -1,73 +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.cxf.transport.nmr;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.AbstractConduit;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.servicemix.nmr.api.NMR;
-
-
-public class NMRConduit extends AbstractConduit {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRConduit.class);
-
-    private NMR nmr;
-    private Bus bus;
-           
-    public NMRConduit(EndpointReferenceType target, NMR nmr) {
-        this(null, target, nmr);
-    }
-    
-    public NMRConduit(Bus bus, EndpointReferenceType target, NMR nmr) {
-        super(target);
-        this.nmr = nmr;
-        this.bus = bus;
-    }
-
-    public Bus getBus() {
-        return bus;
-    }
-
-    public NMR getNmr() {
-        return nmr;
-    }
-
-    protected Logger getLogger() {
-        return LOG;
-    }
-    
-    public void prepare(Message message) throws IOException {
-        getLogger().log(Level.FINE, "JBIConduit send message");
-        NMRTransportFactory.removeUnusedInterceptprs(message);    
-        message.setContent(OutputStream.class,
-                           new NMRConduitOutputStream(message, nmr, target, this));
-    }    
-    
-    
-
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
deleted file mode 100644
index 6ce4874..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
+++ /dev/null
@@ -1,219 +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.cxf.transport.nmr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.activation.DataHandler;
-import javax.jws.WebService;
-import javax.security.auth.Subject;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.cxf.attachment.AttachmentImpl;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.io.CachedOutputStream;
-import org.apache.cxf.message.Attachment;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.Reference;
-import org.apache.servicemix.nmr.api.Status;
-
-public class NMRConduitOutputStream extends CachedOutputStream {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRConduitOutputStream.class);
-
-    private Message message;
-    private boolean isOneWay;
-    private Channel channel;
-    private NMRConduit conduit;
-    private EndpointReferenceType target;
-
-    public NMRConduitOutputStream(Message m, NMR nmr, EndpointReferenceType target,
-                                  NMRConduit conduit) {
-        message = m;
-        this.channel = nmr.createChannel();
-        this.conduit = conduit;
-        this.target = target;
-        
-    }
-
-    @Override
-    protected void doFlush() throws IOException {
-
-    }
-
-    @Override
-    protected void doClose() throws IOException {
-        isOneWay = message.getExchange().isOneWay();
-        commitOutputMessage();
-        if (target != null) {
-            target.getClass();
-        }
-        channel.close();
-    }
-
-    private void commitOutputMessage() throws IOException {
-        try {
-            Member member = (Member) message.get(Method.class.getName());
-            Class<?> clz = member.getDeclaringClass();
-            Exchange exchange = message.getExchange();
-            BindingOperationInfo bop = exchange.get(BindingOperationInfo.class);
-
-            LOG.info(new org.apache.cxf.common.i18n.Message("INVOKE.SERVICE", LOG).toString() + clz);
-
-            WebService ws = clz.getAnnotation(WebService.class);
-            assert ws != null;
-            QName interfaceName = new QName(ws.targetNamespace(), ws.name());
-            QName serviceName;
-            if (target != null) {
-                serviceName = EndpointReferenceUtils.getServiceName(target, conduit.getBus());
-            } else {
-                serviceName = message.getExchange().get(org.apache.cxf.service.Service.class).getName();
-            }
-          
-            LOG.info(new org.apache.cxf.common.i18n.Message("CREATE.MESSAGE.EXCHANGE", LOG).toString() + serviceName);
-            org.apache.servicemix.nmr.api.Exchange xchng;
-            if (isOneWay) {
-                xchng = channel.createExchange(Pattern.InOnly);
-            } else if (bop.getOutput() == null) {
-                xchng = channel.createExchange(Pattern.RobustInOnly);
-            } else {
-                xchng = channel.createExchange(Pattern.InOut);
-            }
-
-            org.apache.servicemix.nmr.api.Message inMsg = xchng.getIn();
-            LOG.info(new org.apache.cxf.common.i18n.Message("EXCHANGE.ENDPOINT", LOG).toString() + serviceName);
-            LOG.info("setup message contents on " + inMsg);
-            inMsg.setBody(getMessageContent(message));
-            //copy attachments
-            if (message != null && message.getAttachments() != null) {
-                for (Attachment att : message.getAttachments()) {
-                    inMsg.addAttachment(att.getId(), att
-                            .getDataHandler());
-                }
-            }
-            
-            //copy properties
-            for (Map.Entry<String, Object> ent : message.entrySet()) {
-                //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 (ent.getValue() instanceof Serializable
-                        && !(ent.getValue() instanceof Map)
-                        && !(ent.getValue() instanceof Collection)) {
-                    inMsg.setHeader(ent.getKey(), ent.getValue());
-                }
-            }
-            
-            //copy securitySubject
-            inMsg.setSecuritySubject((Subject) message.get(NMRTransportFactory.NMR_SECURITY_SUBJECT));
-            
-            LOG.info("service for exchange " + serviceName);
-
-            Map<String,Object> refProps = new HashMap<String,Object>();
-            if (interfaceName != null) {
-                refProps.put(Endpoint.INTERFACE_NAME, interfaceName.toString());
-            }
-            if (serviceName != null) {
-                refProps.put(Endpoint.SERVICE_NAME, serviceName.toString());
-            }
-            Reference ref = channel.getNMR().getEndpointRegistry().lookup(refProps);
-            xchng.setTarget(ref);
-            xchng.setOperation(bop.getName());
-            LOG.info("sending message");
-            if (!isOneWay) {
-                channel.sendSync(xchng);
-                Source content = null;
-                org.apache.servicemix.nmr.api.Message nm = null;
-                if (xchng.getFault(false) != null) {
-                    content = xchng.getFault().getBody(Source.class);
-                    nm = xchng.getFault();
-                } else {
-                    content = xchng.getOut().getBody(Source.class);
-                    nm = xchng.getOut();
-                }
-                Message inMessage = new MessageImpl();
-                message.getExchange().setInMessage(inMessage);
-                InputStream ins = NMRMessageHelper.convertMessageToInputStream(content);
-                if (ins == null) {
-                    throw new IOException(new org.apache.cxf.common.i18n.Message("UNABLE.RETRIEVE.MESSAGE", LOG).toString());
-                }
-                inMessage.setContent(InputStream.class, ins);
-                //copy attachments
-                Collection<Attachment> cxfAttachmentList = new ArrayList<Attachment>();
-                for (Map.Entry<String, Object> ent : nm.getAttachments().entrySet()) {
-                    cxfAttachmentList.add(new AttachmentImpl(ent.getKey(), (DataHandler) ent.getValue()));
-                }
-                inMessage.setAttachments(cxfAttachmentList);
-                
-                //copy properties
-                for (Map.Entry<String, Object> ent : nm.getHeaders().entrySet()) {
-                    if (!ent.getKey().equals(Message.REQUESTOR_ROLE)) {
-                        inMessage.put(ent.getKey(), ent.getValue());
-                    }
-                }
-                
-                //copy securitySubject
-                inMessage.put(NMRTransportFactory.NMR_SECURITY_SUBJECT, nm.getSecuritySubject());
-                
-                conduit.getMessageObserver().onMessage(inMessage);
-
-                xchng.setStatus(Status.Done);
-                channel.send(xchng);
-            } else {
-                channel.sendSync(xchng);
-            }
-        } catch (IOException e) {
-            throw e;
-        } catch (Exception e) {
-            e.printStackTrace();
-            new IOException(e.toString());
-        }
-    }
-
-    private Source getMessageContent(Message message2) throws IOException {
-        return new StreamSource(this.getInputStream());
-        
-    }
-
-    @Override
-    protected void onWrite() throws IOException {
-
-    }
-
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
deleted file mode 100644
index 9801ae1..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
+++ /dev/null
@@ -1,196 +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.cxf.transport.nmr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.cxf.attachment.AttachmentImpl;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.message.Attachment;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.AbstractConduit;
-import org.apache.cxf.transport.AbstractDestination;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
-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.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.ServiceMixException;
-import org.apache.servicemix.nmr.api.Status;
-
-public class NMRDestination extends AbstractDestination implements Endpoint {
-    
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRDestination.class);
-    private NMR nmr;
-    private Channel channel;
-    private Map<String, Object> properties;
-
-    public NMRDestination(EndpointInfo info, NMR nmr) {
-        super(getTargetReference(info, null), info);
-        this.nmr = nmr;
-        this.properties = new HashMap<String, Object>();
-        String address = info.getAddress();
-        if (address != null && address.startsWith("nmr:")) {
-            this.properties.put(Endpoint.NAME, address.substring(4, info.getAddress().length()));
-        } else {
-            this.properties.put(Endpoint.NAME, info.getName().toString());
-        }
-        
-        this.properties.put(Endpoint.SERVICE_NAME, info.getService().getName().toString());
-        this.properties.put(Endpoint.INTERFACE_NAME, info.getInterface().getName().toString());
-    }
-
-    public void setChannel(Channel dc) {
-        this.channel = dc;
-    }
-    
-    public Channel getChannel() {
-        return this.channel;
-    }
-    
-    protected Logger getLogger() {
-        return LOG;
-    }
-    
-    /**
-     * @param inMessage the incoming message
-     * @return the inbuilt backchannel
-     */
-    protected Conduit getInbuiltBackChannel(Message inMessage) {
-        return new BackChannelConduit(EndpointReferenceUtils.getAnonymousEndpointReference(),
-                                      inMessage);
-    }
-    
-    public void shutdown() {
-    }
-
-    public void deactivate() {
-        nmr.getEndpointRegistry().unregister(this, properties);
-    }
-
-    public void activate()  {
-        nmr.getEndpointRegistry().register(this, properties);
-    }
-
-    public void process(Exchange exchange) {
-        if (exchange == null || exchange.getStatus() != Status.Active) {
-            return;
-        }
-        if (exchange.getPattern() == Pattern.InOnly || exchange.getPattern() == Pattern.RobustInOnly) {
-            exchange.setStatus(Status.Done);
-            getChannel().send(exchange);
-        }
-        QName opName = exchange.getOperation();
-        getLogger().fine("dispatch method: " + opName);
-
-        org.apache.servicemix.nmr.api.Message nm = exchange.getIn();
-        try {
-
-            MessageImpl inMessage = new MessageImpl();
-            inMessage.put(Exchange.class, exchange);
-            
-            final InputStream in = NMRMessageHelper.convertMessageToInputStream(nm.getBody(Source.class));
-            inMessage.setContent(InputStream.class, in);
-            //copy attachments
-            Collection<Attachment> cxfAttachmentList = new ArrayList<Attachment>();
-            for (Map.Entry<String, Object> ent : nm.getAttachments().entrySet()) {
-                cxfAttachmentList.add(new AttachmentImpl(ent.getKey(), (DataHandler) ent.getValue()));
-            }
-            inMessage.setAttachments(cxfAttachmentList);
-            
-            //copy properties
-            for (Map.Entry<String, Object> ent : nm.getHeaders().entrySet()) {
-                if (!ent.getKey().equals(Message.REQUESTOR_ROLE)) {
-                    inMessage.put(ent.getKey(), ent.getValue());
-                }
-            }
-            
-            //copy securitySubject
-            inMessage.put(NMRTransportFactory.NMR_SECURITY_SUBJECT, nm.getSecuritySubject());
-            
-            inMessage.setDestination(this);
-            getMessageObserver().onMessage(inMessage);
-
-        } catch (Exception ex) {
-            getLogger().log(Level.SEVERE, new org.apache.cxf.common.i18n.Message("ERROR.PREPARE.MESSAGE", getLogger()).toString(), ex);
-            throw new ServiceMixException(ex);
-        }
-    }
-
-
-    protected class BackChannelConduit extends AbstractConduit {
-        
-        protected Message inMessage;
-        protected NMRDestination nmrDestination;
-                
-        BackChannelConduit(EndpointReferenceType ref, Message message) {
-            super(ref);
-            inMessage = message;
-        }
-        
-        /**
-         * Register a message observer for incoming messages.
-         * 
-         * @param observer the observer to notify on receipt of incoming
-         */
-        public void setMessageObserver(MessageObserver observer) {
-            // shouldn't be called for a back channel conduit
-        }
-
-        /**
-         * Send an outbound message, assumed to contain all the name-value
-         * mappings of the corresponding input message (if any). 
-         * 
-         * @param message the message to be sent.
-         */
-        public void prepare(Message message) throws IOException {
-            // setup the message to be send back
-            Channel dc = channel;
-            message.put(Exchange.class, inMessage.get(Exchange.class));
-            NMRTransportFactory.removeUnusedInterceptprs(message);    
-            message.setContent(OutputStream.class, new NMRDestinationOutputStream(inMessage, message, dc));
-            
-        }        
-
-        protected Logger getLogger() {
-            return LOG;
-        }
-        
-    }
-    
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
deleted file mode 100644
index bf34832..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
+++ /dev/null
@@ -1,128 +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.cxf.transport.nmr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.security.auth.Subject;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.dom.DOMSource;
-
-import org.w3c.dom.Document;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.io.CachedOutputStream;
-import org.apache.cxf.message.Attachment;
-import org.apache.cxf.message.Message;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Exchange;
-
-public class NMRDestinationOutputStream extends CachedOutputStream {
-
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRDestinationOutputStream.class);
-    private Message inMessage;
-    private Message outMessage;
-    private Channel channel;
-    
-    public NMRDestinationOutputStream(Message m,
-                               Message outM,
-                               Channel dc) {
-        super();
-        inMessage = m;
-        outMessage = outM;
-        channel = dc;
-    }
-    
-    @Override
-    protected void doFlush() throws IOException {
-        // so far do nothing
-    }
-
-    @Override
-    protected void doClose() throws IOException {
-        commitOutputMessage();
-    }
-
-    @Override
-    protected void onWrite() throws IOException {
-        // so far do nothing
-    }
-
-    private void commitOutputMessage() throws IOException {
-        try { 
-            if (inMessage.getExchange().isOneWay()) {
-                return;
-            } else {
-                InputStream bais = getInputStream();
-                LOG.finest(new org.apache.cxf.common.i18n.Message("BUILDING.DOCUMENT", LOG).toString());
-                DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-                docBuilderFactory.setNamespaceAware(true);
-                DocumentBuilder builder = docBuilderFactory.newDocumentBuilder();
-                Document doc = builder.parse(bais);
-            
-                Exchange xchng = inMessage.get(Exchange.class);
-                LOG.fine(new org.apache.cxf.common.i18n.Message("CREATE.NORMALIZED.MESSAGE", LOG).toString());
-                if (inMessage.getExchange().getOutFaultMessage() != null) {
-                    org.apache.cxf.interceptor.Fault f = (org.apache.cxf.interceptor.Fault) inMessage.getContent(Exception.class);
-                    if (f.hasDetails()) {
-                        xchng.getFault().setBody(new DOMSource(doc));
-                    } else {
-                        xchng.setError(f);
-                    }
-                } else {
-                    //copy attachments
-                    if (outMessage != null && outMessage.getAttachments() != null) {
-                        for (Attachment att : outMessage.getAttachments()) {
-                            xchng.getOut().addAttachment(att.getId(), att
-                                    .getDataHandler());
-                        }
-                    }
-                    
-                    //copy properties
-                    for (Map.Entry<String, Object> ent : outMessage.entrySet()) {
-                        //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 (ent.getValue() instanceof Serializable
-                                && !(ent.getValue() instanceof Map)
-                                && !(ent.getValue() instanceof Collection)) {
-                            xchng.getOut().setHeader(ent.getKey(), ent.getValue());
-                        }
-                    }
-
-                    //copy securitySubject
-                    xchng.getOut().setSecuritySubject((Subject) outMessage.get(NMRTransportFactory.NMR_SECURITY_SUBJECT));
-                    xchng.getOut().setBody(new DOMSource(doc));
-                }
-                LOG.fine(new org.apache.cxf.common.i18n.Message("POST.DISPATCH", LOG).toString());
-                channel.send(xchng);
-            }
-        } catch (Exception ex) { 
-            LOG.log(Level.SEVERE, new org.apache.cxf.common.i18n.Message("ERROR.SEND.MESSAGE", LOG).toString(), ex);
-        }
-    }
-    
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRMessageHelper.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRMessageHelper.java
deleted file mode 100644
index 676ebe1..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRMessageHelper.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.cxf.transport.nmr;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.Source;
-
-import org.apache.cxf.io.CachedOutputStream;
-import org.apache.cxf.staxutils.StaxUtils;
-
-
-
-public final class NMRMessageHelper {
-
-
-    private NMRMessageHelper() {
-        // complete
-    }
-
-    public static InputStream convertMessageToInputStream(Source src) throws IOException {
-        CachedOutputStream cos = new CachedOutputStream();
-        try {
-            StaxUtils.copy(src, cos);
-            return cos.getInputStream();
-        } catch (XMLStreamException e) {
-            IOException ioe = new IOException(e.getMessage());
-            ioe.initCause(e);
-            throw ioe;
-        } finally {
-            try {
-                cos.close();
-            } catch (Exception ex) {
-                //ignore
-            }
-        }
-    }
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java
deleted file mode 100644
index 7519953..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java
+++ /dev/null
@@ -1,163 +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.cxf.transport.nmr;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.AbstractTransportFactory;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.api.ServiceMixException;
-
-public class NMRTransportFactory extends AbstractTransportFactory implements ConduitInitiator,
-    DestinationFactory {
-    
-    public static final String TRANSPORT_ID = "http://cxf.servicemix.apache.org/transport/nmr";
-    public static String NMR_SECURITY_SUBJECT = "NMR_SECURITY_SUBJECT";
-    
-    private NMR nmr;
-    private Bus bus;
-    private final Map<String, NMRDestination> destinationMap =  new HashMap<String, NMRDestination>();
-
-    private Collection<String> activationNamespaces;
-
-    @Resource
-    public void setBus(Bus b) {
-        bus = b;
-    }
-    
-    public Bus getBus() {
-        return bus;
-    }
-    
-    public Set<String> getUriPrefixes() {
-        return Collections.singleton("nmr");
-    }
-
-    @Resource
-    public void setActivationNamespaces(Collection<String> ans) {
-        activationNamespaces = ans;
-    }
-
-    public NMR getNmr() {
-        return nmr;
-    }
-
-    public void setNmr(NMR nmr) {
-        this.nmr = nmr;
-    }
-
-    @PostConstruct
-    void registerWithBindingManager() {
-        if (null == bus) {
-            return;
-        }
-        ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class);
-        if (null != cim && null != activationNamespaces) {
-            for (String ns : activationNamespaces) {
-                cim.registerConduitInitiator(ns, this);
-            }
-        }
-        DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
-        if (null != dfm && null != activationNamespaces) {
-            for (String ns : activationNamespaces) {
-                dfm.registerDestinationFactory(ns, this);
-            }
-        }
-    }
-
-    
-
-    
-    public Conduit getConduit(EndpointInfo targetInfo) throws IOException {
-        return getConduit(targetInfo, null);
-    }
-
-    public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType target) throws IOException {
-        Conduit conduit = new NMRConduit(target, nmr);
-        Configurer configurer = bus.getExtension(Configurer.class);
-        if (null != configurer) {
-            configurer.configureBean(conduit);
-        }
-        return conduit;
-    }
-
-    public Destination getDestination(EndpointInfo ei) throws IOException {
-        NMRDestination destination = new NMRDestination(ei, nmr);
-        Configurer configurer = bus.getExtension(Configurer.class);
-        if (null != configurer) {
-            configurer.configureBean(destination);
-        }
-        try {
-            putDestination(ei.getService().getName().toString()
-                + ei.getInterface().getName().toString(), destination);
-        } catch (ServiceMixException e) {
-            throw new IOException(e.getMessage());
-        }
-        return destination;
-    }
-    
-    public void putDestination(String epName, NMRDestination destination) throws ServiceMixException {
-        if (destinationMap.containsKey(epName)) {
-            throw new ServiceMixException("JBIDestination for Endpoint "
-                                   + epName + " already be created");
-        } else {
-            destinationMap.put(epName, destination);
-        }
-    }
-
-    public NMRDestination getDestination(String epName) {
-        return destinationMap.get(epName);
-    }
-    
-    public void removeDestination(String epName) {
-        destinationMap.remove(epName);
-    }
-    
-    public static void removeUnusedInterceptprs(Message message) {
-        if (message.getInterceptorChain() != null) {
-            for (Interceptor interceptor : message.getInterceptorChain()) {
-                if (interceptor.getClass().getName().equals(
-                        "org.apache.cxf.interceptor.AttachmentOutInterceptor")) {
-                    message.getInterceptorChain().remove(interceptor);
-                }
-            }
-        }
-    }
-    
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/wsdl11/NMRTransportPlugin.java b/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/wsdl11/NMRTransportPlugin.java
deleted file mode 100644
index ad97246..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/wsdl11/NMRTransportPlugin.java
+++ /dev/null
@@ -1,45 +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.cxf.transport.nmr.wsdl11;
-
-import java.util.Map;
-
-import javax.wsdl.Port;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.apache.servicemix.cxf.transport.nmr.AddressType;
-import org.apache.cxf.wsdl.AbstractWSDLPlugin;
-import org.apache.servicemix.cxf.transport.nmr.NMRTransportFactory;
-
-public class NMRTransportPlugin extends AbstractWSDLPlugin {
-    
-    
-
-    public ExtensibilityElement createExtension(Map<String, Object> args) throws WSDLException {
-        AddressType jbiAddress = null;
-        jbiAddress = (AddressType)registry.createExtension(Port.class, 
-                new QName(NMRTransportFactory.TRANSPORT_ID, "address"));
-        return jbiAddress;
-    }
-
-}
-
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/resources/META-INF/cxf/transport/nmr/cxf-transport-nmr.xml b/trunk/cxf/cxf-transport-nmr/src/main/resources/META-INF/cxf/transport/nmr/cxf-transport-nmr.xml
deleted file mode 100644
index 40b53c0..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/resources/META-INF/cxf/transport/nmr/cxf-transport-nmr.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.
--->
-<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"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <bean class="org.apache.servicemix.cxf.transport.nmr.NMRTransportFactory"
-          id="org.apache.servicemix.cxf.transport.nmr.NMRTransportFactory"
-          lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="nmr">
-            <osgi:reference interface="org.apache.servicemix.nmr.api.NMR"/>
-        </property>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.servicemix.apache.org/transport/nmr</value>
-                <value>http://cxf.servicemix.apache.org/transport/nmr/configuration</value>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/resources/org/apache/servicemix/cxf/transport/nmr/Messages.properties b/trunk/cxf/cxf-transport-nmr/src/main/resources/org/apache/servicemix/cxf/transport/nmr/Messages.properties
deleted file mode 100644
index a976b16..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/resources/org/apache/servicemix/cxf/transport/nmr/Messages.properties
+++ /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.
-#
-NOT.IMPLEMENTED=not yet implemented
-INVOKE.SERVICE=invoking service\t
-CREATE.MESSAGE.EXCHANGE=create message exchange svc:\t
-EXCHANGE.ENDPOINT=exchange endpoint:\t
-NO.MESSAGE=no message yet
-UNABLE.RETRIEVE.MESSAGE=unable to retrieve message
-CONTEXT.MUST.BE=context must be of type JBIOutputStreamMessageContext
-RECEIVED.MESSAGE=received message:\t
-ACTIVE.JBI.SERVER.TRANSPORT=activating JBI server transport
-BUILDING.DOCUMENT=building document from bytes
-CREATE.NORMALIZED.MESSAGE=creating NormalizedMessage
-POST.DISPATCH=postDispatch sending out message to NWR
-ERROR.SEND.MESSAGE=error sending Out message
-DISPATCH.MESSAGE.ON.CALLBACK=dispatching message on callback:\t
-ERROR.PREPARE.MESSAGE=error preparing message
-RECEIVE.THREAD.START=JBIServerTransport message receiving thread started
-DISPATCH.TO.SU=dispatching to CXF service unit
-NO.SU.FOUND=no CXFServiceUnit found
-ERROR.DISPATCH.THREAD=error running dispatch thread
-JBI.SERVER.TRANSPORT.MESSAGE.PROCESS.THREAD.EXIT=JBIServerTransport message processing thread exiting
-CONFIG.DELIVERY.CHANNEL=configuring DeliveryChannel:\t
-CONFIG.SU.MANAGER=configuring ServiceUnitManager:\t
-JBI.TRANSPORT.FACTORY.NOT.INITIALIZED=JBITransportFactory is not properly initialized
-SU.MANAGER=CXFServiceUnitManager:\t
-DELIVERY.CHANNEL=DeliveryChannel:\t
-JBI.TRANSPORT.FACTORY.NOT.FULLY.INITIALIZED=JBITransport factory not fully initialized
-CREATE.SERVER.TRANSPORT=creating JBI server transport
-CREATE.CLIENT.TRANSPORT=creating JBI client transport
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/resources/schemas/wsdl/nmr.xjb b/trunk/cxf/cxf-transport-nmr/src/main/resources/schemas/wsdl/nmr.xjb
deleted file mode 100644
index b5feaa3..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/resources/schemas/wsdl/nmr.xjb
+++ /dev/null
@@ -1,34 +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.
--->
-<jaxb:bindings version="1.0" 
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" 
-  jaxb:extensionBindingPrefixes="xjc">
-    <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema">
-        <jaxb:schemaBindings>
-            <jaxb:package name="org.apache.cxf.wsdl"/>
-        </jaxb:schemaBindings>
-        <jaxb:globalBindings generateIsSetMethod="true"/>
-    </jaxb:bindings>
-    <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
-        <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
-    </jaxb:bindings>
-</jaxb:bindings>
diff --git a/trunk/cxf/cxf-transport-nmr/src/main/resources/schemas/wsdl/nmr.xsd b/trunk/cxf/cxf-transport-nmr/src/main/resources/schemas/wsdl/nmr.xsd
deleted file mode 100644
index 0100142..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/main/resources/schemas/wsdl/nmr.xsd
+++ /dev/null
@@ -1,46 +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.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:nmr="http://cxf.servicemix.apache.org/transport/nmr"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  targetNamespace="http://cxf.servicemix.apache.org/transport/nmr"
-  elementFormDefault="qualified"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
-  
-  <xs:import namespace="http://schemas.xmlsoap.org/wsdl/"
-      schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" />
-  
-  
-  <xs:element name="address" type="nmr:AddressType"/>
-  <xs:complexType name="AddressType">
-        <xs:complexContent>
-            <xs:extension base="wsdl:tExtensibilityElement">
-                <xs:attribute name="location" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                          nmr dummy location
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:complexContent>
-  </xs:complexType>
-  
-</xs:schema>
diff --git a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/AbstractJBITest.java b/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/AbstractJBITest.java
deleted file mode 100644
index 250f845..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/AbstractJBITest.java
+++ /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.
- */
-
-package org.apache.servicemix.cxf.transport.nmr;
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-
-import junit.framework.Assert;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.servicemix.nmr.api.NMR;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
-import org.junit.After;
-import org.junit.Before;
-
-
-public abstract class AbstractJBITest extends Assert {
-       
-    protected Bus bus;
-    protected EndpointReferenceType target;
-    protected MessageObserver observer;
-    protected Message inMessage;
-    protected IMocksControl control;
-    protected NMR nmr;
-    protected NMRTransportFactory nmrTransportFactory;
-    
-    @Before
-    public void setUp() {
-        BusFactory bf = BusFactory.newInstance();
-        bus = bf.createBus();
-        BusFactory.setDefaultBus(bus);
-        nmrTransportFactory = new NMRTransportFactory();
-        nmrTransportFactory.setBus(bus);
-        nmrTransportFactory.registerWithBindingManager();
-        control = EasyMock.createNiceControl();
-    }
-    
-    @After
-    public void tearDown() {
-        bus.shutdown(true);
-        if (System.getProperty("cxf.config.file") != null) {
-            System.clearProperty("cxf.config.file");
-        }
-        
-    }
-    
-    protected NMRConduit setupJBIConduit(boolean send, boolean decoupled) throws IOException {
-        if (decoupled) {
-            // setup the reference type
-        } else {
-            target = control.createMock(EndpointReferenceType.class);
-        }    
-        nmr = control.createMock(NMR.class);
-        nmrTransportFactory.setNmr(nmr);
-        //NMRConduit jbiConduit = new NMRConduit(bus, target, nmr);
-        NMRConduit jbiConduit = (NMRConduit) nmrTransportFactory.getConduit(null, target);
-        
-        if (send) {
-            // setMessageObserver
-            observer = new MessageObserver() {
-                public void onMessage(Message m) {                    
-                    inMessage = m;
-                }
-            };
-            jbiConduit.setMessageObserver(observer);
-        }
-        
-        return jbiConduit;        
-    }
-    
-    protected void sendoutMessage(Conduit conduit, Message message, Boolean isOneWay) throws IOException {
-        
-        Exchange exchange = new ExchangeImpl();
-        exchange.setOneWay(isOneWay);
-        message.setExchange(exchange);
-        exchange.setInMessage(message);
-        BindingOperationInfo boi = control.createMock(BindingOperationInfo.class);
-        exchange.put(BindingOperationInfo.class, boi);
-        try {
-            conduit.prepare(message);
-        } catch (IOException ex) {
-            assertFalse("NMRConduit can't perpare to send out message", false);
-            ex.printStackTrace();            
-        }            
-        OutputStream os = message.getContent(OutputStream.class);
-        assertTrue("The OutputStream should not be null ", os != null);
-        os.write("HelloWorld".getBytes());
-        os.close();            
-    }
-    
-
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/Greeter.java b/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/Greeter.java
deleted file mode 100644
index 9a6c15e..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/Greeter.java
+++ /dev/null
@@ -1,93 +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.cxf.transport.nmr;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-@WebService(targetNamespace = "http://apache.org/hello_world_soap_http", name = "Greeter")
-
-public interface Greeter {
-
-    @ResponseWrapper(localName = "testDocLitFaultResponse", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.TestDocLitFaultResponse")
-    @RequestWrapper(localName = "testDocLitFault", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.TestDocLitFault")
-    @WebMethod
-    public void testDocLitFault(
-        @WebParam(name = "faultType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        java.lang.String faultType
-    );
-
-    @ResponseWrapper(localName = "sayHiResponse", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.SayHiResponse")
-    @RequestWrapper(localName = "sayHi", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.SayHi")
-    @WebResult(name = "responseType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-    @WebMethod
-    public java.lang.String sayHi();
-
-    @ResponseWrapper(localName = "testNillableResponse", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.TestNillableResponse")
-    @RequestWrapper(localName = "testNillable", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.TestNillable")
-    @WebResult(name = "responseType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-    @WebMethod
-    public java.lang.String testNillable(
-        @WebParam(name = "NillElem", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        java.lang.String nillElem,
-        @WebParam(name = "intElem", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        int intElem
-    );
-
-    @ResponseWrapper(localName = "greetMeLaterResponse", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeLaterResponse")
-    @RequestWrapper(localName = "greetMeLater", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeLater")
-    @WebResult(name = "responseType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-    @WebMethod
-    public java.lang.String greetMeLater(
-        @WebParam(name = "requestType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        long requestType
-    );
-
-    @ResponseWrapper(localName = "greetMeSometimeResponse", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeSometimeResponse")
-    @RequestWrapper(localName = "greetMeSometime", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeSometime")
-    @WebResult(name = "responseType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-    @WebMethod
-    public java.lang.String greetMeSometime(
-        @WebParam(name = "requestType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        java.lang.String requestType
-    );
-
-    @Oneway
-    @RequestWrapper(localName = "greetMeOneWay", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeOneWay")
-    @WebMethod
-    public void greetMeOneWay(
-        @WebParam(name = "requestType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        java.lang.String requestType
-    );
-
-    @ResponseWrapper(localName = "greetMeResponse", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeResponse")
-    @RequestWrapper(localName = "greetMe", targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMe")
-    @WebResult(name = "responseType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-    @WebMethod
-    public java.lang.String greetMe(
-        @WebParam(name = "requestType", targetNamespace = "http://apache.org/hello_world_soap_http/types")
-        java.lang.String requestType
-    );
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitTest.java b/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitTest.java
deleted file mode 100644
index 1963dad..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitTest.java
+++ /dev/null
@@ -1,121 +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.cxf.transport.nmr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.logging.Logger;
-
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.model.BindingMessageInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.EndpointRegistry;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.easymock.classextension.EasyMock;
-import org.junit.Test;
-
-public class NMRConduitTest extends AbstractJBITest {
-    static final Logger LOG = LogUtils.getLogger(NMRConduitTest.class);
-
-    
-    @Test
-    public void testPrepare() throws Exception {
-        LOG.info("test prepare");
-        NMRConduit conduit = setupJBIConduit(false, false);
-        Message message = new MessageImpl();
-        try {
-            conduit.prepare(message);
-        } catch (Exception ex) {
-            ex.printStackTrace();            
-        }
-        assertNotNull(message.getContent(OutputStream.class));
-        assertTrue(message.getContent(OutputStream.class) instanceof NMRConduitOutputStream);
-    }
-    
-    @Test
-    public void testSendOut() throws Exception {
-        LOG.info("test send");
-        NMRConduit conduit = setupJBIConduit(true, false); 
-        Message message = new MessageImpl();
-        Class<org.apache.servicemix.cxf.transport.nmr.Greeter> greeterCls
-            = org.apache.servicemix.cxf.transport.nmr.Greeter.class;
-        message.put(Method.class.getName(), greeterCls.getMethod("sayHi"));
-        
-        org.apache.cxf.message.Exchange exchange = new ExchangeImpl();
-        exchange.setOneWay(false);
-        message.setExchange(exchange);
-        exchange.setInMessage(message);
-        BindingOperationInfo boi = control.createMock(BindingOperationInfo.class);
-        BindingMessageInfo bmi = control.createMock(BindingMessageInfo.class);
-        EasyMock.expect(boi.getOutput()).andReturn(bmi);
-        exchange.put(BindingOperationInfo.class, boi);
-        Channel channel = control.createMock(Channel.class);
-        EasyMock.expect(nmr.createChannel()).andReturn(channel);
-        Exchange xchg = control.createMock(Exchange.class);
-        EasyMock.expect(channel.createExchange(Pattern.InOut)).andReturn(xchg);
-        org.apache.servicemix.nmr.api.Message inMsg = control.createMock(org.apache.servicemix.nmr.api.Message.class);
-        EasyMock.expect(xchg.getIn()).andReturn(inMsg);
-        EndpointRegistry endpoints = control.createMock(EndpointRegistry.class);
-        EasyMock.expect(channel.getNMR()).andReturn(nmr);
-        EasyMock.expect(nmr.getEndpointRegistry()).andReturn(endpoints);
-        org.apache.servicemix.nmr.api.Message outMsg = control.createMock(org.apache.servicemix.nmr.api.Message.class);
-        EasyMock.expect(xchg.getOut()).andReturn(outMsg);
-        
-        Source source = new StreamSource(new ByteArrayInputStream(
-                            "<message>TestHelloWorld</message>".getBytes()));
-        EasyMock.expect(outMsg.getBody(Source.class)).andReturn(source);
-        EasyMock.expect(xchg.getOut()).andReturn(outMsg);
-        EasyMock.expect(outMsg.getAttachments()).andReturn(new HashMap<String, Object>());
-        EasyMock.expect(outMsg.getHeaders()).andReturn(new HashMap<String, Object>());
-        control.replay();
-        try {
-            conduit.prepare(message);
-        } catch (IOException ex) {
-            assertFalse("JMSConduit can't perpare to send out message", false);
-            ex.printStackTrace();            
-        }            
-        OutputStream os = message.getContent(OutputStream.class);
-        assertTrue("The OutputStream should not be null ", os != null);
-        os.write("HelloWorld".getBytes());
-        os.close();              
-        InputStream is = inMessage.getContent(InputStream.class);
-        assertNotNull(is);
-        XMLStreamReader reader = StaxUtils.createXMLStreamReader(is, null);
-        assertNotNull(reader);
-        reader.nextTag();
-         
-        String reponse = reader.getElementText();
-        assertEquals("The reponse date should be equals", reponse, "TestHelloWorld");
-    }
-}
diff --git a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationTest.java b/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationTest.java
deleted file mode 100644
index 624544c..0000000
--- a/trunk/cxf/cxf-transport-nmr/src/test/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationTest.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.cxf.transport.nmr;
-
-import java.io.ByteArrayInputStream;
-import java.util.HashMap;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.service.model.InterfaceInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.MessageObserver;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.EndpointRegistry;
-import org.apache.servicemix.nmr.api.Status;
-import org.easymock.EasyMock;
-
-
-import org.junit.Test;
-
-public class NMRDestinationTest extends AbstractJBITest {
-    static final Logger LOG = LogUtils.getLogger(NMRDestinationTest.class);
-    @Test
-    public void testDestination() throws Exception {
-        LOG.info("JBI destination test");
-    }
-    
-    @Test
-    public void testOutputStreamSubstitutionDoesntCauseExceptionInDoClose() throws Exception {
-        //Create enough of the object structure to get through the code.
-        org.apache.servicemix.nmr.api.Message normalizedMessage = control.createMock(org.apache.servicemix.nmr.api.Message.class);
-        Channel channel = control.createMock(Channel.class);
-        Exchange exchange = new ExchangeImpl();
-        exchange.setOneWay(false);
-        Message message = new MessageImpl();
-        message.setExchange(exchange);
-        
-        
-        org.apache.servicemix.nmr.api.Exchange messageExchange = control.createMock(org.apache.servicemix.nmr.api.Exchange.class);
-        EasyMock.expect(messageExchange.getOut()).andReturn(normalizedMessage).times(2);
-        message.put(org.apache.servicemix.nmr.api.Exchange.class, messageExchange);
-        channel.send(messageExchange);
-        EasyMock.replay(channel);
-        
-        NMRDestinationOutputStream jbiOS = new NMRDestinationOutputStream(message, new MessageImpl(), channel);
-        
-        //Create array of more than what is in threshold in CachedOutputStream, 
-        //though the threshold in CachedOutputStream should be made protected 
-        //perhaps so it can be referenced here in case it ever changes.
-        int targetLength = 64 * 1025;
-        StringBuffer sb = new StringBuffer();
-        sb.append("<root>");
-        while (sb.length() < targetLength) {
-            sb.append("<dummy>some xml</dummy>");
-        }
-        sb.append("</root>");
-        byte[] testBytes = sb.toString().getBytes();
-        
-        jbiOS.write(testBytes);        
-        jbiOS.doClose();
-        
-        //Verify send method was called.
-        EasyMock.verify(channel);
-    }
-    
-    
-    @Test
-    public void testNMRDestination() throws Exception {
-        EndpointInfo ei = new EndpointInfo();
-        ei.setAddress("nmr://dumy");
-        ei.setName(new QName("http://test", "endpoint"));
-        ServiceInfo si = new ServiceInfo();
-        si.setName(new QName("http://test", "service"));
-        InterfaceInfo interInfo = new InterfaceInfo(si, new QName("http://test", "interface"));
-        si.setInterface(interInfo);
-        ei.setService(si);
-        org.apache.servicemix.nmr.api.NMR nmr = control.createMock(org.apache.servicemix.nmr.api.NMR.class);
-        nmrTransportFactory.setNmr(nmr);
-        NMRDestination destination = (NMRDestination) nmrTransportFactory.getDestination(ei);
-        assertNotNull(destination);
-        String destName = ei.getService().getName().toString()
-        + ei.getInterface().getName().toString();
-        try {
-            nmrTransportFactory.putDestination(destName, destination);
-            fail();
-        } catch (Exception e) {
-            //should catch exception here since try put duplicated destination  
-        }
-        assertEquals(destination, nmrTransportFactory.getDestination(destName));
-        nmrTransportFactory.removeDestination(destName);
-        nmrTransportFactory.putDestination(destName, destination);
-        
-        org.apache.servicemix.nmr.api.Exchange xchg = control.createMock(org.apache.servicemix.nmr.api.Exchange.class);
-        
-        org.apache.servicemix.nmr.api.Message inMsg = control.createMock(org.apache.servicemix.nmr.api.Message.class);
-        EasyMock.expect(xchg.getStatus()).andReturn(Status.Active);
-        EasyMock.expect(xchg.getIn()).andReturn(inMsg);
-        EasyMock.expect(inMsg.getAttachments()).andReturn(new HashMap<String, Object>());
-        EasyMock.expect(inMsg.getHeaders()).andReturn(new HashMap<String, Object>());
-        Source source = new StreamSource(new ByteArrayInputStream(
-                            "<message>TestHelloWorld</message>".getBytes()));
-        EasyMock.expect(inMsg.getBody(Source.class)).andReturn(source);
-        EndpointRegistry endpoints = control.createMock(EndpointRegistry.class);
-        EasyMock.expect(nmr.getEndpointRegistry()).andReturn(endpoints);
-        EasyMock.expect(nmrTransportFactory.getNmr().getEndpointRegistry()).andReturn(endpoints);
-        control.replay();
-        observer = new MessageObserver() {
-            public void onMessage(Message m) {                    
-                inMessage = m;
-            }
-        };
-        destination.setMessageObserver(observer);
-        destination.process(xchg);
-        assertNotNull(inMessage);
-    }
-}
diff --git a/trunk/cxf/pom.xml b/trunk/cxf/pom.xml
deleted file mode 100644
index 2945d1e..0000000
--- a/trunk/cxf/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.features</groupId>
-        <artifactId>features</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.cxf</groupId>
-    <artifactId>cxf</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: CXF Support</name>
-
-    <modules>
-        <module>cxf-transport-nmr</module>
-        <module>cxf-binding-nmr</module>
-    </modules>
-
-</project>
diff --git a/trunk/deps/pom.xml b/trunk/deps/pom.xml
deleted file mode 100644
index 09d2aad..0000000
--- a/trunk/deps/pom.xml
+++ /dev/null
@@ -1,71 +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.
-    -->
-
-    <!-- 
-       ATTENTION: This project is an ugly workaround to pull in some duplicated 
-       dependencies which otherwise would be ignored by maven and make the build 
-       fail. The reason is that those deps only differ in the version numbers to 
-       deps used in the assembly. 
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.features</groupId>
-        <artifactId>features</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.features.deps</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Dependencies</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>resolve</goal>
-                        </goals>
-                        <configuration>
-                            <silent>true</silent>
-                            <excludeTransitive>true</excludeTransitive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/README.txt b/trunk/examples/README.txt
deleted file mode 100644
index 642b402..0000000
--- a/trunk/examples/README.txt
+++ /dev/null
@@ -1,174 +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
-==================================
-
-List of 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.
-  
-- camel-nmr
-  Deploys two Camel EIP routes that communicate with each other via the
-  ServiceMix NMR.
-
-- 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.
-
-- cxf-camel-nmr
-  Deploys a Camel route that transforms a message and passes it to a CXF
-  web service via the ServiceMix NMR.
-
-- cxf-jaxrs
-  Creates a RESTful JAX-RS web service using CXF and exposes it using
-  the OSGi HTTP service.
-  
-- cxf-nmr
-  Creates a web service using CXF and Spring-DM, and publishes it to the
-  ServiceMix NMR.
- 
-- 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-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.
-  
-- 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.
-
-- karaf-demos/web
-  Embeds the ServiceMix Kernel in a web application.
-
-- nmr
-  Exposes a simple NMR endpoint.
-
-
-- simple
-  Adds new endpoints using XML configuration files only.
-
-
-Prerequisites for Running the Examples
-=========================================
-
-Java Development Kit (JDK)
---------------------------
-You must have JDK 1.5 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.0.9 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/trunk/examples/bridge-camel/README.txt b/trunk/examples/bridge-camel/README.txt
deleted file mode 100644
index 29307d1..0000000
--- a/trunk/examples/bridge-camel/README.txt
+++ /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.
- */
-
-CAMEL BRIDGE EXAMPLE
-====================
-
-Purpose
--------
-Demonstrates how to use 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 Camel integration framework. The bridge
-example, on the other hand, uses the older ServiceMix EIP
-implementation to achieve the same result. For more details on
-how Camel compares to ServiceMix EIP, see:
-
-http://camel.apache.org/how-does-camel-compare-to-servicemix-eip.html
-
-
-Explanation
------------
-The bridge consists of three JBI Service Units (SUs) wrapped up
-in a JBI Service Assembly (SA) that is deployed to ServiceMix.
-
-The three SUs can be described as follows:
-
-1. HTTP SU (see the bridge-http-su directory)
-   A HTTP endpoint that listens on port 8192 for HTTP requests.
-
-2. JMS SU (see the bridge-jms-su directory)
-   An ActiveMQ JMS endpoint to which Camel sends messages.
-   
-3. Camel SU (see the bridge-camel-su directory)
-   A Camel route that receives messages from the HTTP endpoint,
-   transforms them using an XSLT stylesheet, logs them, and then
-   sends them to the JMS endpoint.
-   
-   The Camel routing information is contained in the camel-context.xml
-   file, which is located in the ./bridge-camel-su/src/main/resources
-   directory, and is shown below:
-
-    <route>
-      <from uri="jbi:endpoint:http://servicemix.apache.org/samples/bridge/pipeline/endpoint"/>
-      <to uri="xslt:bridge.xslt"/>
-      <to uri="log:org.apache.servicemix.example?level=INFO"/>
-      <to uri="jbi:endpoint:http://servicemix.apache.org/samples/bridge/jms/endpoint"/>
-    </route>
-
-The bridge-camel-sa directory contains the POM file that tells
-Maven how to build the SA.
-   
-
-Prerequisites for Building and Running this Example
----------------------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher.
-
-   - Apache Maven 2.0.9 or higher.
-
-   For more information, see the README in the top-level examples
-   directory.
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix	(on UNIX)
-  <servicemix_home>\bin\servicemix	(on Windows)
-
-
-Building and Deploying
-----------------------
-This example uses the ServiceMix JBI Maven plugin to build the SUs
-and the SA. To build the example, run the following command
-(from the directory that contains this README):
-
-  mvn install
-  
-If all of the required OSGi bundles are available in your local Maven
-repository, the example will build quickly. Otherwise it may take
-some time for Maven to download everything it needs.
-
-Once complete, you will find the SA, called bridge-camel-sa-${version}.zip,
-in the bridge-camel-sa/target directory.
-
-You can deploy the SA in two ways:
-
-- Using Hot Deployment
-  --------------------
-  
-  Copy the bridge-camel-sa/target/bridge-camel-sa-${version}.zip
-  to the <servicemix_home>/deploy directory.
-     
-- Using the ServiceMix Console
- -----------------------------
-  
-  Type the following command:
-
-  osgi:install -s mvn:org.apache.servicemix.examples.bridge-camel/bridge-camel-sa/${version}/zip
- 
- 
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html, which is located in the same directory as this
-   README file, in your favorite browser.
-
-2. Send a HTTP request. It will be transformed into a JMS message.
-
-   Once the JMS message has been successfully sent to the bridge.output
-   queue,  you will receive an HTTP STATUS 202 response code from the ESB.
-
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/bridge-camel/client
-   directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-
-
-Viewing the Log Entries
------------------------
-You can view the message that is sent by viewing the entries
-in the log file in the data/log directory of your ServiceMix
-installation, or by typing the following command in the
-ServiceMix console:
-
-  log:display
-
-
-Changing the Example
---------------------
-If you change the code or configuration in this example, use 'mvn install'
-to rebuild the SA, and deploy it as described above.
diff --git a/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml b/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml
deleted file mode 100644
index d5208f4..0000000
--- a/trunk/examples/bridge-camel/bridge-camel-sa/pom.xml
+++ /dev/null
@@ -1,63 +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.examples</groupId>
-        <artifactId>bridge-camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-    <artifactId>bridge-camel-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-            <artifactId>bridge-http-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-            <artifactId>bridge-camel-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-            <artifactId>bridge-jms-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge-camel/bridge-camel-su/pom.xml b/trunk/examples/bridge-camel/bridge-camel-su/pom.xml
deleted file mode 100644
index f962961..0000000
--- a/trunk/examples/bridge-camel/bridge-camel-su/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.examples</groupId>
-        <artifactId>bridge-camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-    <artifactId>bridge-camel-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: Camel SU</name>
-
-    <properties>
-        <componentName>servicemix-camel</componentName>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/trunk/examples/bridge-camel/bridge-camel-su/src/main/resources/bridge.xslt b/trunk/examples/bridge-camel/bridge-camel-su/src/main/resources/bridge.xslt
deleted file mode 100644
index 142e2d6..0000000
--- a/trunk/examples/bridge-camel/bridge-camel-su/src/main/resources/bridge.xslt
+++ /dev/null
@@ -1,29 +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.
-
--->
-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
-  <xsl:template match="node() | @*">
-    <xsl:copy>
-      <xsl:apply-templates select="node() | @*"/>
-    </xsl:copy>
-  </xsl:template>
-</xsl:stylesheet>
-
diff --git a/trunk/examples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml b/trunk/examples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml
deleted file mode 100644
index 0eec3cb..0000000
--- a/trunk/examples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml
+++ /dev/null
@@ -1,36 +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
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-
-      <camelContext xmlns="http://camel.apache.org/schema/spring">
-            <route>
-          <from uri="jbi:endpoint:http://servicemix.apache.org/samples/bridge/pipeline/endpoint"/>
-              <to uri="xslt:bridge.xslt"/>
-              <to uri="log:org.apache.servicemix.example?level=INFO"/>
-              <to uri="jbi:endpoint:http://servicemix.apache.org/samples/bridge/jms/endpoint"/>
-            </route>
-      </camelContext>
-
-</beans>
diff --git a/trunk/examples/bridge-camel/bridge-http-su/pom.xml b/trunk/examples/bridge-camel/bridge-http-su/pom.xml
deleted file mode 100644
index 7d1a830..0000000
--- a/trunk/examples/bridge-camel/bridge-http-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>bridge-camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-    <artifactId>bridge-http-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: HTTP SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-http</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge-camel/bridge-http-su/src/main/resources/xbean.xml b/trunk/examples/bridge-camel/bridge-http-su/src/main/resources/xbean.xml
deleted file mode 100644
index 3833de1..0000000
--- a/trunk/examples/bridge-camel/bridge-http-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,30 +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="http://servicemix.apache.org/http/1.0"
-       xmlns:b="http://servicemix.apache.org/samples/bridge">
-
-  <http:endpoint service="b:http"
-                 endpoint="endpoint"
-                 targetService="b:pipeline"
-                 role="consumer" 
-                 locationURI="http://0.0.0.0:8192/bridge/"
-                 defaultMep="http://www.w3.org/2004/08/wsdl/in-only" />
-
-</beans>
diff --git a/trunk/examples/bridge-camel/bridge-jms-su/pom.xml b/trunk/examples/bridge-camel/bridge-jms-su/pom.xml
deleted file mode 100644
index 48d873f..0000000
--- a/trunk/examples/bridge-camel/bridge-jms-su/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>
-        <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>bridge-camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-    <artifactId>bridge-jms-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: JMS SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activeio-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge-camel/bridge-jms-su/src/main/resources/xbean.xml b/trunk/examples/bridge-camel/bridge-jms-su/src/main/resources/xbean.xml
deleted file mode 100644
index 3e2e9b9..0000000
--- a/trunk/examples/bridge-camel/bridge-jms-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,34 +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:jms="http://servicemix.apache.org/jms/1.0"
-       xmlns:b="http://servicemix.apache.org/samples/bridge">
-
-  <jms:endpoint service="b:jms"
-                endpoint="endpoint"
-                role="provider" 
-                destinationStyle="queue"
-                jmsProviderDestinationName="bridge.output"
-                connectionFactory="#connectionFactory" />
-                
-  <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-    <property name="brokerURL" value="tcp://localhost:61616" />
-  </bean>
-                     
-</beans>
diff --git a/trunk/examples/bridge-camel/client.html b/trunk/examples/bridge-camel/client.html
deleted file mode 100644
index 1b1bc49..0000000
--- a/trunk/examples/bridge-camel/client.html
+++ /dev/null
@@ -1,137 +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.
-
--->
-<!-- $Rev$ $Date$ -->
-<html>
-<head>
-<title>ServiceMix Bridge Example</title>
-<script type="text/javascript">
-var urlToOpen = "http://localhost:8192/bridge/"; //default URL to open
-
-function getHTTPObject() {
-  var xmlhttp = false;
-
-  /* Compilation conditionnelle d'IE */
-  /*@cc_on
-  @if (@_jscript_version >= 5)
-     try {
-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-     } catch (e) {
-        try {
-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-        } catch (E) {
-           xmlhttp = false;
-        }
-     }
-  @else
-     xmlhttp = false;
-  @end @*/
-
-  /* on essaie de créer l'objet si ce n'est pas déjà fait */
-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-     try {
-        xmlhttp = new XMLHttpRequest();
-     } catch (e) {
-        xmlhttp = false;
-     }
-  }
-
-  if (xmlhttp) {
-     /* on définit ce qui doit se passer quand la page répondra */
-     xmlhttp.onreadystatechange=function() {
-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */
-           var response = document.getElementById("response");
-           var responseStatus = "";
-           try {
-             responseStatus = xmlhttp.status + "";
-           } catch (e) {
-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";
-           }
-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;
-        }
-     }
-  }
-  return xmlhttp;
-}
-
-function send() {
-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {
-    //use user entry only if it at least can be okay
-    urlToOpen = document.getElementById("urlToOpen").value;
-  }  
-  var xmlhttp = getHTTPObject();
-  if (!xmlhttp) {
-    alert('cound not create XMLHttpRequest object');
-    return;
-  }
-  var request = document.getElementById("request");
-  var response = document.getElementById("response");  
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
-  } catch (e) {
-  }
-  try {
-    xmlhttp.open("POST", urlToOpen, true);
-  } catch (e) {
-    alert('Error opening connection');
-  }
-  xmlhttp.send(request.value);
-}
-
-</script>
-</head>
-
-<body>
-
-<h1>ServiceMix Bridge Example</h1>
-
-<p>Welcome to the Bridge example for ServiceMix.</p>
-
-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 
-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>
-
-
-<table>
-  <tr>
-    <td>
-  <textarea id="request" style="width:600px;height:400px" onKeyUp="send();"><?xml version="1.0" encoding="UTF-8"?>
-<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/">
-  <e:Body>
-    <ping>
-      <pingRequest>
-        <message xmlns="http://soap">hel lo</message>
-      </pingRequest>
-    </ping>
-  </e:Body>
-</e:Envelope>
-
-  </textarea>
-    </td>
-    <td>
-  <textarea id="response" style="width:600px;height:400px">
-  </textarea>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2>
-  <input type="button" value="Send" onClick="send();"/>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/trunk/examples/bridge-camel/client/pom.xml b/trunk/examples/bridge-camel/client/pom.xml
deleted file mode 100644
index 7d5635b..0000000
--- a/trunk/examples/bridge-camel/client/pom.xml
+++ /dev/null
@@ -1,61 +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.examples</groupId>
-        <artifactId>bridge-camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge-camel</groupId>
-    <artifactId>bridge-camel-client</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel :: Client</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.bridgecamel.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge-camel/client/src/main/java/org/apache/servicemix/samples/bridgecamel/Client.java b/trunk/examples/bridge-camel/client/src/main/java/org/apache/servicemix/samples/bridgecamel/Client.java
deleted file mode 100644
index 79558c7..0000000
--- a/trunk/examples/bridge-camel/client/src/main/java/org/apache/servicemix/samples/bridgecamel/Client.java
+++ /dev/null
@@ -1,60 +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.samples.bridgecamel;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8192/bridge/")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/samples/bridgecamel/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-        if (connection instanceof HttpURLConnection) {
-            int retCode = ((HttpURLConnection)connection).getResponseCode();
-            System.out.println("the response code is =====>");//expected is 202 for this example
-            System.out.println(retCode);
-        }
-       
-    }
-
-}
diff --git a/trunk/examples/bridge-camel/client/src/main/resources/org/apache/servicemix/samples/bridgecamel/request.xml b/trunk/examples/bridge-camel/client/src/main/resources/org/apache/servicemix/samples/bridgecamel/request.xml
deleted file mode 100644
index 0ba5ecc..0000000
--- a/trunk/examples/bridge-camel/client/src/main/resources/org/apache/servicemix/samples/bridgecamel/request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/">
-  <e:Body>
-    <ping>
-      <pingRequest>
-        <message xmlns="http://soap">hel lo</message>
-      </pingRequest>
-    </ping>
-  </e:Body>
-</e:Envelope>
diff --git a/trunk/examples/bridge-camel/pom.xml b/trunk/examples/bridge-camel/pom.xml
deleted file mode 100644
index be87309..0000000
--- a/trunk/examples/bridge-camel/pom.xml
+++ /dev/null
@@ -1,72 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>bridge-camel</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge Camel</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>bridge-jms-su</module>
-        <module>bridge-http-su</module>
-        <module>bridge-camel-su</module>
-        <module>bridge-camel-sa</module>
-        <module>client</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/bridge-camel/src/main/assembly/src.xml b/trunk/examples/bridge-camel/src/main/assembly/src.xml
deleted file mode 100644
index f10b298..0000000
--- a/trunk/examples/bridge-camel/src/main/assembly/src.xml
+++ /dev/null
@@ -1,45 +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>
-        <format>zip</format>
-    </formats>
-    
-    <fileSets>
-    
-        <fileSet>
-            <includes>
-                <include>README*</include>
-                <include>LICENSE*</include>
-                <include>NOTICE*</include>
-                <include>pom.xml</include>
-                <include>*.html</include>
-                <include>src/**/*</include>
-                <include>*/pom.xml</include>
-                <include>*/src/**/*</include>
-            </includes>
-        </fileSet>
-    
-    </fileSets>
-
-</assembly>
diff --git a/trunk/examples/bridge/README.txt b/trunk/examples/bridge/README.txt
deleted file mode 100644
index 8e94e12..0000000
--- a/trunk/examples/bridge/README.txt
+++ /dev/null
@@ -1,161 +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.
- */
-
-EIP JBI BRIDGE EXAMPLE
-======================
-
-Purpose
--------
-Use 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, on the other hand, uses Camel to achieve
-the same result. For more details on how Camel compares to ServiceMix EIP,
-see: http://camel.apache.org/how-does-camel-compare-to-servicemix-eip.html
-
-
-Explanation
------------
-The protocol bridge consists of four JBI Service Units (SUs)
-wrapped up in a JBI Service Assembly (SA). The SA is deployed
-to ServiceMix.
-
-The SUs can be described as follows:
-
-1. HTTP SU (see the bridge-http-su directory)
-   A HTTP endpoint that listens on port 8192 for HTTP requests.
-   
-2. EIP Pipeline SU (see the bridge-eip-su directory)
-   An EIP pipeline that receives HTTP requests, forwards them to
-   the XSLT transform, and takes the results of the transform and
-   passes them to the ActiveMQ JMS endpoint.
-
-3. XSLT SU (see the bridge-xslt-su directory)
-   Uses the bridge.xslt XSL file to convert the message into the
-   format required by JMS. The example XSLT performs a very basic
-   transformation and is for demonstration purposes only.
-   
-4. JMS SU (see the bridge-jms-su directory)
-   An ActiveMQ JMS endpoint to which the EIP pipeline sends
-   messages.
-   
-The configuration for each SU is contained in the xbean.xml file
-that is located in the src/main/resources directory for that SU.
-For example, configuration for the HTTP SU is contained in the
-xbean.xml file located in the bridge-http-su/src/main/resources
-directory.
-
-The bridge-sa directory contains the POM file that tells Maven how 
-to build the SA for this example.
-   
-   
-Prerequisites for Running this Example
---------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher.
-
-   - Apache Maven 2.0.9 or higher.
-
-   For more information, see the README in the top-level
-   examples directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-  
-
-Building and Deploying
-----------------------
-This example uses the ServiceMix JBI Maven plugin to build the
-SUs and the SA. To build the example, run the following command
-(from the directory that contains this README):
-
-  mvn install
-  
-
-If all of the required bundles are available in your local
-Maven repository, the example will build quickly. Otherwise
-it may take some time for Maven to download everything it needs.
-
-Once complete, you will find the SA, called bridge-sa-${version}.zip,
-in the bridge-sa/target directory of this example.
-
-You can deploy the SA in two ways:
-
-- Using Hot Deployment
-  --------------------
-  
-  Copy the bridge-sa-${version}.zip file to the
-  <servicemix_home>/deploy directory.
-     
-- Using the ServiceMix Console
-  ----------------------------
-  
-  Type the following command:
-
-  osgi:install -s mvn:org.apache.servicemix.examples.bridge/bridge-sa/${version}/zip
-
-
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html file, which is located in the same directory
-   as this README file, in your favorite browser.
-
-2. Send a HTTP request. It will be transformed into a JMS message.
-
-   Once the JMS message is sent to the bridge.output queue, you will
-   receive a HTTP STATUS 202 response code from the ESB.
-
-
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/bridge/client directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-
-
-Viewing the Log Entries
------------------------
-You can view the message that is sent by viewing the entries
-in the log file in the data/log directory of your ServiceMix
-installation, or by typing the following command in the
-ServiceMix console:
-
-  log:display
-  
-
-Changing the Example
---------------------
-If you change the code or configuration in this example, use
-'mvn install' to rebuild the JBI SA zip, and deploy it as described
-above.
-
-
-More Information
-----------------
-For more information about this example, see:
-
-  http://servicemix.apache.org/creating-a-protocol-bridge.html
diff --git a/trunk/examples/bridge/bridge-eip-su/pom.xml b/trunk/examples/bridge/bridge-eip-su/pom.xml
deleted file mode 100644
index 63b5523..0000000
--- a/trunk/examples/bridge/bridge-eip-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge</groupId>
-    <artifactId>bridge-eip-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: EIP SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-eip</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge/bridge-eip-su/src/main/resources/xbean.xml b/trunk/examples/bridge/bridge-eip-su/src/main/resources/xbean.xml
deleted file mode 100644
index c5895dc..0000000
--- a/trunk/examples/bridge/bridge-eip-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,32 +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:eip="http://servicemix.apache.org/eip/1.0"

-       xmlns:b="http://servicemix.apache.org/samples/bridge">

-

-  <eip:pipeline service="b:pipeline" endpoint="endpoint">

-    <eip:transformer>

-      <eip:exchange-target service="b:xslt" />

-    </eip:transformer>

-    <eip:target>

-      <eip:exchange-target service="b:jms" />

-    </eip:target>

-  </eip:pipeline>

-

-</beans>

diff --git a/trunk/examples/bridge/bridge-http-su/pom.xml b/trunk/examples/bridge/bridge-http-su/pom.xml
deleted file mode 100644
index d5dc2c7..0000000
--- a/trunk/examples/bridge/bridge-http-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge</groupId>
-    <artifactId>bridge-http-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: HTTP SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-http</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge/bridge-http-su/src/main/resources/xbean.xml b/trunk/examples/bridge/bridge-http-su/src/main/resources/xbean.xml
deleted file mode 100644
index 4ce0c6b..0000000
--- a/trunk/examples/bridge/bridge-http-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,30 +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="http://servicemix.apache.org/http/1.0"

-       xmlns:b="http://servicemix.apache.org/samples/bridge">

-

-  <http:endpoint service="b:http"

-                 endpoint="endpoint"

-                 targetService="b:pipeline"

-                 role="consumer" 

-                 locationURI="http://0.0.0.0:8192/bridge/"

-                 defaultMep="http://www.w3.org/2004/08/wsdl/in-only" />

-

-</beans>

diff --git a/trunk/examples/bridge/bridge-jms-su/pom.xml b/trunk/examples/bridge/bridge-jms-su/pom.xml
deleted file mode 100644
index a1605a6..0000000
--- a/trunk/examples/bridge/bridge-jms-su/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>
-        <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge</groupId>
-    <artifactId>bridge-jms-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: JMS SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activeio-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge/bridge-jms-su/src/main/resources/xbean.xml b/trunk/examples/bridge/bridge-jms-su/src/main/resources/xbean.xml
deleted file mode 100644
index c573b78..0000000
--- a/trunk/examples/bridge/bridge-jms-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,34 +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:jms="http://servicemix.apache.org/jms/1.0"

-       xmlns:b="http://servicemix.apache.org/samples/bridge">

-

-  <jms:endpoint service="b:jms"

-                endpoint="endpoint"

-                role="provider" 

-                destinationStyle="queue"

-                jmsProviderDestinationName="bridge.output"

-                connectionFactory="#connectionFactory" />

-                

-  <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">

-    <property name="brokerURL" value="failover:(tcp://localhost:61616)" />

-  </bean>

-                     

-</beans>

diff --git a/trunk/examples/bridge/bridge-sa/pom.xml b/trunk/examples/bridge/bridge-sa/pom.xml
deleted file mode 100644
index f03bf10..0000000
--- a/trunk/examples/bridge/bridge-sa/pom.xml
+++ /dev/null
@@ -1,68 +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.examples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge</groupId>
-    <artifactId>bridge-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge</groupId>
-            <artifactId>bridge-http-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge</groupId>
-            <artifactId>bridge-eip-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge</groupId>
-            <artifactId>bridge-xslt-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.bridge</groupId>
-            <artifactId>bridge-jms-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge/bridge-xslt-su/pom.xml b/trunk/examples/bridge/bridge-xslt-su/pom.xml
deleted file mode 100644
index 19349ce..0000000
--- a/trunk/examples/bridge/bridge-xslt-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge</groupId>
-    <artifactId>bridge-xslt-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: XSLT SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-saxon</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge/bridge-xslt-su/src/main/resources/bridge.xslt b/trunk/examples/bridge/bridge-xslt-su/src/main/resources/bridge.xslt
deleted file mode 100644
index 5e0b094..0000000
--- a/trunk/examples/bridge/bridge-xslt-su/src/main/resources/bridge.xslt
+++ /dev/null
@@ -1,29 +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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->

-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>

-  <xsl:template match="node() | @*">

-    <xsl:copy>

-      <xsl:apply-templates select="node() | @*"/>

-    </xsl:copy>

-  </xsl:template>

-</xsl:stylesheet>

-

diff --git a/trunk/examples/bridge/bridge-xslt-su/src/main/resources/xbean.xml b/trunk/examples/bridge/bridge-xslt-su/src/main/resources/xbean.xml
deleted file mode 100644
index 46512cd..0000000
--- a/trunk/examples/bridge/bridge-xslt-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,30 +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:saxon="http://servicemix.apache.org/saxon/1.0"

-       xmlns:b="http://servicemix.apache.org/samples/bridge">

-

-  <saxon:xslt service="b:xslt" endpoint="endpoint"

-              result="string"

-              resource="classpath:bridge.xslt" />

-  <!-- saxon is bugged when dealing with xmlns="xxx" attributes

-       see http://sourceforge.net/tracker/index.php?func=detail&aid=1558133&group_id=29872&atid=397617

-       so just use string instead of DOM output for now -->

-

-</beans>

diff --git a/trunk/examples/bridge/client.html b/trunk/examples/bridge/client.html
deleted file mode 100644
index b805e3a..0000000
--- a/trunk/examples/bridge/client.html
+++ /dev/null
@@ -1,137 +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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 dv©c. 2005) $ -->

-<html>

-<head>

-<title>ServiceMix Bridge Example</title>

-<script type="text/javascript">

-var urlToOpen = "http://localhost:8192/bridge/"; //default URL to open

-

-function getHTTPObject() {

-  var xmlhttp = false;

-

-  /* Compilation conditionnelle d'IE */

-  /*@cc_on

-  @if (@_jscript_version >= 5)

-     try {

-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");

-     } catch (e) {

-        try {

-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");

-        } catch (E) {

-           xmlhttp = false;

-        }

-     }

-  @else

-     xmlhttp = false;

-  @end @*/

-

-  /* on essaie de créer l'objet si ce n'est pas déjà fait */

-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {

-     try {

-        xmlhttp = new XMLHttpRequest();

-     } catch (e) {

-        xmlhttp = false;

-     }

-  }

-

-  if (xmlhttp) {

-     /* on définit ce qui doit se passer quand la page répondra */

-     xmlhttp.onreadystatechange=function() {

-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */

-           var response = document.getElementById("response");

-           var responseStatus = "";

-           try {

-             responseStatus = xmlhttp.status + "";

-           } catch (e) {

-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";

-           }

-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;

-        }

-     }

-  }

-  return xmlhttp;

-}

-

-function send() {

-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {

-    //use user entry only if it at least can be okay

-    urlToOpen = document.getElementById("urlToOpen").value;

-  }  

-  var xmlhttp = getHTTPObject();

-  if (!xmlhttp) {

-    alert('cound not create XMLHttpRequest object');

-    return;

-  }

-  var request = document.getElementById("request");

-  var response = document.getElementById("response");  

-  try {

-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");

-  } catch (e) {

-  }

-  try {

-    xmlhttp.open("POST", urlToOpen, true);

-  } catch (e) {

-    alert('Error opening connection');

-  }

-  xmlhttp.send(request.value);

-}

-

-</script>

-</head>

-

-<body>

-

-<h1>ServiceMix Bridge Example</h1>

-

-<p>Welcome to the Bridge example for ServiceMix.</p>

-

-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 

-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>

-

-

-<table>

-  <tr>

-    <td>

-  <textarea id="request" style="width:600px;height:400px" onKeyUp="send();"><?xml version="1.0" encoding="UTF-8"?>

-<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/">

-  <e:Body>

-    <ping>

-      <pingRequest>

-        <message xmlns="http://soap">hel lo</message>

-      </pingRequest>

-    </ping>

-  </e:Body>

-</e:Envelope>

-

-  </textarea>

-    </td>

-    <td>

-  <textarea id="response" style="width:600px;height:400px">

-  </textarea>

-    </td>

-  </tr>

-  <tr>

-    <td colspan=2>

-  <input type="button" value="Send" onClick="send();"/>

-    </td>

-  </tr>

-</table>

-</body>

-</html>

diff --git a/trunk/examples/bridge/client/pom.xml b/trunk/examples/bridge/client/pom.xml
deleted file mode 100644
index 13125a7..0000000
--- a/trunk/examples/bridge/client/pom.xml
+++ /dev/null
@@ -1,61 +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.examples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.bridge</groupId>
-    <artifactId>bridge-client</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge :: Client</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.bridge.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/bridge/client/src/main/java/org/apache/servicemix/samples/bridge/Client.java b/trunk/examples/bridge/client/src/main/java/org/apache/servicemix/samples/bridge/Client.java
deleted file mode 100644
index 40d7fb7..0000000
--- a/trunk/examples/bridge/client/src/main/java/org/apache/servicemix/samples/bridge/Client.java
+++ /dev/null
@@ -1,60 +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.samples.bridge;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8192/bridge/")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/samples/bridge/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-        if (connection instanceof HttpURLConnection) {
-            int retCode = ((HttpURLConnection)connection).getResponseCode();
-            System.out.println("the response code is =====>");//expected is 202 for this example
-            System.out.println(retCode);
-        }
-       
-    }
-
-}
diff --git a/trunk/examples/bridge/client/src/main/resources/org/apache/servicemix/samples/bridge/request.xml b/trunk/examples/bridge/client/src/main/resources/org/apache/servicemix/samples/bridge/request.xml
deleted file mode 100644
index 4049d09..0000000
--- a/trunk/examples/bridge/client/src/main/resources/org/apache/servicemix/samples/bridge/request.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.
--->        
-<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/">
-  <e:Body>
-    <ping>
-      <pingRequest>
-        <message xmlns="http://soap">hel lo</message>
-      </pingRequest>
-    </ping>
-  </e:Body>
-</e:Envelope>
diff --git a/trunk/examples/bridge/pom.xml b/trunk/examples/bridge/pom.xml
deleted file mode 100644
index fb9e134..0000000
--- a/trunk/examples/bridge/pom.xml
+++ /dev/null
@@ -1,53 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>bridge</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Bridge</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>bridge-http-su</module>
-        <module>bridge-eip-su</module>
-        <module>bridge-xslt-su</module>
-        <module>bridge-jms-su</module>
-        <module>bridge-sa</module>
-        <module>client</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/camel-blueprint/README.txt b/trunk/examples/camel-blueprint/README.txt
deleted file mode 100644
index df19d8f..0000000
--- a/trunk/examples/camel-blueprint/README.txt
+++ /dev/null
@@ -1,235 +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.
- */
-
-CAMEL OSGI EXAMPLE
-==================
-
-Purpose
--------
-Deploys a Camel EIP route as an OSGi bundle using Blueprint.
-Configuration makes use of the OSGi Configuration Admin service and
-Blueprint property placeholders, and the example demonstrates how to
-deploy the properties file from the ServiceMix console.
-
-
-Explanation
------------
-The Camel route is defined in a Blueprint XML file, blueprint.xml, which can be
-found in the src/main/resources/OSGI-INF/blueprint directory of this example.
-The route is defined in the <route> element and can be explained as follows:
-
-1. A timer endpoint generates a heartbeat event every 2000ms.
-       
-2. A callout is made to a transformer bean that transforms each
-   heartbeat message to the current date and time.
-        
-3. A log endpoint sends the transformed message to the
-   Jakarta commons logger.
-      
-The blueprint.xml file also contains the following elements:
-
--  A <bean> element that instantiates the transformer bean using standard
-   Blueprint configuration syntax and specifies a prefix value using a
-   property placeholder. 
-   
--  An <cm:property-placeholder> element which allows you to specify placeholder
-   values using the OSGi Configuration Admin service. In this case, the 
-   property is also given the default value of "MyTransform".
-   
-The route and configuration are deployed in an OSGi bundle.   
-
-   
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-
-   - Maven 2.0.9 or higher (for building)
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-2. Start ServiceMix by running the following command:
-
-    <servicemix_home>/bin/servicemix          (on UNIX)
-    <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-  This option is useful if you want to see the example up and
-  running quickly.
-
-- B. Building the Example Bundle Yourself
-  This option is useful if you want to change the example in any way.
-  It tells you how to build and deploy the example. This option might
-  be slower than option A because, if you do not already have the
-  required bundles in your local Maven repository, Maven will have to
-  download the bundles it needs.
-
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter the
-following command in the ServiceMix console:
-
-  features:install examples-camel-blueprint
-  
-This command makes use of the ServiceMix features facility. For more
-information about the features facility, see the README.txt file in the
-examples parent directory.
-
-Once the example is running, periodic events are routed to the transform
-method of the MyTransform class and you should see output similar to the
-following being logged to your console screen:
-
->>>> Blueprint-Example set body:  Tue Jan 04 10:23:39 CET 2011
->>>> Blueprint-Example set body:  Tue Jan 04 10:23:41 CET 2011
->>>> Blueprint-Example set body:  Tue Jan 04 10:23:43 CET 2011
-
-Updating and Redeploying the Properties File from the Console
--------------------------------------------------------------
-You can update and redeploy the properties file that is used by the
-properties placeholder in the blueprint.xml from console as follows:
-
-1. Edit the org.apache.servicemix.examples.cfg file, located in the
-   same folder as this README, by changing the value of the "prefix"
-   key to whatever you want (for example, YourTransform).
-  
-2. Copy the updated configuration file to your <servicemix_home>/etc
-   directory. You can do this from the ServiceMix console by typing:
-
-     copy $YOUR_SERVICEMIX_HOME/examples/camel-osgi/org.apache.servicemix.examples.cfg
-     $YOUR_SERVICEMIX_HOME/etc
-
-   On Windows you need to replace / in the path with \\.
-
-   Note, the text you are typing might intermingle with the output
-   being logged. This is nothing to worry about.
-
-3. Restart the example bundle:
-
-   (i) First you must know the bundle ID that ServiceMix has assigned
-       to it. To get the bundle ID, enter the following command in the
-       ServiceMix console:
-
-         osgi:list
-
-      At the end of the listing, you should see an entry similar to
-      the following:
-
-      [158] [Active     ] [Started  ] [  60] Apache ServiceMix Example :: Camel OSGi (4.1.0)
- 
-      In this case, the bundle ID is 158.
-
-   (ii) Enter the following command in the ServiceMix console to
-        restart the bundle:
-    
-          osgi:restart <bundle_id>
-  
-  The prefix of the output should change, and the output should look
-  similar to the following:
-
-  >>>> YourTransform set body:  Tue Aug 11 17:14:12 BST 2009
-  >>>> YourTransform set body:  Tue Aug 11 17:14:14 BST 2009
-  >>>> YourTransform set body:  Tue Aug 11 17:14:16 BST 2009
-  
-For information on how to stop and/or uninstall the example, see
-"Stopping and Uninstalling the Example" below.
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-camel-osgi
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-camel-blueprint
-
-2. Build the example by opening a command prompt, changing directory to
-   examples/camel-osgi (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local Maven
-   repository, the example will build very quickly. Otherwise it may
-   take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-camel-blueprint
-       
-   It makes use of the ServiceMix features facility. For more information
-   about the features facility, see the README.txt file in the examples
-   parent directory.
-   
-Once the example is running, periodic events are routed to the
-transform method of the MyTransform class and you should see output
-similar to the following being logged to your console screen:
-
->>>> Blueprint-Example set body:  Tue Jan 04 10:23:39 CET 2011
->>>> Blueprint-Example set body:  Tue Jan 04 10:23:41 CET 2011
->>>> Blueprint-Example set body:  Tue Jan 04 10:23:43 CET 2011
-
-Now, if you have not already done so, try updating and redeploying,
-from the console, the properties file that is used by the properties
-placeholder in the blueprint.xml file. For details on how to do this, see
-the "Updating and Redeploying the Properties File from the Console"
-section above.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For information on how to find the bundle_id assigned to the example,
-see step 3 in the "Updating and Redeploying the Properties File 
-from the Console" section above.
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-camel-blueprint
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/camel-blueprint/org.apache.servicemix.examples.cfg b/trunk/examples/camel-blueprint/org.apache.servicemix.examples.cfg
deleted file mode 100644
index 16efba6..0000000
--- a/trunk/examples/camel-blueprint/org.apache.servicemix.examples.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.
-#
-#
-
-
-prefix=YourTransform
diff --git a/trunk/examples/camel-blueprint/pom.xml b/trunk/examples/camel-blueprint/pom.xml
deleted file mode 100644
index defa085..0000000
--- a/trunk/examples/camel-blueprint/pom.xml
+++ /dev/null
@@ -1,51 +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/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>camel-blueprint</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel Blueprint</name>
-    <description>Camel Example using blueprint for configuration</description>
-
-    <build>
-        <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>*,org.apache.camel.osgi</Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.camel</Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/camel-blueprint/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java b/trunk/examples/camel-blueprint/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
deleted file mode 100644
index d26596c..0000000
--- a/trunk/examples/camel-blueprint/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
+++ /dev/null
@@ -1,52 +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.examples.camel;
-
-import java.util.Date;
-import java.util.logging.Logger;
-
-public class MyTransform  {
-
-    private static final transient Logger logger = Logger.getLogger(MyTransform.class.getName());
-    private boolean verbose = true;
-    private String prefix = "MyTransform";
-
-    public Object transform(Object body) {
-        String answer = prefix + " set body:  " + new Date();
-        if (verbose) {
-            System.out.println(">>>> " + answer);
-        }
-        logger.info(">>>> " + answer);
-        return answer;
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-}
diff --git a/trunk/examples/camel-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/trunk/examples/camel-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index 05ed21e..0000000
--- a/trunk/examples/camel-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,44 +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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-
-    <cm:property-placeholder persistent-id="org.apache.servicemix.examples">
-        <cm:default-properties>
-            <cm:property name="prefix" value="Blueprint-Example"/>
-        </cm:default-properties>
-    </cm:property-placeholder>
-
-    <camelContext xmlns="http://camel.apache.org/schema/blueprint">
-        <route>
-            <from uri="timer://myTimer?fixedRate=true&amp;period=2000" />
-            <bean ref="myTransform" method="transform"/>
-            <to uri="log:ExampleRouterBlueprint" />
-        </route>
-    </camelContext>
-
-    <bean id="myTransform" class="org.apache.servicemix.examples.camel.MyTransform">
-        <property name="prefix" value="${prefix}" />
-    </bean>
-
-</blueprint>
diff --git a/trunk/examples/camel-nmr-blueprint/README.txt b/trunk/examples/camel-nmr-blueprint/README.txt
deleted file mode 100644
index 2dd05e7..0000000
--- a/trunk/examples/camel-nmr-blueprint/README.txt
+++ /dev/null
@@ -1,239 +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.
- */
-
-CAMEL BLUEPRINT NMR EXAMPLE
-===========================
-
-Purpose
--------
-Using Blueprint, this example deploys two Camel EIP routes that communicate
-with each other via the ServiceMix NMR.
-
-
-Explanation
------------
-The NMR is a general-purpose message bus that applications can
-use to communicate within the ServiceMix OSGi container. It is
-modeled on the Normalized Message Router (NMR) defined in the 
-Java Business Integration (JBI) specification.
-
-The Camel routes are defined in the beans.xml file that is located
-in the src/main/resources/OSGI-INF/blueprint directory of this example.
-The contents of the blueprint.xml file can be explained as follows:
-
-1. Defines a route that generates a heartbeat message every
-   2000ms and sends it to the NMR.
-
-2. Defines a second route that receives the message from the NMR,
-   transforms the heartbeat into a message containing the current
-   date and time, and logs the message.
-
-The routes are deployed in an OSGi bundle.
-   
-
-Prerequisites for Building and Running the Example
---------------------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-
-   - Maven 2.0.9 or higher (for building)
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-  This option is useful if you want to see the example up and
-  running quickly.
-
-- B. Building the Example Bundle Yourself
-  This option is useful if you want to change the example in any
-  way. It tells you how to build and deploy the example. This
-  option might be slower than option A because if you do not 
-  already have the required bundles in your local Maven
-  repository, Maven will have to download the bundles it needs.
-
-
-Updating and Redeploying the Properties File from the Console
--------------------------------------------------------------
-You can update and redeploy the properties file that is used by the
-properties placeholder in the blueprint.xml from console as follows:
-
-1. Edit the org.apache.servicemix.examples.cfg file, located in the
-   same folder as this README, by changing the value of the "prefix"
-   key to whatever you want (for example, YourTransform).
-
-2. Copy the updated configuration file to your <servicemix_home>/etc
-   directory. You can do this from the ServiceMix console by typing:
-
-     copy $YOUR_SERVICEMIX_HOME/examples/camel-osgi/org.apache.servicemix.examples.cfg
-     $YOUR_SERVICEMIX_HOME/etc
-
-   On Windows you need to replace / in the path with \\.
-
-   Note, the text you are typing might intermingle with the output
-   being logged. This is nothing to worry about.
-
-3. Restart the example bundle:
-
-   (i) First you must know the bundle ID that ServiceMix has assigned
-       to it. To get the bundle ID, enter the following command in the
-       ServiceMix console:
-
-         osgi:list
-
-      At the end of the listing, you should see an entry similar to
-      the following:
-
-      [ 185] [Active     ] [Created     ] [       ] [   60] Apache ServiceMix :: Features :: Examples :: Camel NMR Blueprint (${project.version})
-
-      In this case, the bundle ID is 185.
-
-   (ii) Enter the following command in the ServiceMix console to
-        restart the bundle:
-
-          osgi:restart <bundle_id>
-
-  The prefix of the output should change, and the output should look
-  similar to the following:
-
-  >>>> YourTransform set body:  Tue Aug 11 17:14:12 BST 2009
-  >>>> YourTransform set body:  Tue Aug 11 17:14:14 BST 2009
-  >>>> YourTransform set body:  Tue Aug 11 17:14:16 BST 2009
-
-For information on how to stop and/or uninstall the example, see
-"Stopping and Uninstalling the Example" below.
-
-
-A. Using a Prebuilt Deployment Bundle:Quick and Easy
-----------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-camel-nmr-blueprint
-  
-This command makes use of the ServiceMix features facility. For 
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-Once the example is running you should see output similar to
-the following being logged to the console screen:
-
->>>> Blueprint-NMR-Example set body:  Mon Jan 10 09:00:24 CET 2011
->>>> Blueprint-NMR-Example set body:  Mon Jan 10 09:00:26 CET 2011
->>>> Blueprint-NMR-Example set body:  Mon Jan 10 09:00:28 CET 2011
-
-For information on how to stop and/or uninstall the example,
-see "Stopping and Uninstalling the Example" below.
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example
-bundle yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt
-   version as described above, you must first uninstall the
-   examples-camel-nmr feature by entering the following command
-   in the ServiceMix console:
-
-     features:uninstall examples-camel-nmr-blueprint
-
-2. Build the example by opening a command prompt, changing
-   directory to examples/camel-nmr (this example) and entering
-   the following Maven command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your
-   local Maven repository, the example will build quickly.
-   Otherwise it may take some time for Maven to download
-   everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target
-   directory of this example. 
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-camel-nmr-blueprint
-       
-   This command makes use of the ServiceMix features facility. For
-   more information about the features facility, see the README.txt
-   file in the examples parent directory.
-   
-Once the example is running you should see output similar to the
-following being logged to the console screen:
-
->>>> Blueprint-NMR-Example set body:  Mon Jan 10 09:00:24 CET 2011
->>>> Blueprint-NMR-Example set body:  Mon Jan 10 09:00:26 CET 2011
->>>> Blueprint-NMR-Example set body:  Mon Jan 10 09:00:28 CET 2011
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, first you must know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console (Note, the text you are typing will
-intermingle with the output being logged. This is nothing to worry
-about.): 
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [ 185] [Active     ] [Created     ] [       ] [   60] Apache ServiceMix :: Features :: Examples :: Camel NMR Blueprint (${project.version})
-
-In this case, the bundle ID is 185.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 185
-
-To uninstall the example, enter one of the following commands
-in the ServiceMix console:
-
-  features:uninstall examples-camel-nmr-blueprint
-
-or
-
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing the
-following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/camel-nmr-blueprint/org.apache.servicemix.examples.cfg b/trunk/examples/camel-nmr-blueprint/org.apache.servicemix.examples.cfg
deleted file mode 100644
index 16efba6..0000000
--- a/trunk/examples/camel-nmr-blueprint/org.apache.servicemix.examples.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.
-#
-#
-
-
-prefix=YourTransform
diff --git a/trunk/examples/camel-nmr-blueprint/pom.xml b/trunk/examples/camel-nmr-blueprint/pom.xml
deleted file mode 100644
index 88659c9..0000000
--- a/trunk/examples/camel-nmr-blueprint/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>camel-nmr-blueprint</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel NMR Blueprint</name>
-    <description>Camel example using NMR component and blueprint configuration</description>
-
-    <build>
-        <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>org.apache.servicemix.camel.nmr,org.apache.servicemix.nmr.api,*</Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.camel</Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/camel-nmr-blueprint/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java b/trunk/examples/camel-nmr-blueprint/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
deleted file mode 100644
index 61d9d0e..0000000
--- a/trunk/examples/camel-nmr-blueprint/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
+++ /dev/null
@@ -1,54 +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.examples.camel;
-
-import java.util.Date;
-import java.util.logging.Logger;
-
-/**
- * @version $Revision: 640450 $
- */
-public class MyTransform  {
-    private static final transient Logger logger = Logger.getLogger(MyTransform.class.getName());
-    private boolean verbose = true;
-    private String prefix = "MyTransform";
-
-    public Object transform(Object body) {
-        String answer = prefix + " set body:  " + new Date();
-        if (verbose) {
-            System.out.println(">>>> " + answer);
-        }
-        logger.info(">>>> " + answer);
-        return answer;
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-}
diff --git a/trunk/examples/camel-nmr-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/trunk/examples/camel-nmr-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index 188c826..0000000
--- a/trunk/examples/camel-nmr-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,50 +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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-
-    <cm:property-placeholder persistent-id="org.apache.servicemix.examples">
-        <cm:default-properties>
-            <cm:property name="prefix" value="Blueprint-NMR-Example"/>
-        </cm:default-properties>
-    </cm:property-placeholder>
-
-    <camelContext xmlns="http://camel.apache.org/schema/blueprint">
-        <!-- Route periodically sent events into the NMR -->
-        <route>
-            <from uri="timer://myTimer?fixedRate=true&amp;period=2000" />
-            <to uri="nmr:ExampleRouter" />
-        </route>
-        <!-- Route exchange from the NMR endpoint to a log endpoint -->
-        <route>
-            <from uri="nmr:ExampleRouter" />
-            <bean ref="myTransform" method="transform" />
-            <to uri="log:ExampleRouter" />
-        </route>
-    </camelContext>
-
-    <bean id="myTransform" class="org.apache.servicemix.examples.camel.MyTransform">
-        <property name="prefix" value="${prefix}" />
-    </bean>
-
-</blueprint>
diff --git a/trunk/examples/camel-nmr/README.txt b/trunk/examples/camel-nmr/README.txt
deleted file mode 100644
index 53ea247..0000000
--- a/trunk/examples/camel-nmr/README.txt
+++ /dev/null
@@ -1,191 +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.
- */
-
-CAMEL OSGI NMR EXAMPLE
-======================
-
-Purpose
--------
-Deploys two Camel EIP routes that communicate with each other
-via the ServiceMix NMR.
-
-
-Explanation
------------
-The NMR is a general-purpose message bus that applications can
-use to communicate within the ServiceMix OSGi container. It is
-modeled on the Normalized Message Router (NMR) defined in the 
-Java Business Integration (JBI) specification.
-
-The Camel routes are defined in the beans.xml file that is located
-in the src/main/resources/META-INF/spring directory of this example.
-The contents of the beans.xml file can be explained as follows:
-
-1. Imports the camel-nmr.xml file, which instantiates and
-   initializes the NMR component.
-
-2. Defines a route that generates a heartbeat message every
-   2000ms and sends it to the NMR.
-
-3. Defines a second route that receives the message from the NMR,
-   transforms the heartbeat into a message containing the current
-   date and time, and logs the message.
-
-The routes are deployed in an OSGi bundle.
-   
-
-Prerequisites for Building and Running the Example
---------------------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-
-   - Maven 2.0.9 or higher (for building)
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-  This option is useful if you want to see the example up and
-  running quickly.
-
-- B. Building the Example Bundle Yourself
-  This option is useful if you want to change the example in any
-  way. It tells you how to build and deploy the example. This
-  option might be slower than option A because if you do not 
-  already have the required bundles in your local Maven
-  repository, Maven will have to download the bundles it needs.
-
-A. Using a Prebuilt Deployment Bundle:Quick and Easy
-----------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-camel-nmr
-  
-This command makes use of the ServiceMix features facility. For 
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-Once the example is running you should see output similar to
-the following being logged to the console screen:
-
->>>> MyTransform set body:  Wed Aug 05 11:52:40 BST 2009
->>>> MyTransform set body:  Wed Aug 05 11:52:42 BST 2009
->>>> MyTransform set body:  Wed Aug 05 11:52:44 BST 2009
-
-For information on how to stop and/or uninstall the example,
-see "Stopping and Uninstalling the Example" below.
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example
-bundle yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt
-   version as described above, you must first uninstall the
-   examples-camel-nmr feature by entering the following command
-   in the ServiceMix console:
-
-     features:uninstall examples-camel-nmr
-
-2. Build the example by opening a command prompt, changing
-   directory to examples/camel-nmr (this example) and entering
-   the following Maven command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your
-   local Maven repository, the example will build quickly.
-   Otherwise it may take some time for Maven to download
-   everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target
-   directory of this example. 
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-camel-nmr
-       
-   This command makes use of the ServiceMix features facility. For
-   more information about the features facility, see the README.txt
-   file in the examples parent directory.
-   
-Once the example is running you should see output similar to the
-following being logged to the console screen:
-
->>>> MyTransform set body:  Wed Aug 05 11:52:40 BST 2009
->>>> MyTransform set body:  Wed Aug 05 11:52:42 BST 2009
->>>> MyTransform set body:  Wed Aug 05 11:52:44 BST 2009
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, first you must know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console (Note, the text you are typing will
-intermingle with the output being logged. This is nothing to worry
-about.): 
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [160] [Active     ] [Started] [  60] Apache ServiceMix Example :: Camel NMR (4.1.0.0)
-
-In this case, the bundle ID is 160.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 160
-
-To uninstall the example, enter one of the following commands
-in the ServiceMix console:
-
-  features:uninstall examples-camel-nmr
-
-or
-
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing the
-following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/camel-nmr/pom.xml b/trunk/examples/camel-nmr/pom.xml
deleted file mode 100644
index 38ddeb0..0000000
--- a/trunk/examples/camel-nmr/pom.xml
+++ /dev/null
@@ -1,60 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>camel-nmr</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel NMR</name>
-    <description>Camel Example using the Camel NMR component</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>org.apache.servicemix.camel.nmr,org.apache.servicemix.nmr.api,*</Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.camel</Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java b/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
deleted file mode 100644
index f0f863f..0000000
--- a/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
+++ /dev/null
@@ -1,56 +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.examples.camel;
-
-import java.util.Date;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @version $Revision: 640450 $
- */
-public class MyTransform  {
-    private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
-    private boolean verbose = true;
-    private String prefix = "MyTransform";
-
-    public Object transform(Object body) {
-        String answer = prefix + " set body:  " + new Date();
-        if (verbose) {
-            System.out.println(">>>> " + answer);
-        }
-        LOG.info(">>>> " + answer);
-        return answer;
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-}
diff --git a/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index e4cc5a4..0000000
--- a/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,48 +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="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://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-  <import resource="classpath:org/apache/servicemix/camel/nmr/camel-nmr.xml" />
-
-  <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
-    <!-- Route periodically sent events into the NMR -->
-    <route>
-      <from uri="timer://myTimer?fixedRate=true&amp;period=2000"/>
-      <to uri="nmr:ExampleRouter"/>
-    </route>
-    <!-- Route exchange from the NMR endpoint to a log endpoint -->
-    <route>
-      <from uri="nmr:ExampleRouter"/>
-      <bean ref="myTransform" method="transform"/>
-      <to uri="log:ExampleRouter"/>
-    </route>
-  </camel:camelContext>
-
-  <bean id="myTransform" class="org.apache.servicemix.examples.camel.MyTransform">
-    <property name="prefix" value="MyTransform"/>
-  </bean>
-
-</beans>
diff --git a/trunk/examples/camel-osgi/README.txt b/trunk/examples/camel-osgi/README.txt
deleted file mode 100644
index f34c715..0000000
--- a/trunk/examples/camel-osgi/README.txt
+++ /dev/null
@@ -1,235 +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.
- */
-
-CAMEL OSGI EXAMPLE
-==================
-
-Purpose
--------
-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.
-
-
-Explanation
------------
-The Camel route is defined in a Spring XML file, beans.xml, which can be
-found in the src/main/resources/META-INF/spring directory of this example.
-The route is defined in the <route> element and can be explained as follows:
-
-1. A timer endpoint generates a heartbeat event every 2000ms.
-       
-2. A callout is made to a transformer bean that transforms each
-   heartbeat message to the current date and time.
-        
-3. A log endpoint sends the transformed message to the
-   Jakarta commons logger.
-      
-The beans.xml file also contains the following elements: 
-
--  A <bean> element that instantiates the transformer bean using standard
-   Spring configuration syntax and specifies a prefix value using a
-   property placeholder. 
-   
--  An <osgix:cm-properties> element which allows you to specify placeholder
-   values using the OSGi Configuration Admin service. In this case, the 
-   property is also given the default value of "MyTransform".
-   
-The route and configuration are deployed in an OSGi bundle.   
-
-   
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-
-   - Maven 2.0.9 or higher (for building)
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-2. Start ServiceMix by running the following command:
-
-    <servicemix_home>/bin/servicemix          (on UNIX)
-    <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-  This option is useful if you want to see the example up and
-  running quickly.
-
-- B. Building the Example Bundle Yourself
-  This option is useful if you want to change the example in any way.
-  It tells you how to build and deploy the example. This option might
-  be slower than option A because, if you do not already have the
-  required bundles in your local Maven repository, Maven will have to
-  download the bundles it needs.
-
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter the
-following command in the ServiceMix console:
-
-  features:install examples-camel-osgi
-  
-This command makes use of the ServiceMix features facility. For more
-information about the features facility, see the README.txt file in the
-examples parent directory.
-
-Once the example is running, periodic events are routed to the transform
-method of the MyTransform class and you should see output similar to the
-following being logged to your console screen:
-
->>>> MyTransform set body:  Tue Aug 11 16:56:06 BST 2009
->>>> MyTransform set body:  Tue Aug 11 16:56:08 BST 2009
->>>> MyTransform set body:  Tue Aug 11 16:56:10 BST 2009
-
-Updating and Redeploying the Properties File from the Console
--------------------------------------------------------------
-You can update and redeploy the properties file that is used by the
-properties placeholder in the beans.xml from console as follows:
-
-1. Edit the org.apache.servicemix.examples.cfg file, located in the
-   same folder as this README, by changing the value of the "prefix"
-   key to whatever you want (for example, YourTransform).
-  
-2. Copy the updated configuration file to your <servicemix_home>/etc
-   directory. You can do this from the ServiceMix console by typing:
-
-     copy $YOUR_SERVICEMIX_HOME/examples/camel-osgi/org.apache.servicemix.examples.cfg
-     $YOUR_SERVICEMIX_HOME/etc
-
-   On Windows you need to replace / in the path with \\.
-
-   Note, the text you are typing might intermingle with the output
-   being logged. This is nothing to worry about.
-
-3. Restart the example bundle:
-
-   (i) First you must know the bundle ID that ServiceMix has assigned
-       to it. To get the bundle ID, enter the following command in the
-       ServiceMix console:
-
-         osgi:list
-
-      At the end of the listing, you should see an entry similar to
-      the following:
-
-      [158] [Active     ] [Started  ] [  60] Apache ServiceMix Example :: Camel OSGi (4.1.0)
- 
-      In this case, the bundle ID is 158.
-
-   (ii) Enter the following command in the ServiceMix console to
-        restart the bundle:
-    
-          osgi:restart <bundle_id>
-  
-  The prefix of the output should change, and the output should look
-  similar to the following:
-
-  >>>> YourTransform set body:  Tue Aug 11 17:14:12 BST 2009
-  >>>> YourTransform set body:  Tue Aug 11 17:14:14 BST 2009
-  >>>> YourTransform set body:  Tue Aug 11 17:14:16 BST 2009
-  
-For information on how to stop and/or uninstall the example, see
-"Stopping and Uninstalling the Example" below.
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-camel-osgi
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-camel-osgi
-
-2. Build the example by opening a command prompt, changing directory to
-   examples/camel-osgi (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local Maven
-   repository, the example will build very quickly. Otherwise it may
-   take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-camel-osgi
-       
-   It makes use of the ServiceMix features facility. For more information
-   about the features facility, see the README.txt file in the examples
-   parent directory.
-   
-Once the example is running, periodic events are routed to the
-transform method of the MyTransform class and you should see output
-similar to the following being logged to your console screen:
-
->>>> MyTransform set body:  Tue Aug 11 16:56:06 BST 2009
->>>> MyTransform set body:  Tue Aug 11 16:56:08 BST 2009
->>>> MyTransform set body:  Tue Aug 11 16:56:10 BST 2009
-
-Now, if you have not already done so, try updating and redeploying,
-from the console, the properties file that is used by the properties
-placeholder in the beans.xml file. For details on how to do this, see
-the "Updating and Redeploying the Properties File from the Console"
-section above.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For information on how to find the bundle_id assigned to the example,
-see step 3 in the "Updating and Redeploying the Properties File 
-from the Console" section above.
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-camel-osgi
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/camel-osgi/org.apache.servicemix.examples.cfg b/trunk/examples/camel-osgi/org.apache.servicemix.examples.cfg
deleted file mode 100644
index 16efba6..0000000
--- a/trunk/examples/camel-osgi/org.apache.servicemix.examples.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.
-#
-#
-
-
-prefix=YourTransform
diff --git a/trunk/examples/camel-osgi/pom.xml b/trunk/examples/camel-osgi/pom.xml
deleted file mode 100644
index dc3d766..0000000
--- a/trunk/examples/camel-osgi/pom.xml
+++ /dev/null
@@ -1,64 +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/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>camel-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel OSGi</name>
-    <description>Camel example using OSGi instead of JBI</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>org.apache.servicemix.examples.camel</Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyRouteBuilder.java b/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyRouteBuilder.java
deleted file mode 100644
index 7b27f7b..0000000
--- a/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyRouteBuilder.java
+++ /dev/null
@@ -1,48 +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.examples.camel;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.Main;
-
-/**
- * A simple example router to show how to define the route with Java DSL
- *
- * @version $Revision$
- */
-public class MyRouteBuilder extends RouteBuilder {
-    /**
-     * Allow this route to be run as an application
-     *
-     * @param args
-     */
-    public static void main(String[] args) throws Exception{
-        new Main().run(args);
-    }
-
-    public void configure() {
-        // set up the transform bean
-        MyTransform transform = new MyTransform();
-        transform.setPrefix("JavaDSL");
-        
-        from("timer://javaTimer?fixedRate=true&period=2000")
-            .bean(transform, "transform")
-            .to("log:ExampleRouter");        
-    }
-
-    
-}
diff --git a/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java b/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
deleted file mode 100644
index f0f863f..0000000
--- a/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
+++ /dev/null
@@ -1,56 +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.examples.camel;
-
-import java.util.Date;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @version $Revision: 640450 $
- */
-public class MyTransform  {
-    private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
-    private boolean verbose = true;
-    private String prefix = "MyTransform";
-
-    public Object transform(Object body) {
-        String answer = prefix + " set body:  " + new Date();
-        if (verbose) {
-            System.out.println(">>>> " + answer);
-        }
-        LOG.info(">>>> " + answer);
-        return answer;
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-}
diff --git a/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index ab190ff..0000000
--- a/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.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:ctx="http://www.springframework.org/schema/context"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-       http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
-
-  <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
-    <!-- install the Java DSL route builder -->
-    <package>org.apache.servicemix.examples.camel</package>
-    <!-- install the route which is defined with xml tags -->
-    <route>
-      <from uri="timer://springTimer?fixedRate=true&amp;period=2000"/>
-      <bean ref="myTransform" method="transform"/>
-      <to uri="log:ExampleRouter"/>
-    </route>
-  </camel:camelContext>
-
-  <bean id="myTransform" class="org.apache.servicemix.examples.camel.MyTransform">
-    <property name="prefix" value="${prefix}"/>
-  </bean>
-   
-    <osgix:cm-properties id="preProps" persistent-id="org.apache.servicemix.examples">
-        <prop key="prefix">MyTransform</prop>
-    </osgix:cm-properties>
-
-    <ctx:property-placeholder properties-ref="preProps" />
-
-</beans>
diff --git a/trunk/examples/camel/README.txt b/trunk/examples/camel/README.txt
deleted file mode 100644
index ad6683d..0000000
--- a/trunk/examples/camel/README.txt
+++ /dev/null
@@ -1,132 +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.
- */
-
-CAMEL JAVA JBI EXAMPLE
-======================
-
-Purpose
--------
-Write a simple Camel EIP route in Java, and deploy it as a JBI
-component.
-
-
-Explanation
------------
-The Camel route is written in Java and can be found in the 
-MyRouteBuilder.java file, which is located in the following
-directory of this example:
-
-  camel-simple-su/src/main/java/org/apache/servicemix/samples
-  
-The contents of the MyRouteBuilder.java file can be described as
-follows:
-
-- Defines a MyRouteBuilder class that extends
-  org.apache.camel.builder.RouteBuilder.
-
-- Writes a configure() method that sets up the route.
-
-- The route does the following:
-
-  1. Uses the Camel timer component to create a heartbeat event
-     every second.
-  2. Sets the event message body to "Hello World".
-  3. Forwards the message to a logger.
-
-
-The Camel configuration file, camel-context.xml, specifies the name of
-the Java package containing one or more RouteBuiler classes. When the
-application is deployed, Camel searches the specified Java package for
-any classes that inherit from RouteBuilder. All such classes are
-instantiated and registered with the CamelContext object, thereby
-installing and activating the Java routes. The camel-content.xml
-configuration file is located in the following directory of this
-example:
-
-  camel-simple-su/src/main/resources 
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-
-   For more information, see the README in the top-level
-   examples directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Building and Deploying
-----------------------
-To build this example, run the following command (from the directory
-that contains this README):
-
-  mvn install
-  
-
-If all of the required OSGi bundles are available in your local
-Maven repository, the example will build quickly. Otherwise it
-may take some time for Maven to download everything it needs.
-
-Once complete, you will find the example service assembly, called
-camel-sa-${version}.zip, in the camel-sa/target directory.
-
-You can deploy the example in two ways:
-
-- Using Hot Deployment
-  --------------------
-  
-  Copy the camel-sa/target/camel-sa-${version}.zip to the 
-  <servicemix_home>/deploy directory.
-
-
-- Using the ServiceMix Console
-  ----------------------------
-
-  Enter the following command:
-  
-  osgi:install -s mvn:org.apache.servicemix.examples.camel/camel-sa/${version}/zip
-
-
-Once deployed, you can view the following message in the
-log file in the data/log directory of your ServiceMix
-installation, or by typing 'log:display' in the ServiceMix
-console:
-
-  Exchange[BodyType:String, Body:Hello World!]
-  
-
-Changing the Example
---------------------
-If you want to change the code or configuration in this example,
-use 'mvn install' to rebuild the JBI Service Assembly zip, and
-deploy it as described above.
-
-
-More Information
-----------------
-For more information on running this example, see:
-  
-http://servicemix.apache.org/camel-example.html
diff --git a/trunk/examples/camel/camel-sa/pom.xml b/trunk/examples/camel/camel-sa/pom.xml
deleted file mode 100644
index 555d466..0000000
--- a/trunk/examples/camel/camel-sa/pom.xml
+++ /dev/null
@@ -1,57 +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.examples</groupId>
-        <artifactId>camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.camel</groupId>
-    <artifactId>camel-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-camel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.camel</groupId>
-            <artifactId>camel-simple-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/camel/camel-simple-su/pom.xml b/trunk/examples/camel/camel-simple-su/pom.xml
deleted file mode 100644
index 9e3b9d3..0000000
--- a/trunk/examples/camel/camel-simple-su/pom.xml
+++ /dev/null
@@ -1,66 +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.examples</groupId>
-        <artifactId>camel</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.camel</groupId>
-    <artifactId>camel-simple-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel :: Camel Simple SU</name>
-    
-    <properties>
-        <componentName>servicemix-camel</componentName>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-camel</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/camel/camel-simple-su/src/main/java/org/apache/servicemix/samples/MyRouteBuilder.java b/trunk/examples/camel/camel-simple-su/src/main/java/org/apache/servicemix/samples/MyRouteBuilder.java
deleted file mode 100644
index 39cf220..0000000
--- a/trunk/examples/camel/camel-simple-su/src/main/java/org/apache/servicemix/samples/MyRouteBuilder.java
+++ /dev/null
@@ -1,33 +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.samples;

-

-import org.apache.camel.builder.RouteBuilder;

-

-/**

- * A Camel Router

- * 

- * @version $Revision: 1.1 $

- */

-public class MyRouteBuilder extends RouteBuilder {

-    public void configure() throws Exception {

-

-        from("timer:myTimerEvent?fixedRate=true")

-            .setBody(constant("Hello World!"))

-            .to("log:org.apache.servicemix.samples.camel.ExampleCamelRoute");

-    }

-}

diff --git a/trunk/examples/camel/camel-simple-su/src/main/resources/camel-context.xml b/trunk/examples/camel/camel-simple-su/src/main/resources/camel-context.xml
deleted file mode 100644
index 14d2e51..0000000
--- a/trunk/examples/camel/camel-simple-su/src/main/resources/camel-context.xml
+++ /dev/null
@@ -1,31 +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

-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd

-    ">

-

-      <camelContext xmlns="http://camel.apache.org/schema/spring">

-        <package>org.apache.servicemix.samples</package>

-      </camelContext>

-

-</beans>

diff --git a/trunk/examples/camel/pom.xml b/trunk/examples/camel/pom.xml
deleted file mode 100644
index 23b3ee7..0000000
--- a/trunk/examples/camel/pom.xml
+++ /dev/null
@@ -1,50 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>camel</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Camel</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>camel-simple-su</module>
-        <module>camel-sa</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-camel-nmr/README.txt b/trunk/examples/cxf-camel-nmr/README.txt
deleted file mode 100644
index db824bf..0000000
--- a/trunk/examples/cxf-camel-nmr/README.txt
+++ /dev/null
@@ -1,196 +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.
- */
-
-CXF, CAMEL and NMR EXAMPLE
-==========================
-
-Purpose
--------
-Create a Camel route that transforms a message, then passes it to a
-CXF web service via the NMR.
-
-
-Explanation
------------
-The Camel route is defined in the beans.xml file that is located
-in the src/main/resources/META-INF/spring directory of this example.
-
-The route is defined in the <route> element and can be explained
-as follows:
-
-1. A message flow is triggered every five seconds.
-
-2. It is sent to the MyTransform bean, which adds a SOAP message.
-
-3. It is sent via the NMR to the HelloWorld web service.
-
-4. Responses are routed to the display method of the MyTransform
-   class.
-
-The web service is defined as follows:
-
- <jaxws:endpoint id="helloWorld"
-       implementor="org.apache.servicemix.examples.cxfcamel.HelloWorldImpl"
-       address="nmr:HelloWorld" />
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-  
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-camel-nmr
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-Once the example is running, periodic SOAP messages are displayed by
-the transform method of the MyTransform class. These messages are routed
-to the CXF endpoint, and the responses are routed to the display method
-of the MyTransform class. You should see output similar to the following
-being logged to your console screen:
-
->>>> <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Body><ns1:sayHi xmlns:ns1="http://cxf.examples.servicemix.apache.org/
-"><arg0>Guillaume</arg0></ns1:sayHi></soap:Body></soap:Envelope>
-<<<< <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Body><ns2:sayHiResponse xmlns:ns2="http://cxfcamel.examples.
-servicemix.apache.org/"><return>Hello Guillaume</return>
-</ns2:sayHiResponse></soap:Body></soap:Envelope>
-
-For information on how to stop and/or uninstall the example,
-see "Stopping and Uninstalling the Example" below.
-  
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-cxf-camel-nmr
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-cxf-camel-nmr
-
-2. Build the example by opening a command prompt, changing directory to
-   examples/cxf-camel-nmr (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local Maven
-   repository, the example will build very quickly. Otherwise it may
-   take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-camel-nmr
-       
-   It makes use of the ServiceMix features facility. For more information
-   about the features facility, see the README.txt file in the examples
-   parent directory.
-   
-Once the example is running, periodic SOAP messages are displayed by
-the transform method of the MyTransform class. These messages are routed
-to the CXF endpoint, and the responses are routed to the display method
-of the MyTransform class. You should see the messages displayed on your
-console.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console (Note, the text you are typing will intermingle
-with the output being logged. This is nothing to worry about.):
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [165] [Active     ] [Started] [  60] Apache ServiceMix Example :: CXF-Camel NMR (4.1.0)
-
-In this case, the bundle ID is 165.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 165
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-cxf-camel-nmr
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
\ No newline at end of file
diff --git a/trunk/examples/cxf-camel-nmr/pom.xml b/trunk/examples/cxf-camel-nmr/pom.xml
deleted file mode 100644
index e5bb36a..0000000
--- a/trunk/examples/cxf-camel-nmr/pom.xml
+++ /dev/null
@@ -1,75 +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/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-camel-nmr</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF-Camel NMR</name>
-    <description>CXF Example using the CXF NMR integration</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>
-                           javax.jws,javax.wsdl,META-INF.cxf,META-INF.cxf.transport.nmr,
-                           org.apache.cxf.bus,org.apache.servicemix.camel.nmr,
-                           org.apache.servicemix.cxf.transport.nmr,
-                           org.apache.servicemix.nmr.api,org.apache.servicemix.nmr.api.event,org.apache.servicemix.nmr.api.internal,
-                           org.springframework.beans.factory.config, *
-                        </Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.cxfcamel</Private-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/HelloWorld.java b/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/HelloWorld.java
deleted file mode 100644
index d1216dd..0000000
--- a/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/HelloWorld.java
+++ /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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxfcamel;
-
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld {
-    String sayHi(String text);
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/HelloWorldImpl.java b/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/HelloWorldImpl.java
deleted file mode 100644
index d66c691..0000000
--- a/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxfcamel;
-
-import javax.jws.WebService;
-
-@WebService(endpointInterface = "org.apache.servicemix.examples.cxfcamel.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java b/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java
deleted file mode 100644
index 1648306..0000000
--- a/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java
+++ /dev/null
@@ -1,66 +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.examples.cxfcamel;
-
-import java.util.logging.Logger;
-
-import javax.xml.transform.Source;
-
-import org.apache.camel.converter.jaxp.StringSource;
-import org.apache.camel.converter.jaxp.XmlConverter;
-
-/**
- * @version $Revision: 640450 $
- */
-public class MyTransform  {
-
-    private static final transient Logger LOG = Logger.getLogger(MyTransform.class.getName());
-    private boolean verbose = true;
-    private String value;
-
-    public Object transform(Object body) {
-        if (verbose) {
-            System.out.println(">>>> " + value);
-        }
-        LOG.info(">>>> " + value);
-        return new StringSource(value);
-    }
-
-    public void display(Source body) throws Exception {
-        String str = new XmlConverter().toString(body);
-        if (verbose) {
-            System.out.println("<<<< " + str);
-        }
-        LOG.info("<<<< " + str);
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
diff --git a/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF b/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 69b54b5..0000000
--- a/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.servicemix.examples.cxfcamel
-Bundle-Version: 1.0.0.SNAPSHOT
-Import-Package: META-INF.cxf,META-INF.cxf.osgi,META-INF.cxf.transport.nmr,javax.jws
diff --git a/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 260de63..0000000
--- a/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,56 +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.
--->
-<!-- START SNIPPET: beans -->
-<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="http://camel.apache.org/schema/spring"
-       xmlns:jaxws="http://cxf.apache.org/jaxws"
-       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/schema/spring/camel-spring.xsd
-       http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
-    <import resource="classpath:org/apache/servicemix/camel/nmr/camel-nmr.xml" />
-
-    <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
-        <!-- Route periodically sent events into the NMR -->
-        <route>
-            <from uri="timer://myTimer?fixedRate=true&amp;period=5000&amp;exchangePattern=InOut" />
-            <bean ref="myTransform" method="transform"/>
-            <to uri="nmr:HelloWorld"/>
-            <bean ref="myTransform" method="display" />
-        </route>
-    </camel:camelContext>
-
-    <bean id="myTransform" class="org.apache.servicemix.examples.cxfcamel.MyTransform">
-        <property name="value"><value><![CDATA[<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><ns1:sayHi xmlns:ns1="http://cxfcamel.examples.servicemix.apache.org/"><arg0>Guillaume</arg0></ns1:sayHi></soap:Body></soap:Envelope>]]></value></property>
-    </bean>
-
-    <jaxws:endpoint id="helloWorld"
-                    implementor="org.apache.servicemix.examples.cxfcamel.HelloWorldImpl"
-                    address="nmr:HelloWorld" />
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/cxf-jaxrs/README.txt b/trunk/examples/cxf-jaxrs/README.txt
deleted file mode 100644
index 513f516..0000000
--- a/trunk/examples/cxf-jaxrs/README.txt
+++ /dev/null
@@ -1,263 +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.
- */
-
-CXF JAX-RS EXAMPLE
-==================
-
-Purpose
--------
-Create a RESTful JAX-RS web service using CXF and expose it with the 
-OSGi HTTP Service.
-
-
-Explanation
------------
-The web service is implemented in the CustomerService.java file, which is
-located in the src/main/java/org/apache/servicemix/examples/cxf/jaxrs
-directory of this example. It contains annotations indicating what URIs
-and HTTP methods to use when accessing the resource. For information
-on how to write RESTful web services, please refer to the Apache CXF
-documentation.
-
-The beans.xml file, located in the src/main/resources/META-INF/
-spring directory:
-
-1. Imports the configuration files needed to enable CXF to support
-   JAX-RS and to use the OSGi HTTP service.
-
-2. Configures the web service, as follows:
-
-    <jaxrs:server id="customerService" address="/crm">
-        <jaxrs:serviceBeans>
-            <ref bean="customerSvc"/>
-        </jaxrs:serviceBeans>
-    </jaxrs:server>
-
-    <bean id="customerSvc" class=" org.apache.servicemix.examples.cxf.jaxrs.CustomerService"/>
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-  
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-jaxrs
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-Running a Client
-----------------
-
-You can browse WSDL at:
-
-http://localhost:8181/cxf/crm/customerservice?_wadl&_type=xml
-
-or
-
-http://localhost:8181/cxf/crm?_wadl&_type=xml
-
-The latter URI can be used to see the desription of multiple root
-resource classes.
-
-You can see the services listing at http://localhost:8181/cxf.
-
-You can make invocations on the web service in several ways, including
-using a web client, using a Java client and using a command-line
-utility such a curl or Wget. See below for more details.
-
-(a) To run a web client:
-    -------------------
-Open a browser and go to the following URL:
-
-   http://localhost:8181/cxf/crm/customerservice/customers/123
-
-It should display an XML representation for customer 123.
-
-Note, if you use Safari, right click the window and select 'Show Source'.
-
-(b) To run a Java client:
-    --------------------
-- Change to the <servicemix_home>/examples/cxf-jaxrs
-  directory.
-
-- Run the following command:
-    
-    mvn compile exec:java
- 
-  It makes a sequence of RESTful invocations and displays the
-  results.
-
-(c) To run a command-line utility:
-    -----------------------------
-You can use a command-line utility, such as curl or Wget, to make 
-the invocations. For example, try using curl as follows:
-
-- Open a command prompt and change directory to
-  <servicemix_home>/examples/cxf-jaxrs.
-  
-- Run the following curl commands:
-
-  # Create a customer
-  #
-  #
-  curl -X POST -T src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/add_customer.xml -H "Content-Type: text/xml" http://localhost:8181/cxf/crm/customerservice/customers
-
-  # Retrieve the customer instance with id 123
-  #
-  curl http://localhost:8181/cxf/crm/customerservice/customers/123
- 
-  # Update the customer instance with id 123
-  #
-  curl -X PUT -T src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/update_customer.xml -H "Content-Type: text/xml" http://localhost:8181/cxf/crm/customerservice/customers
-  
-  # Delete the customer instance with id 123
-  #
-  curl -X DELETE http://localhost:8181/cxf/crm/customerservice/customers/123
-
-
-Changing /cxf servlet alias
----------------------------
-By default CXF Servlet is assigned a '/cxf' alias. You can
-change it in a couple of ways
-
-a. Add org.apache.cxf.osgi.cfg to the /etc directory and set the
-   'org.apache.cxf.servlet.context' property, for example:
-   
-   org.apache.cxf.servlet.context=/custom
-
-b. Use shell config commands, for example:
-
-     config:edit org.apache.cxf.osgi   
-     config:propset org.apache.cxf.servlet.context /super
-     config:update
-  
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-cxf-jaxrs
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-cxf-jaxrs
-
-2. Build the example by opening a command prompt, changing directory to
-   examples/cxf-jaxrs (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local Maven
-   repository, the example will build very quickly. Otherwise it may
-   take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-jaxrs
-       
-   It makes use of the ServiceMix features facility. For more information
-   about the features facility, see the README.txt file in the examples
-   parent directory.
-     
-See "Running a Client" above for information on how to make invocations
-on the web service.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console (Note, the text you are typing will intermingle
-with the output being logged. This is nothing to worry about.):
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [159] [Active     ] [Started] [  60] Apache ServiceMix Example :: CXF JAX-RS OSGI (4.1.0)
-
-In this case, the bundle ID is 159.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 159
-
-To uninstall the example, enter one of the following commands at
-the ServiceMix console:
-
-  features:uninstall examples-cxf-jaxrs
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/cxf-jaxrs/pom.xml b/trunk/examples/cxf-jaxrs/pom.xml
deleted file mode 100644
index b53595a..0000000
--- a/trunk/examples/cxf-jaxrs/pom.xml
+++ /dev/null
@@ -1,97 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-jaxrs</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF JAX-RS OSGI</name>
-    <description>CXF Example using JAX-RS</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.ws.rs,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.binding,
-                            org.apache.cxf.jaxrs.utils,
-                            org.apache.cxf.transport.http_osgi,
-                            org.springframework.beans.factory.config,
-                            org.apache.servicemix.examples.cxf.jaxrs,
-                            org.apache.commons.httpclient,
-                            org.apache.commons.httpclient.methods
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <Export-Package>org.apache.servicemix.examples.cxf.jaxrs
-                        </Export-Package>
-                        <DynamicImport-Package>javax.ws.rs.*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.examples.cxf.jaxrs.client.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Customer.java b/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Customer.java
deleted file mode 100644
index d96d7ff..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Customer.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.examples.cxf.jaxrs;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Customer")
-public class Customer {
-    private long id;
-    private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java b/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java
deleted file mode 100644
index c8fab24..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java
+++ /dev/null
@@ -1,118 +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.examples.cxf.jaxrs;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-
-@Path("/customerservice/")
-public class CustomerService {
-    long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
-
-    public CustomerService() {
-        init();
-    }
-
-    @GET
-    @Path("/customers/{id}/")
-    @Produces("application/xml")
-    public Customer getCustomer(@PathParam("id") String id) {
-        System.out.println("----invoking getCustomer, Customer id is: " + id);
-        long idNumber = Long.parseLong(id);
-        Customer c = customers.get(idNumber);
-        return c;
-    }
-
-    @PUT
-    @Path("/customers/")
-    public Response updateCustomer(Customer customer) {
-        System.out.println("----invoking updateCustomer, Customer name is: " + customer.getName());
-        Customer c = customers.get(customer.getId());
-        Response r;
-        if (c != null) {
-            customers.put(customer.getId(), customer);
-            r = Response.ok().build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
-    }
-
-    @POST
-    @Path("/customers/")
-    public Response addCustomer(Customer customer) {
-        System.out.println("----invoking addCustomer, Customer name is: " + customer.getName());
-        customer.setId(++currentId);
-
-        customers.put(customer.getId(), customer);
-
-        return Response.ok().type("application/xml").entity(customer).build();
-    }
-
-    @DELETE
-    @Path("/customers/{id}/")
-    public Response deleteCustomer(@PathParam("id") String id) {
-        System.out.println("----invoking deleteCustomer, Customer id is: " + id);
-        long idNumber = Long.parseLong(id);
-        Customer c = customers.get(idNumber);
-
-        Response r;
-        if (c != null) {
-            r = Response.ok().build();
-            customers.remove(idNumber);
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
-    }
-
-    @Path("/orders/{orderId}/")
-    public Order getOrder(@PathParam("orderId") String orderId) {
-        System.out.println("----invoking getOrder, Order id is: " + orderId);
-        long idNumber = Long.parseLong(orderId);
-        Order c = orders.get(idNumber);
-        return c;
-    }
-
-    final void init() {
-        Customer c = new Customer();
-        c.setName("John");
-        c.setId(123);
-        customers.put(c.getId(), c);
-
-        Order o = new Order();
-        o.setDescription("order 223");
-        o.setId(223);
-        orders.put(o.getId(), o);
-    }
-
-}
diff --git a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java b/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java
deleted file mode 100644
index ea19c73..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.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.examples.cxf.jaxrs;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Order")
-public class Order {
-    private long id;
-    private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
-
-    public Order() {
-        init();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String d) {
-        this.description = d;
-    }
-
-    @GET
-    @Path("products/{productId}/")
-    @Produces("application/xml")
-    public Product getProduct(@PathParam("productId")int productId) {
-        System.out.println("----invoking getProduct with id: " + productId);
-        Product p = products.get(new Long(productId));
-        return p;
-    }
-
-    final void init() {
-        Product p = new Product();
-        p.setId(323);
-        p.setDescription("product 323");
-        products.put(p.getId(), p);
-    }
-}
diff --git a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Product.java b/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Product.java
deleted file mode 100644
index cfd8b8c..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Product.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.examples.cxf.jaxrs;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Product")
-public class Product {
-    private long id;
-    private String description;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String d) {
-        this.description = d;
-    }
-}
diff --git a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/client/Client.java b/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/client/Client.java
deleted file mode 100644
index b3962f5..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/client/Client.java
+++ /dev/null
@@ -1,112 +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.examples.cxf.jaxrs.client;
-
-import java.io.File;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.FileRequestEntity;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-
-public final class Client {
-
-    private Client() {
-    }
-
-    public static void main(String args[]) throws Exception {
-        // Sent HTTP GET request to query all customer info
-
-        // Sent HTTP GET request to query customer info
-        System.out.println("Sent HTTP GET request to query customer info");
-        URL url = new URL("http://localhost:8181/cxf/crm/customerservice/customers/123");
-        InputStream in = url.openStream();
-        System.out.println(getStringFromInputStream(in));
-
-        // Sent HTTP GET request to query sub resource product info
-        System.out.println("\n");
-        System.out.println("Sent HTTP GET request to query sub resource product info");
-        url = new URL("http://localhost:8181/cxf/crm/customerservice/orders/223/products/323");
-        in = url.openStream();
-        System.out.println(getStringFromInputStream(in));
-
-        // Sent HTTP PUT request to update customer info
-        System.out.println("\n");
-        System.out.println("Sent HTTP PUT request to update customer info");
-        Client client = new Client();
-        String inputFile = client.getClass().getResource("update_customer.xml").getFile();
-        File input = new File(inputFile);
-        PutMethod put = new PutMethod("http://localhost:8181/cxf/crm/customerservice/customers");
-        RequestEntity entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
-        put.setRequestEntity(entity);
-        HttpClient httpclient = new HttpClient();
-
-        try {
-            int result = httpclient.executeMethod(put);
-            System.out.println("Response status code: " + result);
-            System.out.println("Response body: ");
-            System.out.println(put.getResponseBodyAsString());
-        } finally {
-            // Release current connection to the connection pool once you are
-            // done
-            put.releaseConnection();
-        }
-
-        // Sent HTTP POST request to add customer
-        System.out.println("\n");
-        System.out.println("Sent HTTP POST request to add customer");
-        inputFile = client.getClass().getResource("add_customer.xml").getFile();
-        input = new File(inputFile);
-        PostMethod post = new PostMethod("http://localhost:8181/cxf/crm/customerservice/customers");
-        post.addRequestHeader("Accept" , "text/xml");
-        entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
-        post.setRequestEntity(entity);
-        httpclient = new HttpClient();
-
-        try {
-            int result = httpclient.executeMethod(post);
-            System.out.println("Response status code: " + result);
-            System.out.println("Response body: ");
-            System.out.println(post.getResponseBodyAsString());
-        } finally {
-            // Release current connection to the connection pool once you are
-            // done
-            post.releaseConnection();
-        }
-
-        System.out.println("\n");
-        System.exit(0);
-    }
-
-    private static String getStringFromInputStream(InputStream in) throws Exception {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        int c = 0;
-        while ((c = in.read()) != -1) {
-            bos.write(c);
-        }
-        in.close();
-        bos.close();
-        return bos.toString();
-    }
-
-}
diff --git a/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 762db97..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-        xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
-http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxrs:server id="customerService" address="/crm">
-        <jaxrs:serviceBeans>
-            <ref bean="customerSvc"/>
-        </jaxrs:serviceBeans>
-    </jaxrs:server>
-
-    <bean id="customerSvc" class=" org.apache.servicemix.examples.cxf.jaxrs.CustomerService"/>
-
-</beans>
diff --git a/trunk/examples/cxf-jaxrs/src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/add_customer.xml b/trunk/examples/cxf-jaxrs/src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/add_customer.xml
deleted file mode 100644
index 0b2af7f..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/add_customer.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Customer>
-  <name>Jack</name>
-</Customer> 
diff --git a/trunk/examples/cxf-jaxrs/src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/update_customer.xml b/trunk/examples/cxf-jaxrs/src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/update_customer.xml
deleted file mode 100644
index 9bdb64b..0000000
--- a/trunk/examples/cxf-jaxrs/src/main/resources/org/apache/servicemix/examples/cxf/jaxrs/client/update_customer.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Customer>
-  <name>Mary</name>
-  <id>123</id>
-</Customer> 
diff --git a/trunk/examples/cxf-nmr/README.txt b/trunk/examples/cxf-nmr/README.txt
deleted file mode 100644
index 5ac1175..0000000
--- a/trunk/examples/cxf-nmr/README.txt
+++ /dev/null
@@ -1,148 +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.
- */
-
-CXF NMR Example
-===============
-
-Purpose
--------
-Publish a web service written in JAX-WS to the NMR.
-
-
-Explanation
------------
-The web service is a simple JAX-WS web service called HelloWorld. The 
-interface and the implementation are located in the src/main/java/org/
-apache/servicemix/examples/cxf directory of this example.
-
-The beans.xml file, located in the src/main/resources/META-INF/spring
-directory:
-
-1. Imports the configuration files needed to enable CXF and the NMR
-   work together.
-   
-2. Configures the web services and adds it to the NMR:
-
-  <jaxws:endpoint id="helloWorld"
-	 implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-	 address="nmr:HelloWorld" />
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-nmr
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-Verifying the Web Service Deployed to the NMR
----------------------------------------------
-You can verify that the web service was deployed to the NMR by
-looking at the log file in the data/log directory of your
-ServiceMix installation, or by typing the following command
-in the ServiceMix console:
-
-  log:display
-
-You should see an entry similar to the following:
-
-10:20:56,169 | INFO  | xtenderThread-76 | ConfigurerImpl                   |
-ransport.nmr.NMRTransportFactory  127 | Could not determine bean name for
-instance of class org.apache.servicemix.cxf.transport.nmr.NMRDestination.
-10:20:56,171 | INFO  | xtenderThread-76 | ServerImpl                       |
-e.cxf.frontend.ServerFactoryBean  118 | Setting the server's publish address
-to be nmr:HelloWorld
-
-Uninstalling the Example
-------------------------
-To uninstall the example, enter the following command in the ServiceMix
-console:
-
-  features:uninstall examples-cxf-nmr
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must uninstall it as described in "Uninstalling
-   the Example".
-   
-2. Build the example by opening a command prompt, changing directory to
-   examples/cxf-nmr (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local Maven
-   repository, the example will build very quickly. Otherwise it may
-   take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-nmr
-       
-   It makes use of the ServiceMix features facility. For more information
-   about the features facility, see the README.txt file in the examples
-   parent directory.
-
-To ensure your example deployed successfully, follow the instructions
-outlined in "Verifying the Web Service Deployed to the NMR" above.
diff --git a/trunk/examples/cxf-nmr/pom.xml b/trunk/examples/cxf-nmr/pom.xml
deleted file mode 100644
index 56cec01..0000000
--- a/trunk/examples/cxf-nmr/pom.xml
+++ /dev/null
@@ -1,66 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-nmr</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF NMR</name>
-    <description>CXF Example using the NMR integration</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>
-                            javax.jws, javax.wsdl,
-                            META-INF.cxf,META-INF.cxf.transport.nmr,
-                            org.springframework.beans.factory.config,
-                            org.apache.servicemix.cxf.transport.nmr,
-                            org.apache.servicemix.nmr.api,org.apache.servicemix.nmr.api.event,org.apache.servicemix.nmr.api.internal
-                        </Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java b/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
deleted file mode 100644
index 14dad3a..0000000
--- a/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
+++ /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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld {
-    String sayHi(String text);
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java b/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
deleted file mode 100644
index 85fd25f..0000000
--- a/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index cd18d4c..0000000
--- a/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
-
-    <jaxws:endpoint id="helloWorld"
-                    implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-                    address="nmr:HelloWorld" />
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/cxf-osgi/README.txt b/trunk/examples/cxf-osgi/README.txt
deleted file mode 100644
index 6c50148..0000000
--- a/trunk/examples/cxf-osgi/README.txt
+++ /dev/null
@@ -1,243 +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.
- */
-
-CXF OSGi HTTP WEB SERVICE
-=========================
-
-Purpose
--------
-Create a web service with CXF and expose it through the OSGi HTTP
-Service.
-
-
-Explanation
------------
-The web service is a simple JAX-WS web service called HelloWorld. The 
-interface and the implementation are located in the src/main/java/org/
-apache/servicemix/examples/cxf directory of this example.
-
-The beans.xml file, located in the src/main/resources/META-INF/spring
-directory:
-
-1. Imports the configuration files needed to enable CXF and OSGi work
-   together.
-
-2. Configures the web service endpoint as follows:
-
-  <jaxws:endpoint id="helloWorld"
-         implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-         address="/HelloWorld"/>
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-osgi
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-To view the service WSDL, open your browser and go to the following
-URL:
-
-  http://localhost:8181/cxf/HelloWorld?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html, which is located in the same directory as
-   this README file, in your favorite browser.
-
-2. Click the Send button to send a request.
-
-   Once the request has been successfully sent, a response similar
-   to the following should appear in the right-hand panel of the
-   web page:
-   
-   STATUS: 200
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><ns2:sayHiResponse xmlns:ns2="http://cxf.examples.
-     servicemix.apache.org/"><return>Hello John Doe</return>
-     </ns2:sayHiResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/cxf-osgi
-   directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-
-   If the client request is successful, a response similar to the
-   following should appear in the ServiceMix console:
-
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><ns2:sayHiResponse xmlns:ns2="http://cxf.examples.
-       servicemix.apache.org/"><return>Hello John Doe</return>
-       </ns2:sayHiResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-
-Changing /cxf servlet alias
----------------------------
-By default CXF Servlet is assigned a '/cxf' alias. You can
-change it in a couple of ways
-
-a. Add org.apache.cxf.osgi.cfg to the /etc directory and set
-   the 'org.apache.cxf.servlet.context' property, for example:
-   
-     org.apache.cxf.servlet.context=/custom
-   
-b. Use shell config commands, for example :
-   
-     config:edit org.apache.cxf.osgi   
-     config:propset org.apache.cxf.servlet.context /super
-     config:update
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-cxf-osgi
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-cxf-osgi
-
-   
-2. Build the example by opening a command prompt, changing directory to
-   examples/cxf-osgi (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local
-   Maven repository, the example will build very quickly. Otherwise
-   it may take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-osgi
-       
-   It makes use of the ServiceMix features facility. For more
-   information about the features facility, see the README.txt file
-   in the examples parent directory.
-
-To view the service WSDL, open your browser and go to the following
-URL:
-
-  http://localhost:8181/cxf/HelloWorld?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-You can try running a client against your service by following the
-instructions in the "Running a Client" section above.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-at the ServiceMix console:
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [170] [Active     ] [Started] [  60] Apache ServiceMix Example :: CXF OSGi (4.2.0.0)
-
-In this case, the bundle ID is 170.
-
-To stop the example, enter the following command at the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 170
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-cxf-osgi
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/cxf-osgi/client.html b/trunk/examples/cxf-osgi/client.html
deleted file mode 100644
index 1b8e145..0000000
--- a/trunk/examples/cxf-osgi/client.html
+++ /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.
-
--->
-<html>
-<head>
-<title>ServiceMix 4 CXF-OSGi Example</title>
-<script type="text/javascript">
-var urlToOpen = "http://localhost:8181/cxf/HelloWorld"; //default URL to open
-
-function getHTTPObject() {
-  var xmlhttp = false;
-
-  /* Compilation conditionnelle d'IE */
-  /* Check if we are using IE */
-  /*@cc_on
-  @if (@_jscript_version >= 5)
-     try {
-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-     } catch (e) {
-        try {
-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-        } catch (E) {
-           xmlhttp = false;
-        }
-     }
-  @else
-     xmlhttp = false;
-  @end @*/
-
-  /* on essaie de créer l'objet si ce n'est pas déjà fait */
-  /* Create the xmlhttp object if it is not yet defined */
-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-     try {
-        xmlhttp = new XMLHttpRequest();
-     } catch (e) {
-        xmlhttp = false;
-     }
-  }
-
-  if (xmlhttp) {
-     /* on définit ce qui doit se passer quand la page répondra */
-     /* Define the callback function for the response */
-     xmlhttp.onreadystatechange=function() {
-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */
-           var response = document.getElementById("response");
-           var responseStatus = "";
-           try {
-             responseStatus = xmlhttp.status + "";
-           } catch (e) {
-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";
-           }
-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;
-        }
-     }
-  }
-  return xmlhttp;
-}
-
-function send() {
-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {
-    // use user entry if it is not the empty string
-    urlToOpen = document.getElementById("urlToOpen").value;
-  }  
-  var xmlhttp = getHTTPObject();
-  if (!xmlhttp) {
-    alert('cound not create XMLHttpRequest object');
-    return;
-  }
-  var request = document.getElementById("request");
-  var response = document.getElementById("response");
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
-  } catch (e) {
-  }
-  try {
-    xmlhttp.open("POST", urlToOpen, true);
-  } catch (e) {
-    alert('error opening');
-  }
-  xmlhttp.send(request.value);
-}
-
-</script>
-</head>
-
-<body>
-
-<h1>ServiceMix 4 CXF-OSGi Example</h1>
-
-<p>Welcome to the CXF-OSGi example for ServiceMix 4</p>
-
-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 
-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>
-  
-<table>
-  <tr>
-    <td>
-  <textarea id="request" style="width:600px;height:400px"><?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-  <soap:Body>
-    <ns2:sayHi xmlns:ns2="http://cxf.examples.servicemix.apache.org/">
-      <arg0>John Doe</arg0>
-    </ns2:sayHi>
-  </soap:Body>
-</soap:Envelope>
-
-  </textarea>
-    </td>
-    <td>
-  <textarea id="response" style="width:600px;height:400px">
-  </textarea>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2>
-  <input type="button" value="Send" onClick="send();"/>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/trunk/examples/cxf-osgi/pom.xml b/trunk/examples/cxf-osgi/pom.xml
deleted file mode 100644
index 82b6a74..0000000
--- a/trunk/examples/cxf-osgi/pom.xml
+++ /dev/null
@@ -1,87 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF OSGi</name>
-    <description>CXF example using OSGi instead of JBI</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.namespace,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.apache.servicemix.util,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <!-- <DynamicImport-Package>*</DynamicImport-Package> -->
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.cxf_osgi.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java b/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
deleted file mode 100644
index 14dad3a..0000000
--- a/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
+++ /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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld {
-    String sayHi(String text);
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java b/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
deleted file mode 100644
index 85fd25f..0000000
--- a/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java b/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java
deleted file mode 100644
index d875c2b..0000000
--- a/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java
+++ /dev/null
@@ -1,54 +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.samples.cxf_osgi;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8181/cxf/HelloWorld")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/samples/cxf_osgi/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-    }
-
-}
diff --git a/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 295a7f2..0000000
--- a/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxws:endpoint id="helloWorld"
-                    implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-                    address="/HelloWorld"/>
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/cxf-osgi/src/main/resources/org/apache/servicemix/samples/cxf_osgi/request.xml b/trunk/examples/cxf-osgi/src/main/resources/org/apache/servicemix/samples/cxf_osgi/request.xml
deleted file mode 100644
index 3381802..0000000
--- a/trunk/examples/cxf-osgi/src/main/resources/org/apache/servicemix/samples/cxf_osgi/request.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-  <soap:Body>
-    <ns2:sayHi xmlns:ns2="http://cxf.examples.servicemix.apache.org/">
-      <arg0>John Doe</arg0>
-    </ns2:sayHi>
-  </soap:Body>
-</soap:Envelope>
diff --git a/trunk/examples/cxf-ws-addressing/README.txt b/trunk/examples/cxf-ws-addressing/README.txt
deleted file mode 100644
index 4c47818..0000000
--- a/trunk/examples/cxf-ws-addressing/README.txt
+++ /dev/null
@@ -1,308 +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.
- */
-
-CXF WS-Addressing Example
-=========================
-
-Purpose
--------
-Use CXF to create a web service enabled for WS-Addressing and
-expose it through the OSGi HTTP Service.
-
-
-Explanation
------------
-This example is based on the WS-Addressing sample in Apache CXF
-(http://cxf.apache.org/). There is a more complete explanation
-of WS-Addressing in that sample's README.
-
-The WS-Addressing functionality is implemented as interceptors.
-It is configured in the beans.xml file, which is located in the
-src/main/resources/META-INF/spring directory of this example.
-The configuration can be explained as follows:
-
-1. The following entry adds the addressing interceptors (org.apache.
-   cxf.ws.addressing.MAPAggregator and org.apache.cxf.ws.addressing.
-   soap.MAPCodec) to the inbound and outbound interceptor chains.
-   The interceptors add the appropriate WS-Addressing headers to the
-   SOAP messages and remove them at the service end.
-
-  <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-  <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-
-    <!--bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="logInbound"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-    </bean--> 
-
-2. The following entry enables WS-Addressing for all services
-   on the bus:
-
-   <cxf:bus>
-       <cxf:features>
-           <wsa:addressing/>
-       </cxf:features>
-   </cxf:bus>
-
-In addition, the service WSDL, hello_world_addr.wsdl, includes
-WS-Addressing configuration as shown below:
-
-    <wsdl:service ... >
-        <wsdl:port ...>
-            <soap:address ... />
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-        </wsdl:port>
-    </wsdl:service>
-
-The WSDL file is located in the src/main/resources/wsdl
-directory of this example.
-
-The various clients send the request.xml file, located in src/main/
-resources/org/apache/servicemix/examples/cxf/wsaddressing. It
-contains SOAP request with some WS-Addressing headers set in it.
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-ws-addressing
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-To view the service WSDL, open your browser and go to the following
-URL:
-
-  http://localhost:8181/cxf/SoapContext/SoapPort?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html, which is located in the same directory as
-   this README file, in your favorite browser.
-
-2. Click the Send button to send a request.
-
-   Once the request has been successfully sent, you should receive
-   a SOAP message similar to the following as a response. It should
-   appear in the right-hand panel of the web page:
-   
-   STATUS: 200
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Header>
-       <Action xmlns="http://www.w3.org/2005/08/addressing">
-       http://apache.org/hello_world_soap_http/Greeter/sayHiResponse
-       </Action>
-       <MessageID xmlns="http://www.w3.org/2005/08/addressing">
-       urn:uuid:4352861b-3451-4ae8-b97f-11f7e2535807</MessageID>
-       <To xmlns="http://www.w3.org/2005/08/addressing">
-       http://www.w3.org/2005/08/addressing/anonymous</To>
-       <RelatesTo xmlns="http://www.w3.org/2005/08/addressing">
-       urn:uuid:10fb2ee6-43db-4d88-a3e5-6316f1763669</RelatesTo>
-     </soap:Header>
-     <soap:Body>
-       <sayHiResponse xmlns="http://apache.org/hello_world_soap_http/types">
-       <responseType>Bonjour</responseType>
-       </sayHiResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/cxf-ws-addressing
-   directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-
-   It makes an invocation with WS-Addressing headers and displays,
-   in the ServiceMix console, a response similar to that shown 
-   in the web client (see above).
-
-Changing /cxf servlet alias
----------------------------
-By default CXF Servlet is assigned a '/cxf' alias. You can
-change it in a couple of ways:
-
-a. Add org.apache.cxf.osgi.cfg to the /etc directory and
-   set the 'org.apache.cxf.servlet.context' property, for example:
-   
-     org.apache.cxf.servlet.context=/custom
-
-b. Use shell config commands, for example:
-
-     config:edit org.apache.cxf.osgi   
-     config:propset org.apache.cxf.servlet.context /super
-     config:update
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the
-   examples-cxf-ws-addressing feature by entering the following
-   command in the ServiceMix console:
-
-     features:uninstall examples-cxf-ws-addressing
-
-   
-2. Build the example by opening a command prompt, changing directory
-   to examples/cxf-ws-addressing (this example) and entering the
-   following Maven command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local
-   Maven repository, the example will build very quickly. Otherwise
-   it may take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-ws-addressing
-       
-   It makes use of the ServiceMix features facility. For more
-   information about the features facility, see the README.txt file
-   in the examples parent directory.
-
-To view the service WSDL, open your browser and go to the following
-URL:
-
-    http://localhost:8181/cxf/SoapContext/SoapPort?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-You can try running a client against your service by following the
-instructions in the "Running a Client" section above.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console (Note, the text you are typing will
-intermingle with the output being logged. This is nothing to worry
-about.):
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [171] [Active     ] [Started] [  60] Apache ServiceMix Example :: CXF WS-ADDRESSING OSGI (4.2.0)
-
-In this case, the bundle ID is 171.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 171
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-cxf-ws-addressing
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/cxf-ws-addressing/client.html b/trunk/examples/cxf-ws-addressing/client.html
deleted file mode 100644
index 4fe3431..0000000
--- a/trunk/examples/cxf-ws-addressing/client.html
+++ /dev/null
@@ -1,145 +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.
-
--->
-<html>
-<head>
-<title>ServiceMix 4 CXF-OSGi Example</title>
-<script type="text/javascript">
-var urlToOpen = "http://localhost:8181/cxf/SoapContext/SoapPort"; //default URL to open
-
-function getHTTPObject() {
-  var xmlhttp = false;
-
-  /* Compilation conditionnelle d'IE */
-  /* Check if we are using IE */
-  /*@cc_on
-  @if (@_jscript_version >= 5)
-     try {
-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-     } catch (e) {
-        try {
-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-        } catch (E) {
-           xmlhttp = false;
-        }
-     }
-  @else
-     xmlhttp = false;
-  @end @*/
-
-  /* on essaie de créer l'objet si ce n'est pas déjà fait */
-  /* Create the xmlhttp object if it is not yet defined */
-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-     try {
-        xmlhttp = new XMLHttpRequest();
-     } catch (e) {
-        xmlhttp = false;
-     }
-  }
-
-  if (xmlhttp) {
-     /* on définit ce qui doit se passer quand la page répondra */
-     /* Define the callback function for the response */
-     xmlhttp.onreadystatechange=function() {
-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */
-           var response = document.getElementById("response");
-           var responseStatus = "";
-           try {
-             responseStatus = xmlhttp.status + "";
-           } catch (e) {
-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";
-           }
-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;
-        }
-     }
-  }
-  return xmlhttp;
-}
-
-function send() {
-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {
-    // use user entry if it is not the empty string
-    urlToOpen = document.getElementById("urlToOpen").value;
-  }  
-  var xmlhttp = getHTTPObject();
-  if (!xmlhttp) {
-    alert('cound not create XMLHttpRequest object');
-    return;
-  }
-  var request = document.getElementById("request");
-  var response = document.getElementById("response");
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
-  } catch (e) {
-  }
-  try {
-    xmlhttp.open("POST", urlToOpen, true);
-  } catch (e) {
-    alert('error opening');
-  }
-  xmlhttp.send(request.value);
-}
-
-</script>
-</head>
-
-<body>
-
-<h1>ServiceMix 4 CXF WS-Addressing Example</h1>
-
-<p>Welcome to the CXF WS-Addressing example for ServiceMix 4</p>
-
-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 
-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>
-  
-<table>
-  <tr>
-    <td>
-  <textarea id="request" style="width:600px;height:400px"><?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-   <soap:Header>
-      <MessageID xmlns="http://www.w3.org/2005/08/addressing">urn:uuid:10fb2ee6-43db-4d88-a3e5-6316f1763669</MessageID>
-      <To xmlns="http://www.w3.org/2005/08/addressing">http://localhost:9001/SoapContext/SoapPort</To>
-      <ReplyTo xmlns="http://www.w3.org/2005/08/addressing">
-         <Address>http://www.w3.org/2005/08/addressing/anonymous</Address>
-      </ReplyTo>
-      <FaultTo xmlns="http://www.w3.org/2005/08/addressing">
-         <Address>http://www.w3.org/2005/08/addressing/anonymou</Address>
-      </FaultTo>
-      <Action xmlns="http://www.w3.org/2005/08/addressing">http://apache.org/hello_world_soap_http/Greeter/sayHiRequest</Action>
-   </soap:Header>
-   <soap:Body>
-      <sayHi xmlns="http://apache.org/hello_world_soap_http/types"/>
-   </soap:Body>
-</soap:Envelope>
-
-  </textarea>
-    </td>
-    <td>
-  <textarea id="response" style="width:600px;height:400px">
-  </textarea>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2>
-  <input type="button" value="Send" onClick="send();"/>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/trunk/examples/cxf-ws-addressing/pom.xml b/trunk/examples/cxf-ws-addressing/pom.xml
deleted file mode 100644
index 8b9e6df..0000000
--- a/trunk/examples/cxf-ws-addressing/pom.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-        <!ELEMENT project (modelVersion|parent|artifactId|packaging|name|dependencies|build)*>
-        <!ATTLIST project
-                xmlns CDATA #REQUIRED
-                xmlns:xsi CDATA #REQUIRED
-                xsi:schemaLocation CDATA #REQUIRED>
-        <!ELEMENT modelVersion (#PCDATA)>
-        <!ELEMENT parent (groupId|artifactId|version)*>
-        <!ELEMENT groupId (#PCDATA)>
-        <!ELEMENT artifactId (#PCDATA)>
-        <!ELEMENT version (#PCDATA)>
-        <!ELEMENT packaging (#PCDATA)>
-        <!ELEMENT name (#PCDATA)>
-        <!ELEMENT dependencies (dependency)*>
-        <!ELEMENT dependency (groupId|artifactId|scope)*>
-        <!ELEMENT scope (#PCDATA)>
-        <!ELEMENT build (plugins)*>
-        <!ELEMENT plugins (plugin)*>
-        <!ELEMENT plugin (groupId|artifactId|executions|configuration)*>
-        <!ELEMENT executions (execution)*>
-        <!ELEMENT execution (id|phase|configuration|goals)*>
-        <!ELEMENT id (#PCDATA)>
-        <!ELEMENT phase (#PCDATA)>
-        <!ELEMENT configuration (sourceRoot|wsdlOptions|instructions|mainClass|includePluginDependencies)*>
-        <!ELEMENT sourceRoot (#PCDATA)>
-        <!ELEMENT wsdlOptions (wsdlOption)*>
-        <!ELEMENT wsdlOption (wsdl)*>
-        <!ELEMENT wsdl (#PCDATA)>
-        <!ELEMENT goals (goal)*>
-        <!ELEMENT goal (#PCDATA)>
-        <!ELEMENT instructions (Bundle-SymbolicName|Import-Package|Require-Bundle|Export-Package)*>
-        <!ELEMENT Bundle-SymbolicName (#PCDATA)>
-        <!ELEMENT Import-Package (#PCDATA)>
-        <!ELEMENT Require-Bundle (#PCDATA)>
-        <!ELEMENT Export-Package (#PCDATA)>
-        <!ELEMENT mainClass (#PCDATA)>
-        <!ELEMENT includePluginDependencies (#PCDATA)>
-        ]>
-<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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-ws-addressing</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF WS-Addressing OSGI</name>
-    <description>CXF example using WS-Addressing</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_addr.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.soap,
-                            javax.xml.transform,
-                            javax.xml.ws,
-                            javax.xml.ws.handler,
-                            javax.xml.ws.handler.soap,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.apache.cxf.feature,
-                            org.apache.cxf.interceptor,
-                            org.apache.cxf.ws.addressing,
-                            org.apache.cxf.ws.addressing.soap,
-                            org.apache.servicemix.util,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <Export-Package>
-                            org.apache.servicemix.examples.cxf.wsaddressing,
-                            org.apache.hello_world_soap_http,
-                            org.apache.hello_world_soap_http.types,
-                        </Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.examples.cxf.wsaddressing.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/Client.java b/trunk/examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/Client.java
deleted file mode 100644
index fa906c3..0000000
--- a/trunk/examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/Client.java
+++ /dev/null
@@ -1,54 +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.examples.cxf.wsaddressing;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8181/cxf/SoapContext/SoapPort")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/examples/cxf/wsaddressing/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-    }
-
-}
diff --git a/trunk/examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/GreeterImpl.java b/trunk/examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/GreeterImpl.java
deleted file mode 100644
index 4da6bd4..0000000
--- a/trunk/examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/GreeterImpl.java
+++ /dev/null
@@ -1,79 +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.examples.cxf.wsaddressing;
-
-import java.util.logging.Logger;
-
-import javax.jws.WebService;
-
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.PingMeFault;
-import org.apache.hello_world_soap_http.types.FaultDetail;
-
-@WebService(name = "SoapPort",
-            portName = "SoapPort",
-            serviceName = "SOAPService",
-            targetNamespace = "http://apache.org/hello_world_soap_http",
-            wsdlLocation = "wsdl/hello_world_addr.wsdl")
-
-public class GreeterImpl implements Greeter {
-
-    private static final Logger LOG =
-        Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
-    /* (non-Javadoc)
-     * @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
-     */
-    public String greetMe(String me) {
-        LOG.info("Executing operation greetMe");
-        System.out.println("Executing operation greetMe");
-        System.out.println("Message received: " + me + "\n");
-        return "Hello " + me;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
-     */
-    public void greetMeOneWay(String me) {
-        LOG.info("Executing operation greetMeOneWay");
-        System.out.println("Executing operation greetMeOneWay\n");
-        System.out.println("Hello there " + me);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.hello_world_soap_http.Greeter#sayHi()
-     */
-    public String sayHi() {
-        LOG.info("Executing operation sayHi");
-        System.out.println("Executing operation sayHi\n");
-        return "Bonjour";
-    }
-
-    public void pingMe() throws PingMeFault {
-        FaultDetail faultDetail = new FaultDetail();
-        faultDetail.setMajor((short)2);
-        faultDetail.setMinor((short)1);
-        LOG.info("Executing operation pingMe, throwing PingMeFault exception");
-        System.out.println("Executing operation pingMe, throwing PingMeFault exception\n");
-        throw new PingMeFault("PingMeFault raised by server", faultDetail);
-    }
-
-
-}
diff --git a/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 1d1ae3b..0000000
--- a/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,110 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:cxf="http://cxf.apache.org/core" 
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xmlns:wsa="http://cxf.apache.org/ws/addressing"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxws:endpoint id="WsAddressingEndpoint"
-        implementor="org.apache.servicemix.examples.cxf.wsaddressing.GreeterImpl"
-        address="/SoapContext/SoapPort"
-        wsdlLocation="wsdl/hello_world_addr.wsdl"
-        endpointName="e:SoapPort"
-        serviceName="s:SOAPService"
-        xmlns:e="http://apache.org/hello_world_soap_http"
-            xmlns:s="http://apache.org/hello_world_soap_http">
-            <jaxws:features>
-                <bean class="org.apache.cxf.feature.LoggingFeature"/>
-            </jaxws:features>
-        </jaxws:endpoint>
-
-       
-       <jaxws:client id="client" 
-             serviceClass="org.apache.hello_world_soap_http.Greeter"    
-        endpointName="e:SoapPort"
-        serviceName="s:SOAPService"
-        xmlns:e="http://apache.org/hello_world_soap_http"
-            xmlns:s="http://apache.org/hello_world_soap_http"
-             wsdlLocation="wsdl/hello_world_addr.wsdl"
-             address="http://localhost:8080/cxf/SoapContext/SoapPort">
-         </jaxws:client>
- 
-       <osgi:service id="testWSAddressing" ref="client"
-            interface="org.apache.hello_world_soap_http.Greeter"/>
-
-       <osgi:service id="businstance" ref="cxf"
-            interface="org.apache.cxf.bus.CXFBusImpl"/>
-
-
-    <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
-    <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
-    <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
-    <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
-
-    <!--bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-                <ref bean="logInbound"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="mapAggregator"/>
-                <ref bean="mapCodec"/>
-            </list>
-        </property>
-    </bean-->
-    <cxf:bus>
-        <cxf:features>
-            <wsa:addressing/>
-        </cxf:features>
-    </cxf:bus>
-
-      
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml b/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml
deleted file mode 100644
index d0756d7..0000000
--- a/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-   <soap:Header>
-      <MessageID xmlns="http://www.w3.org/2005/08/addressing">urn:uuid:123456789</MessageID>
-      <To xmlns="http://www.w3.org/2005/08/addressing">http://localhost:8080/SoapContext/SoapPort</To>
-      <ReplyTo xmlns="http://www.w3.org/2005/08/addressing">
-         <Address>http://www.w3.org/2005/08/addressing/anonymous</Address>
-      </ReplyTo>
-      <FaultTo xmlns="http://www.w3.org/2005/08/addressing">
-         <Address>http://www.w3.org/2005/08/addressing/anonymous</Address>
-      </FaultTo>
-      <Action xmlns="http://www.w3.org/2005/08/addressing">http://apache.org/hello_world_soap_http/Greeter/sayHiRequest</Action>
-   </soap:Header>
-   <soap:Body>
-      <sayHi xmlns="http://apache.org/hello_world_soap_http/types"/>
-   </soap:Body>
-</soap:Envelope>
-
diff --git a/trunk/examples/cxf-ws-addressing/src/main/resources/wsdl/hello_world_addr.wsdl b/trunk/examples/cxf-ws-addressing/src/main/resources/wsdl/hello_world_addr.wsdl
deleted file mode 100644
index 2ea02aa..0000000
--- a/trunk/examples/cxf-ws-addressing/src/main/resources/wsdl/hello_world_addr.wsdl
+++ /dev/null
@@ -1,174 +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 name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http" 
-    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">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
-            xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-            <element name="sayHi">
-                <complexType/>
-            </element>
-            <element name="sayHiResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeOneWay">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="pingMe">
-                <complexType/>
-            </element>
-            <element name="pingMeResponse">
-                <complexType/>
-            </element>
-            <element name="faultDetail">
-                <complexType>
-                    <sequence>
-                        <element name="minor" type="xsd:short"/>
-                        <element name="major" type="xsd:short"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiRequest">
-        <wsdl:part element="x1:sayHi" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="x1:sayHiResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeOneWayRequest">
-        <wsdl:part element="x1:greetMeOneWay" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeRequest">
-        <wsdl:part name="in" element="x1:pingMe"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeResponse">
-        <wsdl:part name="out" element="x1:pingMeResponse"/>
-    </wsdl:message>        
-    <wsdl:message name="pingMeFault">
-        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
-        </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 soapAction="" style="document"/>
-            <wsdl:input name="sayHiRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="greetMeResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeOneWayRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-
-            <wsdl:operation name="pingMe">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="pingMeFault">
-                <soap:fault name="pingMeFault" use="literal"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="http://localhost:8181/cxf/SoapContext/SoapPort"/>
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
-
diff --git a/trunk/examples/cxf-ws-rm/README.txt b/trunk/examples/cxf-ws-rm/README.txt
deleted file mode 100644
index 005089a..0000000
--- a/trunk/examples/cxf-ws-rm/README.txt
+++ /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.
- */
-
-CXF OSGi HTTP WEB SERVICE
-=========================
-
-Purpose
--------
-Create a web service with CXF and ws_rm feature enabled.
-
-
-Explanation
------------
-The client and server both apply the reliableMessaging feature to the bus.
-This ensures installation of the WS-RM interceptors,
-comprising logical interceptors (RMInInterceptor/RMOutInterceptor)
-responsible for managing the reliability properties of the current message, and a
-protocol interceptor (RMSoapInterceptor) responsible for encoding/decoding
-these properties as SOAP Headers.
-
-As WS-RM is dependent on WS-Addressing, the demo uses 
-the same approach as the ws_addressing sample to enable this
-functionality. However, you may notice that the WS-Addressing
-namespace URI is different in this case (i.e.
-http://schemas.xmlsoap.org/ws/2004/08/addressing as opposed to
-http://www.w3.org/2005/08/addressing). This is because the WS-RM
-specification is still based on an older version of WS-Addressing.
-
-The logging feature is used to log the inbound and outbound
-SOAP messages and display these to the console. Notice the usage of 
-out-of-band RM protocol messages (CreateSequence and CreateSequenceResponse)
-and the WS-RM headers in application-level messages (Sequence,
-SequenceAcknowledgement, AckRequested etc.)  
-
-Finally, the MessageLossSimulator interceptor is installed
-on the client-side to simulate message loss by discarding every second
-application level message. This simulated unreliability allows the retransmission
-of unacknowledged messages to be observed.
-
-This demo also illustrates usage of the decoupled HTTP transport, whereby
-a separate server->client HTTP connection is used to deliver responses
-to (application or RM protocol) requests and server side originated 
-standalone acknowledgments.
-The "partial response" referred to in the log output is the payload of
-the HTTP 202 Accepted response sent on the back-channel of the original 
-client->server connection. 
-
-
-The beans.xml file, located in the src/main/resources/META-INF/spring
-directory:
-
-1. Imports the configuration files needed to enable CXF and OSGi work
-   together.
-
-2. Configures the web service endpoint as follows:
-
-  <jaxws:endpoint id="helloWorld"
-                        implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-                        wsdlLocation="classpath:HelloWorld.wsdl"
-                        address="http://localhost:9191/HelloWorld"/>
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-ws-rm
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-
-Running a Client
-----------------
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/cxf-ws-rm
-   directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-cxf-ws-rm
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-cxf-ws-rm
-
-   
-2. Build the example by opening a command prompt, changing directory to
-   examples/cxf-ws-rm (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local
-   Maven repository, the example will build very quickly. Otherwise
-   it may take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-ws-rm
-       
-   It makes use of the ServiceMix features facility. For more
-   information about the features facility, see the README.txt file
-   in the examples parent directory.
-
-
-You can try running a client against your service by following the
-instructions in the "Running a Client" section above.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-at the ServiceMix console:
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [170] [Active     ] [Started] [  60] Apache ServiceMix Example :: CXF WS-RM (4.2.0.0)
-
-In this case, the bundle ID is 170.
-
-To stop the example, enter the following command at the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 170
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-cxf-ws-rm
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/cxf-ws-rm/pom.xml b/trunk/examples/cxf-ws-rm/pom.xml
deleted file mode 100755
index 7a33246..0000000
--- a/trunk/examples/cxf-ws-rm/pom.xml
+++ /dev/null
@@ -1,118 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-ws-rm</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF WS-RM OSGi</name>
-    <description>CXF example using WS-RM</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-rm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-addr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-utilities</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.ws,
-                            javax.xml.namespace,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.interceptor, org.apache.cxf.io, org.apache.cxf.message, org.apache.cxf.phase,
-                            org.apache.cxf.ws.addressing, org.apache.cxf.ws.rm,
-                            org.apache.cxf.transport.http_osgi,
-                            org.apache.servicemix.util,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.cxf_ws_rm.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java b/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
deleted file mode 100755
index 14dad3a..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
+++ /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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld {
-    String sayHi(String text);
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java b/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
deleted file mode 100755
index 85fd25f..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/Client.java b/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/Client.java
deleted file mode 100755
index 985a402..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/Client.java
+++ /dev/null
@@ -1,78 +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.samples.cxf_ws_rm;
-
-import java.lang.reflect.UndeclaredThrowableException;
-import java.net.URL;
-import java.io.File;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.servicemix.examples.cxf.HelloWorld;
-
-
-public final class Client {
-
-    private static final String USER_NAME = System.getProperty("user.name");
-
-    private static final QName SERVICE_NAME 
-        = new QName("http://cxf.examples.servicemix.apache.org/", "HelloWorldImplService");
-    private static final QName PORT_NAME 
-        = new QName("http://cxf.examples.servicemix.apache.org/", "HelloWorldImplPort");
-
-    private Client() {
-    }
-
-    public static void main(String args[]) throws Exception {
-        try {
-
-            SpringBusFactory bf = new SpringBusFactory();
-            URL busFile = Client.class.getResource("ws_rm.xml");
-            Bus bus = bf.createBus(busFile.toString());
-            bf.setDefaultBus(bus);
-            bus.getOutInterceptors().add(new MessageLossSimulator());
-            // Endpoint Address
-            Service service = Service.create(Client.class.getResource("/HelloWorld.wsdl"), SERVICE_NAME);
-
-            String endpointAddress = "http://localhost:9191/HelloWorld";
-
-            // Add a port to the Service
-            service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, endpointAddress);
-            HelloWorld hw = service.getPort(HelloWorld.class);
-            
-            String[] names = new String[] {"Anne", "Bill", "Chris", "Daisy"};
-            // make a sequence of 4 invocations
-            for (int i = 0; i < 4; i++) {
-                System.out.println("Calling HelloWorld service");
-                System.out.println(hw.sayHi(names[i]));
-            }
-
-            // allow aynchronous resends to occur
-            Thread.sleep(60 * 1000);
-            bus.shutdown(true);
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            System.exit(0);
-        }
-    }
-}
diff --git a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java b/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java
deleted file mode 100755
index 0cdd319..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java
+++ /dev/null
@@ -1,131 +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.samples.cxf_ws_rm;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.ListIterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.interceptor.MessageSenderInterceptor;
-import org.apache.cxf.io.AbstractWrappedOutputStream;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptor;
-import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.rm.RMContextUtils;
-
-/**
- * 
- */
-public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
-
-    private static final Logger LOG = Logger.getLogger(MessageLossSimulator.class.getName());
-    private int appMessageCount; 
-    
-    public MessageLossSimulator() {
-        super(Phase.PREPARE_SEND);
-        addBefore(MessageSenderInterceptor.class.getName());
-    }
-
-    
-    public void handleMessage(Message message) throws Fault {
-        AddressingProperties maps =
-            RMContextUtils.retrieveMAPs(message, false, true);
-        RMContextUtils.ensureExposedVersion(maps);
-        String action = null;
-        if (maps != null && null != maps.getAction()) {
-            action = maps.getAction().getValue();
-        }
-        if (RMContextUtils.isRMProtocolMessage(action)) { 
-            return;
-        }
-        appMessageCount++;
-        // do not discard odd-numbered messages
-        if (0 != (appMessageCount % 2)) {
-            return;
-        }
-        
-        // discard even-numbered message
-        InterceptorChain chain = message.getInterceptorChain();
-        ListIterator it = chain.getIterator();
-        while (it.hasNext()) {
-            PhaseInterceptor pi = (PhaseInterceptor)it.next();
-            if (MessageSenderInterceptor.class.getName().equals(pi.getId())) {
-                chain.remove(pi);
-                LOG.fine("Removed MessageSenderInterceptor from interceptor chain.");
-                break;
-            }
-        }
-        
-        message.setContent(OutputStream.class, new WrappedOutputStream(message));  
-
-        message.getInterceptorChain().add(new AbstractPhaseInterceptor<Message>(Phase.PREPARE_SEND_ENDING) {
-
-            public void handleMessage(Message message) throws Fault {
-                try {
-                    message.getContent(OutputStream.class).close();
-                } catch (IOException e) {
-                    throw new Fault(e);
-                }
-            }
-            
-        });   
-    }
-    
-    private class WrappedOutputStream extends AbstractWrappedOutputStream {
-
-        private Message outMessage;
-
-        public WrappedOutputStream(Message m) {
-            this.outMessage = m;
-        }
-
-        @Override
-        protected void onFirstWrite() throws IOException {
-            if (LOG.isLoggable(Level.FINE)) {
-                BigInteger nr = RMContextUtils.retrieveRMProperties(outMessage, true)
-                    .getSequence().getMessageNumber();
-                LOG.fine("Losing message " + nr);
-            }
-            wrappedStream = new DummyOutputStream();
-        }
-    }    
-
-            
-    
-    private class DummyOutputStream extends OutputStream {
-
-        @Override
-        public void write(int b) throws IOException {
-            // TODO Auto-generated method stub
-            
-        }
-        
-    }
-    
-    
-    
-}
diff --git a/trunk/examples/cxf-ws-rm/src/main/resources/HelloWorld.wsdl b/trunk/examples/cxf-ws-rm/src/main/resources/HelloWorld.wsdl
deleted file mode 100644
index 4450026..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/resources/HelloWorld.wsdl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><wsdl:definitions name="HelloWorldImplService" targetNamespace="http://cxf.examples.servicemix.apache.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.examples.servicemix.apache.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <wsdl:types>
-    <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.examples.servicemix.apache.org/" xmlns="http://cxf.examples.servicemix.apache.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:complexType name="sayHi">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="arg0" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="sayHiResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="return" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:element name="sayHi" nillable="true" type="sayHi"/>
-      <xs:element name="sayHiResponse" nillable="true" type="sayHiResponse"/>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="sayHi">
-    <wsdl:part element="tns:sayHi" name="parameters">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHiResponse">
-    <wsdl:part element="tns:sayHiResponse" name="parameters">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="HelloWorld">
-    <wsdl:operation name="sayHi">
-      <wsdl:input message="tns:sayHi" name="sayHi">
-      </wsdl:input>
-      <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="HelloWorldImplServiceSoapBinding" type="tns:HelloWorld">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="sayHi">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="sayHi">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sayHiResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="HelloWorldImplService">
-    <wsdl:port binding="tns:HelloWorldImplServiceSoapBinding" name="HelloWorldImplPort">
-      <soap:address location="http://localhost:9191/HelloWorld"/>
-      <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100755
index 45d13d8..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,67 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-        xmlns:cxf="http://cxf.apache.org/core"
-        xmlns:wsa="http://cxf.apache.org/ws/addressing"
-        xmlns:http="http://cxf.apache.org/transports/http/configuration"
-        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-        xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-        xsi:schemaLocation="
-          http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-          http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
-          http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-          http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-          http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-rm.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-addr.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
-
-    <jaxws:endpoint id="helloWorld"
-                    implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-                    wsdlLocation="classpath:HelloWorld.wsdl"
-                        address="http://localhost:9191/HelloWorld"/>
-        <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-            <wsa:addressing/>
-            <wsrm-mgr:reliableMessaging>
-                <wsrm-policy:RMAssertion>
-                    <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/>           
-                    <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>          
-                </wsrm-policy:RMAssertion>
-                <wsrm-mgr:destinationPolicy>
-                    <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
-                </wsrm-mgr:destinationPolicy>
-            </wsrm-mgr:reliableMessaging>
-        </cxf:features>
-        </cxf:bus>
-        <http:conduit name="{http://cxf.examples.servicemix.apache.org/}HelloWorldImplPort.http-conduit">
-            <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
-        </http:conduit>
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/cxf-ws-rm/src/main/resources/org/apache/servicemix/samples/cxf_ws_rm/ws_rm.xml b/trunk/examples/cxf-ws-rm/src/main/resources/org/apache/servicemix/samples/cxf_ws_rm/ws_rm.xml
deleted file mode 100644
index 984f14a..0000000
--- a/trunk/examples/cxf-ws-rm/src/main/resources/org/apache/servicemix/samples/cxf_ws_rm/ws_rm.xml
+++ /dev/null
@@ -1,54 +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://cxf.apache.org/core"
-       xmlns:wsa="http://cxf.apache.org/ws/addressing"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
-       xsi:schemaLocation="
-       http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-       http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
-       http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
-       http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- 
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-            <wsa:addressing/>
-            <wsrm-mgr:reliableMessaging>
-                <wsrm-policy:RMAssertion>
-                    <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/>           
-                    <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>          
-                </wsrm-policy:RMAssertion>
-                <wsrm-mgr:destinationPolicy>
-                    <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
-                </wsrm-mgr:destinationPolicy>
-            </wsrm-mgr:reliableMessaging>
-        </cxf:features>
-    </cxf:bus>
-    
-    <http:conduit name="{http://cxf.examples.servicemix.apache.org/}HelloWorldImplPort.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
-    </http:conduit>
-</beans>
-
diff --git a/trunk/examples/cxf-ws-security-osgi/README.txt b/trunk/examples/cxf-ws-security-osgi/README.txt
deleted file mode 100644
index 309d56d..0000000
--- a/trunk/examples/cxf-ws-security-osgi/README.txt
+++ /dev/null
@@ -1,258 +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.
- */
-
-CXF WS-SECURITY OSGi HTTP WEB SERVICE
-=========================
-
-Purpose
--------
-Create a web service with CXF using WS-SECURITY and expose it through the OSGi HTTP
-Service.
-
-
-Explanation
------------
-The web service is a simple JAX-WS web service with ws-security UsernameToken action called HelloWorldSecurity. The 
-interface and the implementation are located in the src/main/java/org/
-apache/servicemix/examples/cxf directory of this example.
-
-The beans.xml file, located in the src/main/resources/META-INF/spring
-directory:
-
-1. Imports the configuration files needed to enable CXF and OSGi work
-   together.
-
-2. Configures the web service endpoint as follows:
-
-   <jaxws:endpoint id="helloWorld"
-        implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-        address="/HelloWorldSecurity">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordType" value="PasswordText"/>
-                        <entry key="passwordCallbackRef">
-                            <ref bean="myPasswordCallback"/>
-                        </entry>
-
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-You can run the example in two ways:
-
-- A. Using a Prebuilt Deployment Bundle: Quick and Easy
-This option is useful if you want to see the example up and
-running as quickly as possible.
-
-- B. Building the Example Bundle Yourself
-This option is useful if you want to change the example in any
-way. It tells you how to build and deploy the example. This
-option might be slower than option A because, if you do not
-already have the required bundles in your local Maven
-repository, Maven will have to download the bundles it needs.
-
-A. Using a Prebuilt Deployment Bundle: Quick and Easy
------------------------------------------------------
-To install and run a prebuilt version of this example, enter
-the following command in the ServiceMix console:
-
-  features:install examples-cxf-ws-security-osgi
-  
-This command makes use of the ServiceMix features facility. For
-more information about the features facility, see the README.txt
-file in the examples parent directory.
-
-To view the service WSDL, open your browser and go to the following
-URL:
-
-  http://localhost:8181/cxf/HelloWorldSecurity?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html, which is located in the same directory as
-   this README file, in your favorite browser.
-
-2. Click the Send button to send a request.
-
-   Once the request has been successfully sent, a response similar
-   to the following should appear in the right-hand panel of the
-   web page:
-   
-   STATUS: 200
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><ns2:sayHiResponse xmlns:ns2="http://cxf.examples.
-     servicemix.apache.org/"><return>Hello John Doe</return>
-     </ns2:sayHiResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/cxf-ws-security-osgi
-   directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-
-   If the client request is successful, a response similar to the
-   following should appear in the ServiceMix console:
-
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><ns2:sayHiResponse xmlns:ns2="http://cxf.examples.
-       servicemix.apache.org/"><return>Hello John Doe</return>
-       </ns2:sayHiResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-
-Changing /cxf servlet alias
----------------------------
-By default CXF Servlet is assigned a '/cxf' alias. You can
-change it in a couple of ways
-
-a. Add org.apache.cxf.osgi.cfg to the /etc directory and set
-   the 'org.apache.cxf.servlet.context' property, for example:
-   
-     org.apache.cxf.servlet.context=/custom
-   
-b. Use shell config commands, for example :
-   
-     config:edit org.apache.cxf.osgi   
-     config:propset org.apache.cxf.servlet.context /super
-     config:update
-
-
-B. Building the Example Bundle Yourself
----------------------------------------
-To install and run the example where you build the example bundle
-yourself, complete the following steps:
-
-1. If you have already run the example using the prebuilt version as
-   described above, you must first uninstall the examples-cxf-ws-security-osgi
-   feature by entering the following command in the ServiceMix console:
-
-     features:uninstall examples-cxf-ws-security-osgi
-
-   
-2. Build the example by opening a command prompt, changing directory to
-   examples/cxf-ws-security-osgi (this example) and entering the following Maven
-   command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local
-   Maven repository, the example will build very quickly. Otherwise
-   it may take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-3. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-ws-security-osgi
-       
-   It makes use of the ServiceMix features facility. For more
-   information about the features facility, see the README.txt file
-   in the examples parent directory.
-
-To view the service WSDL, open your browser and go to the following
-URL:
-
-  http://localhost:8181/cxf/HelloWorldSecurity?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-You can try running a client against your service by following the
-instructions in the "Running a Client" section above.
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-at the ServiceMix console:
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [170] [Active     ] [Started] [  60] Apache ServiceMix Example :: CXF WS SECURITY OSGI (4.2.0.0)
-
-In this case, the bundle ID is 170.
-
-To stop the example, enter the following command at the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 170
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-cxf-ws-security-osgi
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
diff --git a/trunk/examples/cxf-ws-security-osgi/client.html b/trunk/examples/cxf-ws-security-osgi/client.html
deleted file mode 100644
index c3c3966..0000000
--- a/trunk/examples/cxf-ws-security-osgi/client.html
+++ /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.
-
--->
-<html>
-<head>
-<title>ServiceMix 4 CXF-WS-SECURITY-OSGi Example</title>
-<script type="text/javascript">
-var urlToOpen = "http://localhost:8181/cxf/HelloWorldSecurity"; //default URL to open
-
-function getHTTPObject() {
-  var xmlhttp = false;
-
-  /* Compilation conditionnelle d'IE */
-  /* Check if we are using IE */
-  /*@cc_on
-  @if (@_jscript_version >= 5)
-     try {
-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-     } catch (e) {
-        try {
-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-        } catch (E) {
-           xmlhttp = false;
-        }
-     }
-  @else
-     xmlhttp = false;
-  @end @*/
-
-  /* on essaie de créer l'objet si ce n'est pas déjà fait */
-  /* Create the xmlhttp object if it is not yet defined */
-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-     try {
-        xmlhttp = new XMLHttpRequest();
-     } catch (e) {
-        xmlhttp = false;
-     }
-  }
-
-  if (xmlhttp) {
-     /* on définit ce qui doit se passer quand la page répondra */
-     /* Define the callback function for the response */
-     xmlhttp.onreadystatechange=function() {
-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */
-           var response = document.getElementById("response");
-           var responseStatus = "";
-           try {
-             responseStatus = xmlhttp.status + "";
-           } catch (e) {
-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";
-           }
-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;
-        }
-     }
-  }
-  return xmlhttp;
-}
-
-function send() {
-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {
-    // use user entry if it is not the empty string
-    urlToOpen = document.getElementById("urlToOpen").value;
-  }  
-  var xmlhttp = getHTTPObject();
-  if (!xmlhttp) {
-    alert('cound not create XMLHttpRequest object');
-    return;
-  }
-  var request = document.getElementById("request");
-  var response = document.getElementById("response");
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
-  } catch (e) {
-  }
-  try {
-    xmlhttp.open("POST", urlToOpen, true);
-  } catch (e) {
-    alert('error opening');
-  }
-  xmlhttp.send(request.value);
-}
-
-</script>
-</head>
-
-<body>
-
-<h1>ServiceMix 4 CXF-WS-SECURITY-OSGi Example</h1>
-
-<p>Welcome to the CXF-WS-SECURITY-OSGi example for ServiceMix 4</p>
-
-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 
-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>
-  
-<table>
-  <tr>
-    <td>
-  <textarea id="request" style="width:600px;height:400px"><?xml version="1.0" encoding="UTF-8"?>
-  <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-    <soap:Header>
-        <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
-            <wsse:UsernameToken >
-                <wsse:Username>joe</wsse:Username>
-                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">password</wsse:Password>
-            </wsse:UsernameToken>
-        </wsse:Security>
-    </soap:Header>
-    <soap:Body>
-        <ns2:sayHi xmlns:ns2="http://cxf.examples.servicemix.apache.org/">
-            <arg0>John Doe</arg0>
-        </ns2:sayHi>
-    </soap:Body>
-</soap:Envelope>
-
-  </textarea>
-    </td>
-    <td>
-  <textarea id="response" style="width:600px;height:400px">
-  </textarea>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2>
-  <input type="button" value="Send" onClick="send();"/>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/trunk/examples/cxf-ws-security-osgi/pom.xml b/trunk/examples/cxf-ws-security-osgi/pom.xml
deleted file mode 100644
index 99db228..0000000
--- a/trunk/examples/cxf-ws-security-osgi/pom.xml
+++ /dev/null
@@ -1,95 +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/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-ws-security-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF WS-Security OSGi</name>
-    <description>CXF example using WS-Security</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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>
-                            javax.jws,
-                            javax.xml.bind.annotation,
-                            javax.wsdl,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.apache.cxf.ws.security.wss4j,
-                            org.springframework.beans.factory.config,
-                            javax.security.auth.callback,
-                            org.apache.ws.security,
-                            org.apache.commons.logging,
-                            org.apache.servicemix.util,
-                            org.apache.ws.security.processor
-                        </Import-Package>
-                        <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.examples.cxf.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/Client.java b/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/Client.java
deleted file mode 100644
index 8890c39..0000000
--- a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/Client.java
+++ /dev/null
@@ -1,54 +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.examples.cxf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8181/cxf/HelloWorldSecurity")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/examples/cxf/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-    }
-
-}
diff --git a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java b/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
deleted file mode 100755
index 14dad3a..0000000
--- a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
+++ /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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld {
-    String sayHi(String text);
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java b/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
deleted file mode 100755
index 85fd25f..0000000
--- a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java b/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
deleted file mode 100644
index 351531c..0000000
--- a/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
+++ /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.
- */
-
-package org.apache.servicemix.examples.cxf;
-
-import java.io.IOException;
-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 ServerPasswordCallback implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-
-        WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
-
-        if (pc.getIdentifer().equals("joe")) {
-            pc.setPassword("password");
-        }
-    }
-
-}
-
-
diff --git a/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100755
index 7fe3265..0000000
--- a/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <bean id="myPasswordCallback" class="org.apache.servicemix.examples.cxf.ServerPasswordCallback"/>
-
-    <jaxws:endpoint id="helloWorld"
-        implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-        address="/HelloWorldSecurity">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordType" value="PasswordText"/>
-                        <entry key="passwordCallbackRef">
-                            <ref bean="myPasswordCallback"/>
-                        </entry>
-
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/cxf-ws-security-osgi/src/main/resources/org/apache/servicemix/examples/cxf/request.xml b/trunk/examples/cxf-ws-security-osgi/src/main/resources/org/apache/servicemix/examples/cxf/request.xml
deleted file mode 100755
index 7f00050..0000000
--- a/trunk/examples/cxf-ws-security-osgi/src/main/resources/org/apache/servicemix/examples/cxf/request.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-    <soap:Header>
-        <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
-            <wsse:UsernameToken >
-                <wsse:Username>joe</wsse:Username>
-                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">password</wsse:Password>
-            </wsse:UsernameToken>
-        </wsse:Security>
-    </soap:Header>
-    <soap:Body>
-        <ns2:sayHi xmlns:ns2="http://cxf.examples.servicemix.apache.org/">
-            <arg0>John Doe</arg0>
-        </ns2:sayHi>
-    </soap:Body>
-</soap:Envelope>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/README.txt b/trunk/examples/cxf-wsdl-first-osgi-package/README.txt
deleted file mode 100644
index c3f6a2b..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/README.txt
+++ /dev/null
@@ -1,224 +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.
- */
-
-WSDL First OSGi Bundles Example
-===============================
-
-Purpose
--------
-Publish a WSDL-defined web service, packaged as OSGi bundles, 
-using CXF.
-
-This example is the same as the cxf-wsdl-first example except it
-is deployed as OSGi bundles, whereas the cxf-wsdl-first example
-is deployed as a service assembly.
-
-
-Explanation
------------
-The CXF service engine and CXF binding component are used to expose the
-web service. Each one is packaged in as an OSGi bundle, as follows:
-
-1. CXF service engine (see the wsdl-first-cxfse-bundle directory):
-   
-   - Contains a copy of the service WSDL file, person.wsdl, in the
-     src/main/resources directory.
-   
-   - The service implementation file, PersonImpl.java, in the
-     src/main/java/org/apache/servicemix/samples/wsdl_first directory.
-     It contains JAX-WS annotations that specify which web service
-     it implements:
-
-       @WebService(serviceName = "PersonService", 
-           targetNamespace = "http://servicemix.apache.org/samples/wsdl-first",
-           endpointInterface = "org.apache.servicemix.samples.wsdl_first.Person")
-   
-   - A configuration file, beans.xml, located in the src/main/resources/
-     META-INF/spring directory, which configures the CXF endpoint:
-     
-       <cxfse:endpoint>
-           <cxfse:pojo>
-             <bean class="org.apache.servicemix.samples.wsdl_first.PersonImpl" />
-           </cxfse:pojo>
-       </cxfse:endpoint>
-    
-2. CXF binding component (see the wsdl-first-cxfbc-bundle directory):
-
-   - Contains a copy of the service WSDL file, person.wsdl, in the
-     src/main/resources directory.
-    
-   - A configuration file, beans.xml, located in the src/main/resources/
-     META-INF/spring directory, which specifies a CXF consumer that will
-     accept incoming calls for that web service and pass them to the NMR:
-
-       <cxfbc:consumer wsdl="classpath:person.wsdl"
-                      targetService="person:PersonService"
-                      targetInterface="person:Person"/>
-
-       <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-   
-   - Maven 2.0.9 or higher
-   
-  For more information, see the README in the top-level examples
-  directory.
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Building and Running the Example
---------------------------------
-To build and run the example, complete the following steps:
-
-1. Build the example by opening a command prompt, changing directory
-   to examples/cxf-wsdl-first-osgi-package (this example) and entering
-   the following Maven command:
-
-     mvn install
-   
-   If all of the required OSGi bundles are available in your local
-   Maven repository, the example will build very quickly. Otherwise
-   it may take some time for Maven to download everything it needs.
-   
-   The mvn install command builds the example deployment bundle and
-   copies it to your local Maven repository and to the target directory
-   of this example.
-     
-2. Install the example by entering the following command in
-   the ServiceMix console:
-   
-     features:install examples-cxf-wsdl-first-osgi-package
-     
-   It makes use of the ServiceMix features facility. For more
-   information about the features facility, see the README.txt file
-   in the examples parent directory.
-
-You can browse the WSDL at:
-
-  http://localhost:8092/PersonService?wsdl
-
-Note, if you use Safari, right click the window and select
-'Show Source'.
-
-
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html, which is located in the same directory as
-   this README file, in your favorite browser.
-
-2. Click the Send button to send a request.
-
-   Once the request has been successfully sent, a response similar
-   to the following should appear in the right-hand panel of the
-   web page:
-   
-   STATUS: 200
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><GetPersonResponse xmlns="http://servicemix.apache.org/
-     samples/wsdl-first/types"><personId>world</personId>
-     <ssn>000-000-0000</ssn><name>Guillaume</name></GetPersonResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-To run the java code client:
-
-1. Change to the <servicemix_home>/examples/cxf-wsdl-first-osgi-package/
-   client directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-     
-   If the client request is successful, a response similar to the
-   following should appear in the ServiceMix console:
-        
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><GetPersonResponse xmlns="http://servicemix.apache.org/
-       samples/wsdl-first/types"><personId>world</personId>
-       <ssn>000-000-0000</ssn><name>Guillaume</name></GetPersonResponse>
-     </soap:Body>
-   </soap:Envelope>
-   
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console:
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to the
-following:
-
-  [180] [Active     ] [     ] [  60] ServiceMix :: Samples :: WSDL first :: CXF BC BUNDLE (4.2.0)
-  [181] [Active     ] [     ] [  60] ServiceMix :: Samples :: WSDL first :: CXF SE BUNDLE (4.2.0)
-
-
-In this case, the bundle IDs are 180 and 181.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-For example:
-
-  osgi:stop 180
-  osgi:stop 181
-
-To uninstall the example, enter one of the following commands in
-the ServiceMix console:
-
-  features:uninstall examples-cxf-wsdl-first-osgi-package
- 
-or
- 
-  osgi:uninstall <bundle_id>
-  
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log
-directory of your ServiceMix installation, or by typing
-the following command in the ServiceMix console:
-
-  log:display
-
-
-Changing the Example
---------------------
-If you want to change the code or configuration, just use 'mvn install'
-to rebuild the OSGi bundles and deploy as before.
-
-
-More Information
-----------------
-For more information, see:
-
-  http://cwiki.apache.org/SMX4/creating-an-osgi-bundle-for-deploying-jbi-endpoints.html
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/client.html b/trunk/examples/cxf-wsdl-first-osgi-package/client.html
deleted file mode 100644
index bfd6b5d..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/client.html
+++ /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.
-
--->
-<!-- $Rev$ $Date$ -->
-<html>
-<head>
-<title>ServiceMix WSDL-First Example</title>
-<script type="text/javascript">
-var urlToOpen = "http://localhost:8092/PersonService/"; //default URL to open
-
-function getHTTPObject() {
-  var xmlhttp = false;
-
-  /* Compilation conditionnelle d'IE */
-  /*@cc_on
-  @if (@_jscript_version >= 5)
-     try {
-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-     } catch (e) {
-        try {
-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-        } catch (E) {
-           xmlhttp = false;
-        }
-     }
-  @else
-     xmlhttp = false;
-  @end @*/
-
-  /* on essaie de créer l'objet si ce n'est pas déjà fait */
-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-     try {
-        xmlhttp = new XMLHttpRequest();
-     } catch (e) {
-        xmlhttp = false;
-     }
-  }
-
-  if (xmlhttp) {
-     /* on définit ce qui doit se passer quand la page répondra */
-     xmlhttp.onreadystatechange=function() {
-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */
-           var response = document.getElementById("response");
-           var responseStatus = "";
-           try {
-             responseStatus = xmlhttp.status + "";
-           } catch (e) {
-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";
-           }
-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;
-        }
-     }
-  }
-  return xmlhttp;
-}
-
-function send() {
-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {
-    //use user entry only if it at least can be okay
-    urlToOpen = document.getElementById("urlToOpen").value;
-  }  
-  var xmlhttp = getHTTPObject();
-  if (!xmlhttp) {
-    alert('cound not create XMLHttpRequest object');
-    return;
-  }
-  var request = document.getElementById("request");
-  var response = document.getElementById("response");
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
-  } catch (e) {
-  }
-  try {
-    xmlhttp.open("POST", urlToOpen, true);
-  } catch (e) {
-    alert('error opening');
-  }
-  xmlhttp.send(request.value);
-}
-
-</script>
-</head>
-
-<body>
-
-<h1>ServiceMix WSDL-First Example</h1>
-
-<p>Welcome to the WSDL-First example for ServiceMix</p>
-
-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 
-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>
-  
-<table>
-  <tr>
-    <td>
-  <textarea id="request" style="width:600px;height:400px" onKeyUp="send();"><?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
-              xmlns:tns="http://servicemix.apache.org/samples/wsdl-first/types">
-  <env:Body>
-    <tns:GetPerson>
-      <tns:personId>world</tns:personId>
-    </tns:GetPerson>
-  </env:Body>
-</env:Envelope>
-
-  </textarea>
-    </td>
-    <td>
-  <textarea id="response" style="width:600px;height:400px">
-  </textarea>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2>
-  <input type="button" value="Send" onClick="send();"/>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml b/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml
deleted file mode 100644
index 8ec2bbb..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/client/pom.xml
+++ /dev/null
@@ -1,61 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first-osgi-package</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first-osgi-package</groupId>
-    <artifactId>wsdl-first-client</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First OSGi Package :: Client</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.wsdl_first.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/client/src/main/java/org/apache/servicemix/samples/wsdl_first/Client.java b/trunk/examples/cxf-wsdl-first-osgi-package/client/src/main/java/org/apache/servicemix/samples/wsdl_first/Client.java
deleted file mode 100644
index c6a2a92..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/client/src/main/java/org/apache/servicemix/samples/wsdl_first/Client.java
+++ /dev/null
@@ -1,53 +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.samples.wsdl_first;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8092/PersonService/")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/samples/wsdl_first/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-    }
-
-}
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/client/src/main/resources/org/apache/servicemix/samples/wsdl_first/request.xml b/trunk/examples/cxf-wsdl-first-osgi-package/client/src/main/resources/org/apache/servicemix/samples/wsdl_first/request.xml
deleted file mode 100644
index 8a56f1c..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/client/src/main/resources/org/apache/servicemix/samples/wsdl_first/request.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
-              xmlns:tns="http://servicemix.apache.org/samples/wsdl-first/types">
-  <env:Body>
-    <tns:GetPerson>
-      <tns:personId>world</tns:personId>
-    </tns:GetPerson>
-  </env:Body>
-</env:Envelope>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml b/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml
deleted file mode 100644
index d8872f6..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/pom.xml
+++ /dev/null
@@ -1,41 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>cxf-wsdl-first-osgi-package</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF WSDL First OSGi Package</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>wsdl-first-cxfse-bundle</module>
-        <module>wsdl-first-cxfbc-bundle</module>
-        <module>client</module>
-    </modules>
-
-</project>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml
deleted file mode 100644
index 4f0a0f0..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml
+++ /dev/null
@@ -1,81 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first-osgi-package</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first-osgi-package</groupId>
-    <artifactId>wsdl-first-cxfbc-bundle</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First OSGi Package :: CXF BC Bundle</name>
-    <description>CXF WSDL first example :: CXF BC Bundle</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.soap,
-                            javax.xml.ws,
-                            META-INF.cxf,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.servicemix.cxfbc,
-                            org.springframework.beans.factory.config,
-                            org.apache.servicemix.common.osgi
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index a0494af..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/src/main/resources/META-INF/spring/beans.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:cxfbc="http://servicemix.apache.org/cxfbc/1.0"
-       xmlns:person="http://servicemix.apache.org/samples/wsdl-first"
-        xsi:schemaLocation="
-                http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                http://servicemix.apache.org/cxfbc/1.0 http://servicemix.apache.org/cxfbc/1.0/servicemix-cxf-bc.xsd">
-
-  <cxfbc:consumer wsdl="classpath:person.wsdl"
-                      targetService="person:PersonService"
-                      targetInterface="person:Person"/>
-  <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
-
-</beans>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/src/main/resources/person.wsdl b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/src/main/resources/person.wsdl
deleted file mode 100644
index 9ff2483..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/src/main/resources/person.wsdl
+++ /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.
-
--->
-<!-- $Rev$ $Date$ -->
-<wsdl:definitions name="wsdl-first"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"
-    xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"
-    targetNamespace="http://servicemix.apache.org/samples/wsdl-first">
-
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types"
-                    elementFormDefault="qualified">
-            <xsd:element name="GetPerson">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="GetPersonResponse">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                        <xsd:element name="ssn" type="xsd:string"/>
-                        <xsd:element name="name" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="UnknownPersonFault">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-  </wsdl:types>
-    
-    <wsdl:message name="GetPersonRequest">
-        <wsdl:part name="payload" element="typens:GetPerson"/>
-    </wsdl:message>
-    <wsdl:message name="GetPersonResponse">
-        <wsdl:part name="payload" element="typens:GetPersonResponse"/>
-    </wsdl:message>
-    <wsdl:message name="UnknownPersonFault">
-        <wsdl:part name="payload" element="typens:UnknownPersonFault"/>
-    </wsdl:message>
-
-    <wsdl:portType name="Person">
-        <wsdl:operation name="GetPerson">
-            <wsdl:input message="tns:GetPersonRequest"/>
-            <wsdl:output message="tns:GetPersonResponse"/>
-            <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    
-    <wsdl:binding name="PersonSOAPBinding" type="tns:Person">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="GetPerson">
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="UnknownPerson">
-                <soap:fault use="literal" name="UnknownPerson" />
-            </wsdl:fault>
-       </wsdl:operation>
-   </wsdl:binding>
-
-    <wsdl:service name="PersonService">
-        <wsdl:port binding="tns:PersonSOAPBinding" name="soap">
-           <soap:address location="http://localhost:8092/PersonService/" />
-       </wsdl:port>
-   </wsdl:service>
-
-</wsdl:definitions>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml
deleted file mode 100644
index 3d08da0..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml
+++ /dev/null
@@ -1,115 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first-osgi-package</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first-osgi-package</groupId>
-    <artifactId>wsdl-first-cxfse-bundle</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First OSGi Package :: CXF SE Bundle</name>
-    <description>CXF WSDL first example :: CXF SE Bundle</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/jaxws</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/person.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-verbose</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.soap,
-                            javax.xml.ws,
-                            META-INF.cxf,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.servicemix.cxfse,
-                            org.springframework.beans.factory.config,
-                            org.apache.servicemix.common.osgi
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <Export-Package>
-                            org.apache.servicemix.samples.wsdl_first,
-                            org.apache.servicemix.samples.wsdl_first.types
-                        </Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
deleted file mode 100644
index d8bc59e..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
+++ /dev/null
@@ -1,40 +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.samples.wsdl_first;
-
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-
-import org.apache.servicemix.samples.wsdl_first.types.GetPerson;
-import org.apache.servicemix.samples.wsdl_first.types.GetPersonResponse;
-
-@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
-    {
-        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 = "Guillaume";
-        ssn.value = "000-000-0000";
-    }
-
-}
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 39e40cf..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,36 +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:cxfse="http://servicemix.apache.org/cxfse/1.0"
-        xsi:schemaLocation="
-                http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/cxfse/1.0/servicemix-cxf-se.xsd">
-
-
-    <cxfse:endpoint>
-        <cxfse:pojo>
-          <bean class="org.apache.servicemix.samples.wsdl_first.PersonImpl" />
-        </cxfse:pojo>
-    </cxfse:endpoint>
-
-    <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
-
-</beans>
diff --git a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/resources/person.wsdl b/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/resources/person.wsdl
deleted file mode 100644
index 9ff2483..0000000
--- a/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/src/main/resources/person.wsdl
+++ /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.
-
--->
-<!-- $Rev$ $Date$ -->
-<wsdl:definitions name="wsdl-first"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"
-    xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"
-    targetNamespace="http://servicemix.apache.org/samples/wsdl-first">
-
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types"
-                    elementFormDefault="qualified">
-            <xsd:element name="GetPerson">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="GetPersonResponse">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                        <xsd:element name="ssn" type="xsd:string"/>
-                        <xsd:element name="name" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="UnknownPersonFault">
-              <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="personId" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-  </wsdl:types>
-    
-    <wsdl:message name="GetPersonRequest">
-        <wsdl:part name="payload" element="typens:GetPerson"/>
-    </wsdl:message>
-    <wsdl:message name="GetPersonResponse">
-        <wsdl:part name="payload" element="typens:GetPersonResponse"/>
-    </wsdl:message>
-    <wsdl:message name="UnknownPersonFault">
-        <wsdl:part name="payload" element="typens:UnknownPersonFault"/>
-    </wsdl:message>
-
-    <wsdl:portType name="Person">
-        <wsdl:operation name="GetPerson">
-            <wsdl:input message="tns:GetPersonRequest"/>
-            <wsdl:output message="tns:GetPersonResponse"/>
-            <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    
-    <wsdl:binding name="PersonSOAPBinding" type="tns:Person">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="GetPerson">
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="UnknownPerson">
-                <soap:fault use="literal" name="UnknownPerson" />
-            </wsdl:fault>
-       </wsdl:operation>
-   </wsdl:binding>
-
-    <wsdl:service name="PersonService">
-        <wsdl:port binding="tns:PersonSOAPBinding" name="soap">
-           <soap:address location="http://localhost:8092/PersonService/" />
-       </wsdl:port>
-   </wsdl:service>
-
-</wsdl:definitions>
diff --git a/trunk/examples/cxf-wsdl-first/README.txt b/trunk/examples/cxf-wsdl-first/README.txt
deleted file mode 100644
index 573b0fb..0000000
--- a/trunk/examples/cxf-wsdl-first/README.txt
+++ /dev/null
@@ -1,208 +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.
- */
-
-WSDL First JBI Service Assembly Example
-=======================================
-
-Purpose
--------
-Publish a WSDL-defined web service, as a JBI service assembly, using CXF.
-
-This example is the same as the cxf-wsdl-first-osgi-package example except
-it is deployed as a JBI service assembly, whereas the cxf-wsdl-first-osgi-
-package example is deployed as OSGi bundles.
-
-
-Explanation
------------
-The CXF service engine and CXF binding component are used to expose the
-web service. Each one is packaged in a service unit (SU), as follows:
-
-1. CXF service engine (see the wsdl-first-cxfse-su directory):
-   
-   - Contains a copy of the service WSDL file, person.wsdl, in the
-     src/main/resources directory.
-   
-   - The service implementation file, PersonImpl.java, in the
-     src/main/java/org/apache/servicemix/samples/wsdl_first directory.
-     It contains JAX-WS annotations that specify which web service
-     it implements:
-
-       @WebService(serviceName = "PersonService", 
-           targetNamespace = "http://servicemix.apache.org/samples/wsdl-first",
-           endpointInterface = "org.apache.servicemix.samples.wsdl_first.Person")
-   
-   - A configuration file, xbean.xml, located in the src/main/resources
-     directory, which configures the CXF endpoint:
-     
-      <cxfse:endpoint>
-          <cxfse:pojo>
-            <bean class="org.apache.servicemix.samples.wsdl_first.PersonImpl" />
-          </cxfse:pojo>
-      </cxfse:endpoint>
-    
-2. CXF binding component (see the wsdl-first-cxfbc-su directory):
-
-   - Contains a copy of the service WSDL file, person.wsdl, in the
-     src/main/resources directory.
-    
-   - A configuration file, xbean.xml, located in the src/main/resources
-     directory, which specifies a CXF consumer that will accept
-     incoming calls for that web service and pass them to the NMR:
-
-     <cxfbc:consumer wsdl="classpath:person.wsdl"
-                      targetService="person:PersonService"
-                      targetInterface="person:Person"/>
-
-Lastly, Maven uses the pom.xml file, located in the wsdl-first-cxf-sa
-directory, to package the SUs into a JBI service assembly (SA) ready
-for deployment.
-
-
-Prerequisites for Building and Running this Example
----------------------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher.
-
-   - Apache Maven 2.0.9 or higher.
-
-   For more information, see the README in the top-level examples
-   directory.
-
-2. Launch ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix	(on UNIX)
-  <servicemix_home>\bin\servicemix   (on Windows)
-
-
-Building and Deploying
-----------------------
-To build the example, run the following command (from the
-directory that contains this README):
-
-  mvn install
-  
-If all of the required OSGi bundles are available in your local Maven
-repository, the example will build quickly. Otherwise it may take
-some time for Maven to download everything it needs.
-
-Once complete, you will find the SA, called wsdl-first-cxf-sa-
-${version}.zip, in the wsdl-first-cxf-sa/target directory.
-
-You can deploy the SA in two ways:
-
-- Using Hot Deployment
-  --------------------
-  
-  Copy the wsdl-first-cxf-sa/target/wsdl-first-cxf-sa-${version}.zip
-  to the <servicemix_home>/deploy directory.
-     
-- Using the ServiceMix Console
-  ----------------------------
-  
-  Enter the following command:
-
-  osgi:install -s mvn:org.apache.servicemix.examples.cxf-wsdl-first/wsdl-first-cxf-sa/${version}/zip
- 
-You can browse the WSDL at:
-
-  http://localhost:8092/PersonService?wsdl
-
-
-Running a Client
-----------------
-To run the web client:
-
-1. Open the client.html, which is located in the same directory
-   as this README file, in your favorite browser.
-
-2. Click the Send button to send a request.
-
-   Once the request has been successfully sent, a response similar
-   to the following should appear in the right-hand panel of the
-   web page:
-   
-   STATUS: 200
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><GetPersonResponse xmlns="http://servicemix.apache.org/
-     samples/wsdl-first/types"><personId>world</personId>
-     <ssn>000-000-0000</ssn><name>Guillaume</name></GetPersonResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-To run the Java code client:
-
-1. Change to the <servicemix_home>/examples/cxf-wsdl-first/client
-   directory.
-
-2. Run the following command:
-
-     mvn compile exec:java
-     
-   If the client request is successful, a response similar to the
-   following should appear in the ServiceMix console:
-        
-   <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-     <soap:Body><GetPersonResponse xmlns="http://servicemix.apache.org/
-       samples/wsdl-first/types"><personId>world</personId>
-       <ssn>000-000-0000</ssn><name>Guillaume</name></GetPersonResponse>
-     </soap:Body>
-   </soap:Envelope>
-
-
-Stopping and Uninstalling the Example
--------------------------------------
-To stop the example, you must first know the bundle ID that ServiceMix
-has assigned to it. To get the bundle ID, enter the following command
-in the ServiceMix console:
-
-  osgi:list
-
-At the end of the listing, you should see an entry similar to one of
-the following (depending on how you deployed the example):
-
-[ 183] [Active     ] [       ] [     ] [   60] mvn:org.apache.servicemix.examples.cxf-wsdl-first/wsdl-first-cxf-sa/${version}/zip
-
-[ 183] [Active     ] [       ] [     ] [   60] wsdl-first-cxf-sa (0.0.0)
-
-In this case, the bundle ID is 183.
-
-To stop the example, enter the following command in the ServiceMix
-console:
-
-  osgi:stop <bundle_id>
-
-To uninstall the example, enter the following command in the
-ServiceMix console:
-
-  osgi:uninstall <bundle_id>
-
-
-Viewing the Log Entries
------------------------
-You can view the entries in the log file in the data/log directory
-of your ServiceMix installation, or by typing the following command
-in the ServiceMix console:
-
-  log:display
-
-
-Changing the Example
---------------------
-If you want to change the code or configuration, just use 'mvn install'
-to rebuild the JBI Service Assembly zip file, and deploy it as before.
\ No newline at end of file
diff --git a/trunk/examples/cxf-wsdl-first/client.html b/trunk/examples/cxf-wsdl-first/client.html
deleted file mode 100644
index 9ffcb63..0000000
--- a/trunk/examples/cxf-wsdl-first/client.html
+++ /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.

-

--->

-<!-- $Rev: 593004 $ $Date: 2007-11-08 04:04:54 +0000 (Thu, 08 Nov 2007) $ -->

-<html>

-<head>

-<title>ServiceMix WSDL-First Example</title>

-<script type="text/javascript">

-var urlToOpen = "http://localhost:8092/PersonService/"; //default URL to open

-

-function getHTTPObject() {

-  var xmlhttp = false;

-

-  /* Compilation conditionnelle d'IE */

-  /*@cc_on

-  @if (@_jscript_version >= 5)

-     try {

-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");

-     } catch (e) {

-        try {

-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");

-        } catch (E) {

-           xmlhttp = false;

-        }

-     }

-  @else

-     xmlhttp = false;

-  @end @*/

-

-  /* on essaie de créer l'objet si ce n'est pas déjà fait */

-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {

-     try {

-        xmlhttp = new XMLHttpRequest();

-     } catch (e) {

-        xmlhttp = false;

-     }

-  }

-

-  if (xmlhttp) {

-     /* on définit ce qui doit se passer quand la page répondra */

-     xmlhttp.onreadystatechange=function() {

-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */

-           var response = document.getElementById("response");

-           var responseStatus = "";

-           try {

-             responseStatus = xmlhttp.status + "";

-           } catch (e) {

-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";

-           }

-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;

-        }

-     }

-  }

-  return xmlhttp;

-}

-

-function send() {

-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {

-    //use user entry only if it at least can be okay

-    urlToOpen = document.getElementById("urlToOpen").value;

-  }  

-  var xmlhttp = getHTTPObject();

-  if (!xmlhttp) {

-    alert('cound not create XMLHttpRequest object');

-    return;

-  }

-  var request = document.getElementById("request");

-  var response = document.getElementById("response");

-  try {

-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");

-  } catch (e) {

-  }

-  try {

-    xmlhttp.open("POST", urlToOpen, true);

-  } catch (e) {

-    alert('error opening');

-  }

-  xmlhttp.send(request.value);

-}

-

-</script>

-</head>

-

-<body>

-

-<h1>ServiceMix WSDL-First Example</h1>

-

-<p>Welcome to the WSDL-First example for ServiceMix</p>

-

-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 

-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>

-  

-<table>

-  <tr>

-    <td>

-  <textarea id="request" style="width:600px;height:400px" onKeyUp="send();"><?xml version="1.0" encoding="UTF-8"?>

-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"

-              xmlns:tns="http://servicemix.apache.org/samples/wsdl-first/types">

-  <env:Body>

-    <tns:GetPerson>

-      <tns:personId>world</tns:personId>

-    </tns:GetPerson>

-  </env:Body>

-</env:Envelope>

-

-  </textarea>

-    </td>

-    <td>

-  <textarea id="response" style="width:600px;height:400px">

-  </textarea>

-    </td>

-  </tr>

-  <tr>

-    <td colspan=2>

-  <input type="button" value="Send" onClick="send();"/>

-    </td>

-  </tr>

-</table>

-</body>

-</html>

diff --git a/trunk/examples/cxf-wsdl-first/client/pom.xml b/trunk/examples/cxf-wsdl-first/client/pom.xml
deleted file mode 100644
index 58b14d9..0000000
--- a/trunk/examples/cxf-wsdl-first/client/pom.xml
+++ /dev/null
@@ -1,61 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
-    <artifactId>wsdl-first-client</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: Client</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.wsdl_first.Client</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first/client/src/main/java/org/apache/servicemix/samples/wsdl_first/Client.java b/trunk/examples/cxf-wsdl-first/client/src/main/java/org/apache/servicemix/samples/wsdl_first/Client.java
deleted file mode 100644
index c6a2a92..0000000
--- a/trunk/examples/cxf-wsdl-first/client/src/main/java/org/apache/servicemix/samples/wsdl_first/Client.java
+++ /dev/null
@@ -1,53 +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.samples.wsdl_first;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.servicemix.util.FileUtil;
-
-public class Client{
-    public static void main(String[] args) {
-        try {
-        new Client().sendRequest();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void sendRequest() throws Exception {
-        URLConnection connection = new URL("http://localhost:8092/PersonService/")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/samples/wsdl_first/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        System.out.println("the response is =====>");
-        System.out.println(baos.toString());
-    }
-
-}
diff --git a/trunk/examples/cxf-wsdl-first/client/src/main/resources/org/apache/servicemix/samples/wsdl_first/request.xml b/trunk/examples/cxf-wsdl-first/client/src/main/resources/org/apache/servicemix/samples/wsdl_first/request.xml
deleted file mode 100644
index 8a56f1c..0000000
--- a/trunk/examples/cxf-wsdl-first/client/src/main/resources/org/apache/servicemix/samples/wsdl_first/request.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
-              xmlns:tns="http://servicemix.apache.org/samples/wsdl-first/types">
-  <env:Body>
-    <tns:GetPerson>
-      <tns:personId>world</tns:personId>
-    </tns:GetPerson>
-  </env:Body>
-</env:Envelope>
diff --git a/trunk/examples/cxf-wsdl-first/pom.xml b/trunk/examples/cxf-wsdl-first/pom.xml
deleted file mode 100644
index 006e949..0000000
--- a/trunk/examples/cxf-wsdl-first/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/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>cxf-wsdl-first</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: CXF WSDL First</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>wsdl-first-cxfse-su</module>
-        <module>wsdl-first-cxfbc-su</module>
-        <module>wsdl-first-cxf-sa</module>
-        <module>client</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first/src/main/assembly/src.xml b/trunk/examples/cxf-wsdl-first/src/main/assembly/src.xml
deleted file mode 100644
index 8863742..0000000
--- a/trunk/examples/cxf-wsdl-first/src/main/assembly/src.xml
+++ /dev/null
@@ -1,39 +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>

-    <format>zip</format>

-  </formats>

-  <fileSets>

-    <fileSet>

-      <includes>

-        <include>README*</include>

-        <include>LICENSE*</include>

-        <include>NOTICE*</include>

-        <include>pom.xml</include>

-        <include>*.html</include>

-        <include>src/**/*</include>

-        <include>*/pom.xml</include>

-        <include>*/src/**/*</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-</assembly>

diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml b/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml
deleted file mode 100644
index 6cac049..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml
+++ /dev/null
@@ -1,58 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
-    <artifactId>wsdl-first-cxf-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
-            <artifactId>wsdl-first-cxfse-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
-            <artifactId>wsdl-first-cxfbc-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
deleted file mode 100644
index a4c337b..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
-    <artifactId>wsdl-first-cxfbc-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: CXF BC SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-cxf-bc</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl
deleted file mode 100644
index 1f7c4a5..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl
+++ /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.

-

--->

-<!-- $Rev: 593004 $ $Date: 2007-11-08 04:04:54 +0000 (Thu, 08 Nov 2007) $ -->

-<wsdl:definitions name="wsdl-first"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"

-    xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"

-    targetNamespace="http://servicemix.apache.org/samples/wsdl-first">

-

-    <wsdl:types>

-        <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types"

-                    elementFormDefault="qualified">

-            <xsd:element name="GetPerson">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="GetPersonResponse">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                        <xsd:element name="ssn" type="xsd:string"/>

-                        <xsd:element name="name" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="UnknownPersonFault">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-  </wsdl:types>

-    

-    <wsdl:message name="GetPersonRequest">

-        <wsdl:part name="payload" element="typens:GetPerson"/>

-    </wsdl:message>

-    <wsdl:message name="GetPersonResponse">

-        <wsdl:part name="payload" element="typens:GetPersonResponse"/>

-    </wsdl:message>

-    <wsdl:message name="UnknownPersonFault">

-        <wsdl:part name="payload" element="typens:UnknownPersonFault"/>

-    </wsdl:message>

-

-    <wsdl:portType name="Person">

-        <wsdl:operation name="GetPerson">

-            <wsdl:input message="tns:GetPersonRequest"/>

-            <wsdl:output message="tns:GetPersonResponse"/>

-            <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    

-    <wsdl:binding name="PersonSOAPBinding" type="tns:Person">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="GetPerson">

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="UnknownPerson">

-                <soap:fault use="literal" name="UnknownPerson" />

-            </wsdl:fault>

-       </wsdl:operation>

-   </wsdl:binding>

-

-    <wsdl:service name="PersonService">

-        <wsdl:port binding="tns:PersonSOAPBinding" name="soap">

-           <soap:address location="http://localhost:8092/PersonService/" />

-       </wsdl:port>

-   </wsdl:service>

-

-</wsdl:definitions>

diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/xbean.xml b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/xbean.xml
deleted file mode 100644
index b0e1493..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,27 +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:cxfbc="http://servicemix.apache.org/cxfbc/1.0"

-       xmlns:person="http://servicemix.apache.org/samples/wsdl-first">

-

-  <cxfbc:consumer wsdl="classpath:person.wsdl"

-                      targetService="person:PersonService"

-                      targetInterface="person:Person"/>

-

-</beans>

diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
deleted file mode 100644
index 8677d79..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
+++ /dev/null
@@ -1,118 +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.examples</groupId>
-        <artifactId>cxf-wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.cxf-wsdl-first</groupId>
-    <artifactId>wsdl-first-cxfse-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: CXF SE SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-cxf-se</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>jsr250-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.jws</groupId>
-                    <artifactId>jsr181-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.jws</groupId>
-                    <artifactId>jsr181</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/jaxws</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/person.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-verbose</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                            </wsdlOptions>
-
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
deleted file mode 100644
index 228d7d1..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
+++ /dev/null
@@ -1,40 +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.samples.wsdl_first;

-

-import javax.jws.WebService;

-import javax.xml.ws.Holder;

-

-import org.apache.servicemix.samples.wsdl_first.types.GetPerson;

-import org.apache.servicemix.samples.wsdl_first.types.GetPersonResponse;

-

-@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

-    {

-        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 = "Guillaume";

-        ssn.value = "000-000-0000";

-    }

-

-}

diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl
deleted file mode 100644
index 1f7c4a5..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl
+++ /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.

-

--->

-<!-- $Rev: 593004 $ $Date: 2007-11-08 04:04:54 +0000 (Thu, 08 Nov 2007) $ -->

-<wsdl:definitions name="wsdl-first"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"

-    xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"

-    targetNamespace="http://servicemix.apache.org/samples/wsdl-first">

-

-    <wsdl:types>

-        <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types"

-                    elementFormDefault="qualified">

-            <xsd:element name="GetPerson">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="GetPersonResponse">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                        <xsd:element name="ssn" type="xsd:string"/>

-                        <xsd:element name="name" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="UnknownPersonFault">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-  </wsdl:types>

-    

-    <wsdl:message name="GetPersonRequest">

-        <wsdl:part name="payload" element="typens:GetPerson"/>

-    </wsdl:message>

-    <wsdl:message name="GetPersonResponse">

-        <wsdl:part name="payload" element="typens:GetPersonResponse"/>

-    </wsdl:message>

-    <wsdl:message name="UnknownPersonFault">

-        <wsdl:part name="payload" element="typens:UnknownPersonFault"/>

-    </wsdl:message>

-

-    <wsdl:portType name="Person">

-        <wsdl:operation name="GetPerson">

-            <wsdl:input message="tns:GetPersonRequest"/>

-            <wsdl:output message="tns:GetPersonResponse"/>

-            <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    

-    <wsdl:binding name="PersonSOAPBinding" type="tns:Person">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="GetPerson">

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="UnknownPerson">

-                <soap:fault use="literal" name="UnknownPerson" />

-            </wsdl:fault>

-       </wsdl:operation>

-   </wsdl:binding>

-

-    <wsdl:service name="PersonService">

-        <wsdl:port binding="tns:PersonSOAPBinding" name="soap">

-           <soap:address location="http://localhost:8092/PersonService/" />

-       </wsdl:port>

-   </wsdl:service>

-

-</wsdl:definitions>

diff --git a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/xbean.xml b/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/xbean.xml
deleted file mode 100644
index 9040850..0000000
--- a/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/xbean.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:cxfse="http://servicemix.apache.org/cxfse/1.0">

-

-    <cxfse:endpoint>

-        <cxfse:pojo>

-          <bean class="org.apache.servicemix.samples.wsdl_first.PersonImpl" />

-        </cxfse:pojo>

-    </cxfse:endpoint>

-

-</beans>

diff --git a/trunk/examples/itests/cxf-handler-cfg/pom.xml b/trunk/examples/itests/cxf-handler-cfg/pom.xml
deleted file mode 100644
index 792dcfa..0000000
--- a/trunk/examples/itests/cxf-handler-cfg/pom.xml
+++ /dev/null
@@ -1,104 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-handler-cfg</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF SOAP Handler OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.soap,
-                            javax.xml.transform,
-                            javax.xml.ws,
-                            javax.xml.ws.handler,
-                            javax.xml.ws.handler.soap,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <Export-Package>org.apache.springcfg.handlers.types,org.apache.springcfg.handlers,org.apache.servicemix.examples.cxf.springcfghandler</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/AddNumbersImpl.java b/trunk/examples/itests/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/AddNumbersImpl.java
deleted file mode 100644
index b621788..0000000
--- a/trunk/examples/itests/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/AddNumbersImpl.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.examples.cxf.springcfghandler;
-
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-import org.apache.springcfg.handlers.AddNumbers;
-import org.apache.springcfg.handlers.AddNumbersFault;
-import org.apache.springcfg.handlers.types.FaultDetail;
-
-
-@WebService(name = "AddNumbers",
-            targetNamespace = "http://apache.org/handlers",
-            portName = "AddNumbersPort",
-            endpointInterface = "org.apache.springcfg.handlers.AddNumbers",
-            serviceName = "AddNumbersService")
-
-public class AddNumbersImpl implements AddNumbers {
-
-
-    /**
-     * @param number1
-     * @param number2
-     * @return The sum
-     * @throws AddNumbersException
-     *             if any of the numbers to be added is negative.
-     */
-    public int addNumbers(int number1, int number2) throws AddNumbersFault {
-        System.out.println("addNumbers called....." + number1 + ":" + number2);
-        if (number1 < 0 || number2 < 0) {
-            String message = "Negative number cant be added!";
-            String detail = "Numbers: " + number1 + ", " + number2;
-            FaultDetail fault = new FaultDetail();
-            fault.setMessage(message);
-            fault.setFaultInfo(detail);
-            throw new AddNumbersFault(message, fault);
-        }
-        return number1 + number2;
-    }
-
-}
diff --git a/trunk/examples/itests/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/ModifyNumberHandler.java b/trunk/examples/itests/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/ModifyNumberHandler.java
deleted file mode 100644
index bb633c8..0000000
--- a/trunk/examples/itests/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/ModifyNumberHandler.java
+++ /dev/null
@@ -1,76 +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.examples.cxf.springcfghandler;
-
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.ws.LogicalMessage;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.handler.LogicalHandler;
-import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.handler.MessageContext;
-
-import org.apache.springcfg.handlers.types.AddNumbers;
-import org.apache.springcfg.handlers.types.ObjectFactory;
-
-
-/**
- * handles addition of small numbers.
- */
-public class ModifyNumberHandler implements LogicalHandler<LogicalMessageContext> {
-
-    public final boolean handleMessage(LogicalMessageContext messageContext) {
-        //System.out.println("LogicalMessageHandler handleMessage called");
-
-        try {
-            // get the LogicalMessage from our context
-            LogicalMessage msg = messageContext.getMessage();
-
-            // check the payload, if its an AddNumbers request, we'll intervene
-            JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
-            Object payload = msg.getPayload(jaxbContext);
-            Object value = payload;
-            if (payload instanceof JAXBElement) {
-                value = ((JAXBElement)payload).getValue();
-            }
-
-            if (value instanceof AddNumbers) {
-                AddNumbers req = (AddNumbers)value;
-
-                int a = req.getArg0();
-                req.setArg0(a * 10);
-                msg.setPayload(payload, jaxbContext);
-            }
-            return true;
-        } catch (JAXBException ex) {
-            throw new ProtocolException(ex);
-        }
-
-    }
-
-    public final boolean handleFault(LogicalMessageContext messageContext) {
-        return true;
-    }
-
-    public void close(MessageContext ctx) {
-    }
-
-}
diff --git a/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index e66dfeb..0000000
--- a/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,69 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:cxf="http://cxf.apache.org/core" 
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxws:endpoint id="SoapHandlerEndpoint"
-        implementor="org.apache.servicemix.examples.cxf.springcfghandler.AddNumbersImpl"
-        address="/SpringConfigHandler"
-        wsdlLocation="wsdl/addNumbers.wsdl"
-        endpointName="e:AddNumbersPort"
-        serviceName="s:AddNumbersService"
-        xmlns:e="http://apache.org/springcfg/handlers"
-            xmlns:s="http://apache.org/springcfg/handlers">
-        <jaxws:handlers>
-            <bean class="org.apache.servicemix.examples.cxf.springcfghandler.ModifyNumberHandler"/>
-            </jaxws:handlers>
-        </jaxws:endpoint>
-
-       
-       <jaxws:client id="client" 
-             serviceClass="org.apache.springcfg.handlers.AddNumbers"    
-        endpointName="e:AddNumbersPort"
-        serviceName="s:AddNumbersService"
-        xmlns:e="http://apache.org/springcfg/handlers"
-            xmlns:s="http://apache.org/springcfg/handlers"
-             wsdlLocation="wsdl/addNumbers.wsdl"
-             address="http://localhost:8080/cxf/SpringConfigHandler">
-             <jaxws:handlers>
-            <bean class="org.apache.servicemix.examples.cxf.springcfghandler.ModifyNumberHandler"/>
-            </jaxws:handlers>
-         </jaxws:client>
- 
-       <osgi:service id="testSpringCfgHandler" ref="client"
-            interface="org.apache.springcfg.handlers.AddNumbers"/>
-
-       
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/cxf-handler-cfg/src/main/resources/wsdl/addNumbers.wsdl b/trunk/examples/itests/cxf-handler-cfg/src/main/resources/wsdl/addNumbers.wsdl
deleted file mode 100644
index d1f2352..0000000
--- a/trunk/examples/itests/cxf-handler-cfg/src/main/resources/wsdl/addNumbers.wsdl
+++ /dev/null
@@ -1,96 +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.
--->
-<definitions
-    name="AddNumbers"
-    targetNamespace="http://apache.org/springcfg/handlers"
-    xmlns:tns="http://apache.org/springcfg/handlers"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:x1="http://apache.org/springcfg/handlers/types">
-    <types>
-        <xsd:schema
-            xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://apache.org/springcfg/handlers/types"
-            elementFormDefault="qualified">
-
-            <complexType name="addNumbersResponse">
-                <sequence>
-                    <element name="return" type="xsd:int" />
-                </sequence>
-            </complexType>
-            <element name="addNumbersResponse" type="x1:addNumbersResponse"/>
-
-            <complexType name="addNumbers">
-                <sequence>
-                    <element name="arg0" type="xsd:int" />
-                    <element name="arg1" type="xsd:int" />
-                </sequence>
-            </complexType>
-            <element name="addNumbers" type="x1:addNumbers"/>
-
-            <element name="FaultDetail" type="x1:FaultDetail" />
-            <complexType name="FaultDetail">
-                <sequence>
-                    <element name="faultInfo" type="xsd:string" />
-                    <element name="message" type="xsd:string" />
-                </sequence>
-            </complexType>
-        </xsd:schema>
-    </types>
-    <message name="addNumbers">
-        <part name="parameters" element="x1:addNumbers" />
-    </message>
-    <message name="addNumbersResponse">
-        <part name="result" element="x1:addNumbersResponse" />
-    </message>
-    <message name="addNumbersFault">
-        <part name="AddNumbersFault" element="x1:FaultDetail" />
-    </message>
-    <portType name="AddNumbers">
-        <operation name="addNumbers">
-            <input message="tns:addNumbers" />
-            <output message="tns:addNumbersResponse" />
-            <fault name="addNumbersFault" message="tns:addNumbersFault"/>
-        </operation>
-    </portType>
-    <binding name="AddNumbersBinding" type="tns:AddNumbers">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <operation name="addNumbers">
-            <soap:operation soapAction="" />
-            <input>
-                <soap:body use="literal" />
-            </input>
-            <output>
-                <soap:body use="literal" />
-            </output>
-            <fault name="addNumbersFault">
-                <soap:fault name="addNumbersFault" use="literal" />
-            </fault>
-        </operation>
-    </binding>
-    <service name="AddNumbersService">
-        <port name="AddNumbersPort" binding="tns:AddNumbersBinding">
-            <soap:address location="http://localhost:8181/cxf/SpringConfigHandler" />
-        </port>
-    </service>
-</definitions>
diff --git a/trunk/examples/itests/cxf-http-osgi/pom.xml b/trunk/examples/itests/cxf-http-osgi/pom.xml
deleted file mode 100644
index bf6744a..0000000
--- a/trunk/examples/itests/cxf-http-osgi/pom.xml
+++ /dev/null
@@ -1,85 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-http-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
-            <version>${project.version}</version>
-        </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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.ws,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.springframework.beans.factory.config,
-                            org.apache.servicemix.examples.cxf
-                        </Import-Package>
-                        <Export-Package>org.apache.servicemix.examples.cxf_http_osgi</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf_http_osgi/HelloWorldImpl.java b/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf_http_osgi/HelloWorldImpl.java
deleted file mode 100644
index ee0e63b..0000000
--- a/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf_http_osgi/HelloWorldImpl.java
+++ /dev/null
@@ -1,35 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf_http_osgi;
-
-import javax.jws.WebService;
-import org.apache.servicemix.examples.cxf.*;
-//@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-@WebService(serviceName = "HelloWorldImplService",
-            portName = "HelloWorldImplPort",
-            endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld",
-            targetNamespace = "http://cxf.examples.servicemix.apache.org/")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 60c508b..0000000
--- a/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,63 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxws:endpoint id="HTTPEndpoint"
-        implementor="org.apache.servicemix.examples.cxf_http_osgi.HelloWorldImpl"
-        address="/HelloWorldOSGi"
-        wsdlLocation="wsdl/hello_world.wsdl"
-        endpointName="e:HelloWorldImplPort"
-        serviceName="s:HelloWorldImplService"
-        xmlns:e="http://cxf.examples.servicemix.apache.org/"
-        xmlns:s="http://cxf.examples.servicemix.apache.org/"/>
-
-
-    <jaxws:client id="client" 
-         serviceClass="org.apache.servicemix.examples.cxf.HelloWorld"    
-        endpointName="e:HelloWorldImplPort"
-        serviceName="s:HelloWorldImplService"
-        xmlns:e="http://cxf.examples.servicemix.apache.org/"
-        xmlns:s="http://cxf.examples.servicemix.apache.org/"
-         wsdlLocation="wsdl/hello_world.wsdl"
-         address="http://localhost:8080/cxf/HelloWorldOSGi"/>   
- 
-    <osgi:service id="testHelloWorld" ref="client"
-        interface="org.apache.servicemix.examples.cxf.HelloWorld">
-        <osgi:service-properties>
-            <entry key="TEST-BUNDLE-NAME" value="cxf-http-osgi" />
-        </osgi:service-properties>
-    </osgi:service>
-
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/cxf-http-osgi/src/main/resources/wsdl/hello_world.wsdl b/trunk/examples/itests/cxf-http-osgi/src/main/resources/wsdl/hello_world.wsdl
deleted file mode 100644
index fcf66bd..0000000
--- a/trunk/examples/itests/cxf-http-osgi/src/main/resources/wsdl/hello_world.wsdl
+++ /dev/null
@@ -1,79 +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 name="HelloWorldImplService" 
-                  targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <xsd:schema attributeFormDefault="unqualified" 
-                    elementFormDefault="unqualified" 
-                    targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:element name="sayHi" type="tns:sayHi" />
-            <xsd:complexType name="sayHi">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="arg0" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="sayHiResponse" type="tns:sayHiResponse" />
-            <xsd:complexType name="sayHiResponse">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="return" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="tns:sayHiResponse" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="sayHi">
-        <wsdl:part element="tns:sayHi" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHi" name="sayHi">
-            </wsdl:input>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="HelloWorldImplServiceSoapBinding" type="tns:HelloWorld">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="document" />
-            <wsdl:input name="sayHi">
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="HelloWorldImplService">
-        <wsdl:port binding="tns:HelloWorldImplServiceSoapBinding" name="HelloWorldImplPort">
-            <soap:address location="http://localhost:8181/cxf/HelloWorld" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/trunk/examples/itests/cxf-jms-osgi/pom.xml b/trunk/examples/itests/cxf-jms-osgi/pom.xml
deleted file mode 100644
index e08b5b8..0000000
--- a/trunk/examples/itests/cxf-jms-osgi/pom.xml
+++ /dev/null
@@ -1,97 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-jms-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF JMS Transport OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
-            <version>${project.version}</version>
-        </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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.ws,
-                            META-INF.cxf,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.springframework.beans.factory.config,
-                            org.apache.activemq.jndi,
-                            org.apache.activemq.xbean,
-                            org.apache.activemq.broker.region.policy,
-                            javax.transaction,
-                            org.apache.activemq,
-                            org.apache.activemq.pool,
-                            org.apache.activemq.util,
-                            org.apache.activemq.broker.jmx,
-                            org.apache.activemq.network,
-                            org.apache.activemq.store.amq,
-                            org.apache.activemq.usage,
-                            org.apache.activemq.broker,
-                            javax.jms,
-                            org.apache.servicemix.examples.cxf,
-                                                        org.apache.cxf.transport.jms, org.springframework.jms.connection
-                        </Import-Package>
-                        <Export-Package>org.apache.servicemix.examples.cxf_jms_osgi</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf_jms_osgi/HelloWorldImpl.java b/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf_jms_osgi/HelloWorldImpl.java
deleted file mode 100644
index d7b8d1e..0000000
--- a/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf_jms_osgi/HelloWorldImpl.java
+++ /dev/null
@@ -1,36 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf_jms_osgi;
-
-import javax.jws.WebService;
-import org.apache.servicemix.examples.cxf.*;
-
-//@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-@WebService(serviceName = "HelloWorldImplService",
-            portName = "HelloWorldImplPort",
-            endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld",
-            targetNamespace = "http://cxf.examples.servicemix.apache.org/")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml b/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml
deleted file mode 100644
index aecb293..0000000
--- a/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/activemq-broker.xml
+++ /dev/null
@@ -1,133 +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.
--->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:osgi="http://www.springframework.org/schema/osgi"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="default" dataDirectory="${karaf.base}/data/activemq/default" useShutdownHook="true">
-
-        <!-- Destination specific policies using destination names or wildcards -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" memoryLimit="5mb"/>
-                    <policyEntry topic=">" memoryLimit="5mb">
-                        <subscriptionRecoveryPolicy>
-                            <lastImageSubscriptionRecoveryPolicy/>
-                        </subscriptionRecoveryPolicy>
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!-- The store and forward broker networks ActiveMQ will listen to -->
-        <networkConnectors>
-            <!-- by default just auto discover the other brokers -->
-            <networkConnector name="default-nc" uri="multicast://default"/>
-            <!-- Example of a static configuration:
-            <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
-            -->
-        </networkConnectors>
-
-        <persistenceAdapter>
-            <amqPersistenceAdapter syncOnWrite="false" directory="${karaf.base}/data/activemq/default" maxFileLength="20 mb"/>
-        </persistenceAdapter>
-
-        <!-- Use the following if you wish to configure the journal with JDBC -->
-        <!--
-        <persistenceAdapter>
-            <journaledJDBC dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
-        </persistenceAdapter>
-        -->
-
-        <!-- Or if you want to use pure JDBC without a journal -->
-        <!--
-        <persistenceAdapter>
-            <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
-        </persistenceAdapter>
-        -->
-
-        <!--  The maximum about of space the broker will use before slowing down producers -->
-        <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="tcp://localhost:61616" discoveryUri="multicast://default"/>
-            <transportConnector name="stomp" uri="stomp://localhost:61613"/>
-        </transportConnectors>
-
-    </broker>
-
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-        <property name="brokerURL" value="tcp://localhost:61616" />
-    </bean>
-
-    <bean id="pooledConnectionFactoryFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
-        <property name="maxConnections" value="8" />
-        <property name="maximumActive" value="500" />
-        <property name="connectionFactory" ref="activemqConnectionFactory" />
-    </bean>
-    <bean id="pooledConnectionFactory" factory-bean="pooledConnectionFactoryFactory" factory-method="getConnectionFactory" />
-
-    <bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
-          <property name="transactionManager" ref="transactionManager" />
-          <property name="connectionFactory" ref="activemqConnectionFactory" />
-          <property name="resourceName" value="activemq.default" />
-    </bean>
-
-    <osgi:reference id="transactionManager" interface="javax.transaction.TransactionManager"
-                    cardinality="0..1"/>
-
-    <osgi:service ref="pooledConnectionFactory">
-        <osgi:interfaces>
-            <value>javax.jms.ConnectionFactory</value>
-        </osgi:interfaces>
-        <osgi:service-properties>
-            <entry key="name" value="default"/>
-        </osgi:service-properties>
-    </osgi:service>
-
-</beans>
-
-
diff --git a/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 91e8e2a..0000000
--- a/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,87 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xmlns:p="http://www.springframework.org/schema/p"
-        xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
-
-    <jaxws:endpoint id="JMSEndpoint"
-        implementor="org.apache.servicemix.examples.cxf_jms_osgi.HelloWorldImpl"
-        wsdlLocation="wsdl/hello_world.wsdl"
-        endpointName="e:HelloWorldImplPort"
-        serviceName="s:HelloWorldImplService"
-        xmlns:e="http://cxf.examples.servicemix.apache.org/"
-            xmlns:s="http://cxf.examples.servicemix.apache.org/">
-            <jaxws:features>
-                <bean xmlns="http://www.springframework.org/schema/beans"
-                        class="org.apache.cxf.transport.jms.JMSConfigFeature"
-                        p:jmsConfig-ref="jmsConfig"/>
-            </jaxws:features>
-        </jaxws:endpoint>
-
-
-    <jaxws:client id="client" 
-         serviceClass="org.apache.servicemix.examples.cxf.HelloWorld"    
-        endpointName="e:HelloWorldImplPort"
-        serviceName="s:HelloWorldImplService"
-        xmlns:e="http://cxf.examples.servicemix.apache.org/"
-        xmlns:s="http://cxf.examples.servicemix.apache.org/"
-         wsdlLocation="wsdl/hello_world.wsdl"
-         >
-        <jaxws:features>
-                <bean xmlns="http://www.springframework.org/schema/beans"
-                        class="org.apache.cxf.transport.jms.JMSConfigFeature"
-                        p:jmsConfig-ref="jmsConfig"/>
-        </jaxws:features>
-    </jaxws:client>   
- 
-    <bean id="jmsConfig" class="org.apache.cxf.transport.jms.JMSConfiguration"
-        p:connectionFactory-ref="jmsConnectionFactory"
-        p:targetDestination="test.cxf.jmstransport.queue"
-     />
-
-     <bean id="jmsConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
-        <property name="targetConnectionFactory">
-                <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-                        <property name="brokerURL" value="tcp://localhost:61616" />
-                </bean>
-        </property>
-    </bean>
-
-    <osgi:service id="testHelloWorld" ref="client"
-        interface="org.apache.servicemix.examples.cxf.HelloWorld">
-        <osgi:service-properties>
-            <entry key="TEST-BUNDLE-NAME" value="cxf-jms-osgi" />
-        </osgi:service-properties>
-    </osgi:service>
-
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/cxf-jms-osgi/src/main/resources/wsdl/hello_world.wsdl b/trunk/examples/itests/cxf-jms-osgi/src/main/resources/wsdl/hello_world.wsdl
deleted file mode 100644
index ad999fc..0000000
--- a/trunk/examples/itests/cxf-jms-osgi/src/main/resources/wsdl/hello_world.wsdl
+++ /dev/null
@@ -1,86 +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 name="HelloWorldImplService" 
-                  targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  xmlns:jms="http://cxf.apache.org/transports/jms">
-    <wsdl:types>
-        <xsd:schema attributeFormDefault="unqualified" 
-                    elementFormDefault="unqualified" 
-                    targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:element name="sayHi" type="tns:sayHi" />
-            <xsd:complexType name="sayHi">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="arg0" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="sayHiResponse" type="tns:sayHiResponse" />
-            <xsd:complexType name="sayHiResponse">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="return" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="tns:sayHiResponse" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="sayHi">
-        <wsdl:part element="tns:sayHi" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHi" name="sayHi">
-            </wsdl:input>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="HelloWorldImplServiceSoapBinding" type="tns:HelloWorld">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="document" />
-            <wsdl:input name="sayHi">
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="HelloWorldImplService">
-        <wsdl:port binding="tns:HelloWorldImplServiceSoapBinding" name="HelloWorldImplPort">
-            <jms:address
-                   jndiConnectionFactoryName="ConnectionFactory"
-                   jndiDestinationName="dynamicQueues/test.jmstransport.text">                    <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
-            </jms:address>
-
-            <jms:server durableSubscriberName="CXF_subscriber"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/trunk/examples/itests/cxf-mtom-osgi/pom.xml b/trunk/examples/itests/cxf-mtom-osgi/pom.xml
deleted file mode 100644
index 44c4f70..0000000
--- a/trunk/examples/itests/cxf-mtom-osgi/pom.xml
+++ /dev/null
@@ -1,107 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-mtom-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF MTOM OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/mtom.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.soap,
-                            javax.xml.transform,
-                            javax.xml.ws,
-                            javax.activation,
-                            javax.jws.soap,
-                            javax.mail.util,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.feature,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <Export-Package>org.apache.cxf.mime, org.apache.cxf.mime.types,
-                            org.apache.servicemix.examples.cxf.mtom</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-mtom-osgi/src/main/java/org/apache/servicemix/examples/cxf/mtom/TestMtomImpl.java b/trunk/examples/itests/cxf-mtom-osgi/src/main/java/org/apache/servicemix/examples/cxf/mtom/TestMtomImpl.java
deleted file mode 100644
index 2457d03..0000000
--- a/trunk/examples/itests/cxf-mtom-osgi/src/main/java/org/apache/servicemix/examples/cxf/mtom/TestMtomImpl.java
+++ /dev/null
@@ -1,65 +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.examples.cxf.mtom;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.activation.DataHandler;
-import javax.jws.WebService;
-import javax.mail.util.ByteArrayDataSource;
-import javax.xml.ws.Holder;
-
-import org.apache.cxf.mime.TestMtom;
-
-@WebService(serviceName = "TestMtomService", 
-        portName = "TestMtomPort", 
-        targetNamespace = "http://cxf.apache.org/mime", 
-        endpointInterface = "org.apache.cxf.mime.TestMtom",
-            wsdlLocation = "testutils/mtom_xop.wsdl")
-public class TestMtomImpl implements TestMtom {
-    public void testXop(Holder<String> name, Holder<DataHandler> attachinfo) {
-       try {
-            System.out.println("Received image with mtom enabled from client");
-            InputStream mtomIn = attachinfo.value.getInputStream();
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            copy(mtomIn, out);
-            System.out.println("The image data size is " + out.size());
-            name.value = "Hello " + name.value;
-            mtomIn.close();
-            attachinfo.value = new DataHandler(new ByteArrayDataSource(out.toByteArray(),
-                                                                       attachinfo.value.getContentType()));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public static int copy(final InputStream input, final OutputStream output) throws IOException {
-        final byte[] buffer = new byte[4096];
-        int n = 0;
-        n = input.read(buffer);
-        int total = 0;
-        while (-1 != n) {
-            output.write(buffer, 0, n);
-            total += n;
-            n = input.read(buffer);
-        }
-        return total;
-    }
-}
diff --git a/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100755
index e1069b2..0000000
--- a/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,73 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxws:endpoint id="MtomEndpoint"
-        implementor="org.apache.servicemix.examples.cxf.mtom.TestMtomImpl"
-        address="/mtom"
-        wsdlLocation="wsdl/mtom.wsdl"
-        endpointName="e:TestMtomPort"
-        serviceName="s:TestMtomService"
-        xmlns:e="http://cxf.apache.org/mime"
-            xmlns:s="http://cxf.apache.org/mime">
-             <jaxws:features>
-                 <bean class="org.apache.cxf.feature.LoggingFeature"/>
-             </jaxws:features>
-             <jaxws:properties>
-                 <entry key="mtom-enabled" value="true"/>
-             </jaxws:properties>
-        </jaxws:endpoint>
-
-       
-       <jaxws:client id="client" 
-             serviceClass="org.apache.cxf.mime.TestMtom"    
-             endpointName="e:TestMtomPort"
-            serviceName="s:TestMtomService"
-            xmlns:e="http://cxf.apache.org/mime"
-            xmlns:s="http://cxf.apache.org/mime"
-            wsdlLocation="wsdl/mtom.wsdl"
-             address="http://localhost:8080/cxf/mtom">
-             <jaxws:features>
-                 <bean class="org.apache.cxf.feature.LoggingFeature"/>
-             </jaxws:features>
-             <jaxws:properties>
-                 <entry key="mtom-enabled" value="true"/>
-             </jaxws:properties>
-        </jaxws:client>   
- 
-       <osgi:service id="testMtom" ref="client"
-            interface="org.apache.cxf.mime.TestMtom"/>
-
-       
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/wsdl/mtom.wsdl b/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/wsdl/mtom.wsdl
deleted file mode 100644
index b17c70b..0000000
--- a/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/wsdl/mtom.wsdl
+++ /dev/null
@@ -1,83 +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 name="SOAPBuilders-mime-cr-test" xmlns:types="http://cxf.apache.org/mime/types"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://cxf.apache.org/mime"
-    xmlns:jms="http://cxf.apache.org/transports/jms"
-    xmlns:xmime="http://www.w3.org/2005/05/xmlmime" targetNamespace="http://cxf.apache.org/mime">
-
-    <wsdl:types>
-        <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://cxf.apache.org/mime/types"
-            xmlns:xmime="http://www.w3.org/2005/05/xmlmime" elementFormDefault="qualified">
-            <complexType name="XopType">
-                <sequence>
-                    <element name="name" type="xsd:string" />
-                    <element name="attachinfo" type="xsd:base64Binary" xmime:expectedContentTypes="application/octet-stream"/>
-                </sequence>
-            </complexType>
-            <element name="testXop" type="types:XopType" />
-            <element name="testXopResponse" type="types:XopType" />
-        </schema>
-
-    </wsdl:types>
-
-    <wsdl:message name="testXopIn">
-        <wsdl:part name="data" element="types:testXop" />
-    </wsdl:message>
-
-    <wsdl:message name="testXopOut">
-        <wsdl:part name="data" element="types:testXopResponse" />
-    </wsdl:message>
-
-
-    <wsdl:portType name="TestMtom">
-
-        <wsdl:operation name="testXop">
-            <wsdl:input message="tns:testXopIn" />
-            <wsdl:output message="tns:testXopOut" />
-        </wsdl:operation>
-
-    </wsdl:portType>
-
-    <wsdl:binding name="TestMtomBinding" type="tns:TestMtom">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-
-        <wsdl:operation name="testXop">
-            <soap:operation soapAction="" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-
-
-    </wsdl:binding>
-
-    <wsdl:service name="TestMtomService">
-        <wsdl:port name="TestMtomPort" binding="tns:TestMtomBinding">
-            <soap:address location="http://localhost:9036/mime-test" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/trunk/examples/itests/cxf-nmr-osgi/pom.xml b/trunk/examples/itests/cxf-nmr-osgi/pom.xml
deleted file mode 100644
index 780c187..0000000
--- a/trunk/examples/itests/cxf-nmr-osgi/pom.xml
+++ /dev/null
@@ -1,89 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-nmr-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF NMR Transport OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
-            <version>${project.version}</version>
-        </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>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.ws,
-                            META-INF.cxf,
-                            META-INF.cxf.transport.nmr,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.feature,
-                            org.springframework.beans.factory.config,
-                            org.apache.servicemix.nmr.api,
-                            org.apache.servicemix.cxf.transport.nmr,
-                            org.apache.servicemix.nmr.api.event,
-                            org.apache.servicemix.nmr.api.internal,
-                            org.apache.servicemix.examples.cxf
-                        </Import-Package>
-                        <Export-Package>org.apache.servicemix.examples.cxf_nmr_osgi</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java b/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java
deleted file mode 100644
index 1e8fd61..0000000
--- a/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java
+++ /dev/null
@@ -1,35 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf_nmr_osgi;
-
-import javax.jws.WebService;
-import org.apache.servicemix.examples.cxf.*;
-//@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-@WebService(serviceName = "HelloWorldImplService",
-            portName = "HelloWorldImplPort",
-            endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld",
-            targetNamespace = "http://cxf.examples.servicemix.apache.org/")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index ef354d1..0000000
--- a/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,69 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
-
-    <jaxws:endpoint id="NMREndpoint"
-        implementor="org.apache.servicemix.examples.cxf_nmr_osgi.HelloWorldImpl"
-            endpointName="e:HelloWorldImplPort"
-        serviceName="s:HelloWorldImplService"
-        xmlns:e="http://cxf.examples.servicemix.apache.org/"
-            address="nmr:HelloWorld"
-        xmlns:s="http://cxf.examples.servicemix.apache.org/">
-            <jaxws:features>
-                <bean class="org.apache.cxf.feature.LoggingFeature"/>
-            </jaxws:features>
-        </jaxws:endpoint>
-
-
-    <jaxws:client id="client" 
-         serviceClass="org.apache.servicemix.examples.cxf.HelloWorld"    
-        xmlns:e="http://cxf.examples.servicemix.apache.org/"
-        xmlns:s="http://cxf.examples.servicemix.apache.org/"
-        endpointName="e:HelloWorldImplPort"     
-            serviceName="s:HelloWorldImplService"
-        address="nmr:HelloWorld"
-         >   
-        <jaxws:features>
-           <bean class="org.apache.cxf.feature.LoggingFeature"/>
-        </jaxws:features>
-    </jaxws:client>
- 
-    <osgi:service id="testHelloWorld" ref="client"
-        interface="org.apache.servicemix.examples.cxf.HelloWorld">
-        <osgi:service-properties>
-            <entry key="TEST-BUNDLE-NAME" value="cxf-nmr-osgi" />
-        </osgi:service-properties>
-    </osgi:service>
-
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/wsdl/hello_world.wsdl b/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/wsdl/hello_world.wsdl
deleted file mode 100644
index f567b2a..0000000
--- a/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/wsdl/hello_world.wsdl
+++ /dev/null
@@ -1,81 +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 name="HelloWorldImplService" 
-                  targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  xmlns:jms="http://cxf.apache.org/transports/jms"
-                  xmlns:nmr="http://cxf.servicemix.apache.org/transport/nmr">
-    <wsdl:types>
-        <xsd:schema attributeFormDefault="unqualified" 
-                    elementFormDefault="unqualified" 
-                    targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:element name="sayHi" type="tns:sayHi" />
-            <xsd:complexType name="sayHi">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="arg0" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="sayHiResponse" type="tns:sayHiResponse" />
-            <xsd:complexType name="sayHiResponse">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="return" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="tns:sayHiResponse" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="sayHi">
-        <wsdl:part element="tns:sayHi" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHi" name="sayHi">
-            </wsdl:input>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="HelloWorldImplServiceSoapBinding" type="tns:HelloWorld">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="document" />
-            <wsdl:input name="sayHi">
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="HelloWorldImplService">
-        <wsdl:port binding="tns:HelloWorldImplServiceSoapBinding" name="HelloWorldImplPort">
-            <nmr:address location="nmr:HelloWorld"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml b/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
deleted file mode 100644
index 55e974b..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
+++ /dev/null
@@ -1,105 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-soap-handler-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF SOAP Handler OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.soap,
-                            javax.xml.transform,
-                            javax.xml.ws,
-                            javax.xml.ws.handler,
-                            javax.xml.ws.handler.soap,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                        <Export-Package>org.apache.handlers.types,
-                            org.apache.handlers,org.apache.servicemix.examples.cxf.soaphandler</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/AddNumbersImpl.java b/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/AddNumbersImpl.java
deleted file mode 100644
index 3551ed8..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/AddNumbersImpl.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.examples.cxf.soaphandler;
-
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-import org.apache.handlers.AddNumbers;
-import org.apache.handlers.AddNumbersFault;
-import org.apache.handlers.types.FaultDetail;
-
-
-@WebService(name = "AddNumbers",
-            targetNamespace = "http://apache.org/handlers",
-            portName = "AddNumbersPort",
-            endpointInterface = "org.apache.handlers.AddNumbers",
-            serviceName = "AddNumbersService")
-@HandlerChain(file = "//config/demo_handlers.xml")
-public class AddNumbersImpl implements AddNumbers {
-
-
-    /**
-     * @param number1
-     * @param number2
-     * @return The sum
-     * @throws AddNumbersException
-     *             if any of the numbers to be added is negative.
-     */
-    public int addNumbers(int number1, int number2) throws AddNumbersFault {
-        System.out.println("addNumbers called....." + number1 + ":" + number2);
-        if (number1 < 0 || number2 < 0) {
-            String message = "Negative number cant be added!";
-            String detail = "Numbers: " + number1 + ", " + number2;
-            FaultDetail fault = new FaultDetail();
-            fault.setMessage(message);
-            fault.setFaultInfo(detail);
-            throw new AddNumbersFault(message, fault);
-        }
-        return number1 + number2;
-    }
-
-}
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java b/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java
deleted file mode 100644
index ba58a62..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java
+++ /dev/null
@@ -1,104 +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.examples.cxf.soaphandler;
-
-
-import java.io.PrintStream;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-/*
- * This simple SOAPHandler will output the contents of incoming
- * and outgoing messages.
- */
-public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
-
-    private PrintStream out;
-
-    public LoggingHandler() {
-        setLogStream(System.out);
-    }
-
-    protected final void setLogStream(PrintStream ps) {
-        out = ps;
-    }
-
-    public void init(Map c) {
-        System.out.println("LoggingHandler : init() Called....");
-    }
-
-    public Set<QName> getHeaders() {
-        return null;
-    }
-
-    public boolean handleMessage(SOAPMessageContext smc) {
-        System.out.println("LoggingHandler : handleMessage Called....");
-        logToSystemOut(smc);
-        return true;
-    }
-
-    public boolean handleFault(SOAPMessageContext smc) {
-        System.out.println("LoggingHandler : handleFault Called....");
-        logToSystemOut(smc);
-        return true;
-    }
-
-    // nothing to clean up
-    public void close(MessageContext messageContext) {
-        System.out.println("LoggingHandler : close() Called....");
-    }
-
-    // nothing to clean up
-    public void destroy() {
-        System.out.println("LoggingHandler : destroy() Called....");
-    }
-
-    /*
-     * Check the MESSAGE_OUTBOUND_PROPERTY in the context
-     * to see if this is an outgoing or incoming message.
-     * Write a brief message to the print stream and
-     * output the message. The writeTo() method can throw
-     * SOAPException or IOException
-     */
-    protected void logToSystemOut(SOAPMessageContext smc) {
-        Boolean outboundProperty = (Boolean)
-            smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
-        if (outboundProperty.booleanValue()) {
-            out.println("\nOutbound message:");
-        } else {
-            out.println("\nInbound message:");
-        }
-
-        SOAPMessage message = smc.getMessage();
-        try {
-            message.writeTo(out);
-            out.println();
-        } catch (Exception e) {
-            out.println("Exception in handler: " + e);
-        }
-    }
-}
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java b/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java
deleted file mode 100644
index 54365ad..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java
+++ /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.
- */
-
-package org.apache.servicemix.examples.cxf.soaphandler;
-
-import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.transform.Source;
-import javax.xml.ws.LogicalMessage;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.LogicalHandler;
-import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.handler.MessageContext;
-import org.apache.handlers.types.AddNumbers;
-import org.apache.handlers.types.AddNumbersResponse;
-import org.apache.handlers.types.ObjectFactory;
-
-
-
-/**
- * handles addition of small numbers.
- */
-public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext> {
-
-
-    // Implementation of javax.xml.ws.handler.Handler
-
-    public final boolean handleMessage(LogicalMessageContext messageContext) {
-        System.out.println("LogicalMessageHandler handleMessage called");
-
-        try {
-            boolean outbound = (Boolean)messageContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
-            if (outbound) {
-                // get the LogicalMessage from our context
-                //
-                LogicalMessage msg = messageContext.getMessage();
-
-                // check the payload, if its an AddNumbers request, we'll intervene
-                //
-                JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
-                Object payload = msg.getPayload(jaxbContext);
-                if (payload instanceof JAXBElement) {
-                    payload = ((JAXBElement)payload).getValue();
-                }
-
-                if (payload instanceof AddNumbers) {
-                    AddNumbers req = (AddNumbers)payload;
-
-                    // now, if the arguments are small, let's do the calculation here
-                    //
-                    int a = req.getArg0();
-                    int b = req.getArg1();
-
-                    if (isSmall(a) && isSmall(b)) {
-                        int answer = a + b;
-
-                        //System.out.printf("SmallNumberHandler addNumbers(%d, %d) == %d\n", a, b, answer);
-                        // ok, we've done the calculation, so build the
-                        // response and set it as the payload of the message
-
-                        AddNumbersResponse resp = new AddNumbersResponse();
-                        resp.setReturn(answer);
-                        msg.setPayload(new ObjectFactory().createAddNumbersResponse(resp),
-                                       jaxbContext);
-
-                        Source src = msg.getPayload();
-                        msg.setPayload(src);
-
-                        payload = msg.getPayload(jaxbContext);
-                        if (payload instanceof JAXBElement) {
-                            payload = ((JAXBElement)payload).getValue();
-                        }
-
-                        AddNumbersResponse resp2 = (AddNumbersResponse)payload;
-                        if (resp2 == resp) {
-                            throw new WebServiceException("Shouldn't be the same object");
-                        }
-
-                        // finally, return false, indicating that request
-                        // processing stops here and our answer will be
-                        // returned to the client
-                        return false;
-                    }
-                }
-            }
-            return true;
-        } catch (JAXBException ex) {
-            throw new ProtocolException(ex);
-        }
-
-    }
-
-    public final boolean handleFault(LogicalMessageContext messageContext) {
-        System.out.println("LogicalMessageHandler handleFault called");
-        System.out.println(messageContext);
-
-        return true;
-    }
-
-    public void close(MessageContext ctx) {
-        System.out.println("LogicalHandler close called");
-    }
-
-    public void init(Map config) {
-        System.out.println("LogicalHandler init called");
-    }
-
-    public void destroy() {
-        System.out.println("LogicalHandler close called");
-    }
-
-    private boolean isSmall(int i) {
-        return i > 0 && i <= 10;
-    }
-}
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100644
index 5639d1f..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,59 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:osgi="http://www.springframework.org/schema/osgi"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <jaxws:endpoint id="SoapHandlerEndpoint"
-        implementor="org.apache.servicemix.examples.cxf.soaphandler.AddNumbersImpl"
-        address="/SoapHandler"
-        wsdlLocation="wsdl/addNumbers.wsdl"
-        endpointName="e:AddNumbersPort"
-        serviceName="s:AddNumbersService"
-        xmlns:e="http://apache.org/handlers"
-            xmlns:s="http://apache.org/handlers"/>
-
-       
-       <jaxws:client id="client" 
-             serviceClass="org.apache.handlers.AddNumbers"    
-        endpointName="e:AddNumbersPort"
-        serviceName="s:AddNumbersService"
-        xmlns:e="http://apache.org/handlers"
-            xmlns:s="http://apache.org/handlers"
-             wsdlLocation="wsdl/addNumbers.wsdl"
-             address="http://localhost:8080/cxf/SoapHandler"/>   
- 
-       <osgi:service id="testHelloWorld" ref="client"
-            interface="org.apache.handlers.AddNumbers"/>
-
-       
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml b/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml
deleted file mode 100644
index 5bd27b5..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml
+++ /dev/null
@@ -1,29 +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.
--->
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
-    <handler-chain>
-    <handler>
-        <handler-name>LoggingHandler</handler-name>
-        <handler-class>org.apache.servicemix.examples.cxf.soaphandler.LoggingHandler</handler-class>
-    </handler>
-    </handler-chain>
-</handler-chains>
diff --git a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/wsdl/addNumbers.wsdl b/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/wsdl/addNumbers.wsdl
deleted file mode 100644
index b3e56e3..0000000
--- a/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/wsdl/addNumbers.wsdl
+++ /dev/null
@@ -1,96 +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.
--->
-<definitions
-    name="AddNumbers"
-    targetNamespace="http://apache.org/handlers"
-    xmlns:tns="http://apache.org/handlers"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:x1="http://apache.org/handlers/types">
-    <types>
-        <xsd:schema
-            xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://apache.org/handlers/types"
-            elementFormDefault="qualified">
-
-            <complexType name="addNumbersResponse">
-                <sequence>
-                    <element name="return" type="xsd:int" />
-                </sequence>
-            </complexType>
-            <element name="addNumbersResponse" type="x1:addNumbersResponse"/>
-
-            <complexType name="addNumbers">
-                <sequence>
-                    <element name="arg0" type="xsd:int" />
-                    <element name="arg1" type="xsd:int" />
-                </sequence>
-            </complexType>
-            <element name="addNumbers" type="x1:addNumbers"/>
-
-            <element name="FaultDetail" type="x1:FaultDetail" />
-            <complexType name="FaultDetail">
-                <sequence>
-                    <element name="faultInfo" type="xsd:string" />
-                    <element name="message" type="xsd:string" />
-                </sequence>
-            </complexType>
-        </xsd:schema>
-    </types>
-    <message name="addNumbers">
-        <part name="parameters" element="x1:addNumbers" />
-    </message>
-    <message name="addNumbersResponse">
-        <part name="result" element="x1:addNumbersResponse" />
-    </message>
-    <message name="addNumbersFault">
-        <part name="AddNumbersFault" element="x1:FaultDetail" />
-    </message>
-    <portType name="AddNumbers">
-        <operation name="addNumbers">
-            <input message="tns:addNumbers" />
-            <output message="tns:addNumbersResponse" />
-            <fault name="addNumbersFault" message="tns:addNumbersFault"/>
-        </operation>
-    </portType>
-    <binding name="AddNumbersBinding" type="tns:AddNumbers">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <operation name="addNumbers">
-            <soap:operation soapAction="" />
-            <input>
-                <soap:body use="literal" />
-            </input>
-            <output>
-                <soap:body use="literal" />
-            </output>
-            <fault name="addNumbersFault">
-                <soap:fault name="addNumbersFault" use="literal" />
-            </fault>
-        </operation>
-    </binding>
-    <service name="AddNumbersService">
-        <port name="AddNumbersPort" binding="tns:AddNumbersBinding">
-            <soap:address location="http://localhost:8181/cxf/SoapHandler" />
-        </port>
-    </service>
-</definitions>
diff --git a/trunk/examples/itests/cxf-ws-security-osgi/pom.xml b/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
deleted file mode 100644
index 27e5b1a..0000000
--- a/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
+++ /dev/null
@@ -1,84 +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/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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.cxf-ws-security-osgi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: CXF WS Security OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </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>
-                            javax.jws,
-                            javax.xml.bind.annotation,
-                            javax.wsdl,
-                            javax.xml.namespace,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.apache.cxf.ws.security.wss4j,
-                            org.springframework.beans.factory.config,
-                            javax.security.auth.callback,
-                            org.apache.ws.security,
-                            org.apache.commons.logging
-                        </Import-Package>
-                        <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java b/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
deleted file mode 100755
index 14dad3a..0000000
--- a/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
+++ /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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld {
-    String sayHi(String text);
-}
-// END SNIPPET: service
diff --git a/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java b/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
deleted file mode 100755
index 85fd25f..0000000
--- a/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +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.
- */
-// START SNIPPET: service
-package org.apache.servicemix.examples.cxf;
-
-import javax.jws.WebService;
-
-@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHi(String text) {
-        return "Hello " + text;
-    }
-}
-// END SNIPPET: service
diff --git a/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java b/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
deleted file mode 100644
index 351531c..0000000
--- a/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
+++ /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.
- */
-
-package org.apache.servicemix.examples.cxf;
-
-import java.io.IOException;
-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 ServerPasswordCallback implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-
-        WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
-
-        if (pc.getIdentifer().equals("joe")) {
-            pc.setPassword("password");
-        }
-    }
-
-}
-
-
diff --git a/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml b/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
deleted file mode 100755
index 7fe3265..0000000
--- a/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
-    <bean id="myPasswordCallback" class="org.apache.servicemix.examples.cxf.ServerPasswordCallback"/>
-
-    <jaxws:endpoint id="helloWorld"
-        implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
-        address="/HelloWorldSecurity">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordType" value="PasswordText"/>
-                        <entry key="passwordCallbackRef">
-                            <ref bean="myPasswordCallback"/>
-                        </entry>
-
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/trunk/examples/itests/pom.xml b/trunk/examples/itests/pom.xml
deleted file mode 100644
index a88d2b2..0000000
--- a/trunk/examples/itests/pom.xml
+++ /dev/null
@@ -1,46 +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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests</name>
-
-    <modules>
-        <module>test-commons</module>
-        <module>cxf-http-osgi</module>
-        <module>cxf-ws-security-osgi</module>
-        <module>cxf-jms-osgi</module>
-        <module>cxf-nmr-osgi</module>
-        <module>cxf-soap-handler-osgi</module>
-        <module>cxf-handler-cfg</module>
-        <module>cxf-mtom-osgi</module>
-        <module>tests</module>
-    </modules>
-
-</project>
diff --git a/trunk/examples/itests/test-commons/pom.xml b/trunk/examples/itests/test-commons/pom.xml
deleted file mode 100644
index adff717..0000000
--- a/trunk/examples/itests/test-commons/pom.xml
+++ /dev/null
@@ -1,100 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: Common Classes</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.jws,
-                            javax.wsdl,
-                            javax.xml.bind,
-                            javax.xml.bind.annotation,
-                            javax.xml.namespace,
-                            javax.xml.ws,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
-                            org.apache.cxf.bus,
-                            org.apache.cxf.bus.spring,
-                            org.apache.cxf.bus.resource,
-                            org.apache.cxf.configuration.spring,
-                            org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
-                            org.springframework.beans.factory.config
-                        </Import-Package>
-                        <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl b/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl
deleted file mode 100644
index fcf66bd..0000000
--- a/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl
+++ /dev/null
@@ -1,79 +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 name="HelloWorldImplService" 
-                  targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <xsd:schema attributeFormDefault="unqualified" 
-                    elementFormDefault="unqualified" 
-                    targetNamespace="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:tns="http://cxf.examples.servicemix.apache.org/" 
-                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:element name="sayHi" type="tns:sayHi" />
-            <xsd:complexType name="sayHi">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="arg0" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="sayHiResponse" type="tns:sayHiResponse" />
-            <xsd:complexType name="sayHiResponse">
-                <xsd:sequence>
-                    <xsd:element minOccurs="0" name="return" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="tns:sayHiResponse" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="sayHi">
-        <wsdl:part element="tns:sayHi" name="parameters">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHi" name="sayHi">
-            </wsdl:input>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="HelloWorldImplServiceSoapBinding" type="tns:HelloWorld">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="document" />
-            <wsdl:input name="sayHi">
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="HelloWorldImplService">
-        <wsdl:port binding="tns:HelloWorldImplServiceSoapBinding" name="HelloWorldImplPort">
-            <soap:address location="http://localhost:8181/cxf/HelloWorld" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/trunk/examples/itests/tests/pom.xml b/trunk/examples/itests/tests/pom.xml
deleted file mode 100644
index 51d5d52..0000000
--- a/trunk/examples/itests/tests/pom.xml
+++ /dev/null
@@ -1,483 +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.examples</groupId>
-        <artifactId>org.apache.servicemix.examples.itests</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>org.apache.servicemix.examples.itests.tests</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: iTests :: Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.platform.testing</groupId>
-            <artifactId>org.apache.servicemix.platform.testing.support</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.management</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.commonman</groupId>
-            <artifactId>commons-management</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.ant</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.jra</groupId>
-                    <artifactId>jra</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.management</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.spring</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.document</groupId>
-            <artifactId>org.apache.servicemix.document</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.cxf</groupId>
-            <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.prefs</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.compendium</artifactId>
-                </exclusion>
-            </exclusions>
-
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>cxf-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>cxf-jaxrs</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-http-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-ws-security-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-jms-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-nmr-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-mtom-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-soap-handler-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>org.apache.servicemix.examples.itests.cxf-handler-cfg</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>cxf-ws-addressing</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>cxf-nmr</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>kahadb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-saaj_1.3_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-extender-whiteboard</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.abdera</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.oro</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.josql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>depends-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-depends-file</id>
-                        <goals>
-                            <goal>generate-depends-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                    <systemProperties>
-                        <!-- to work around the xml resolver bug -->
-                        <property>
-                            <name>xml.catalog.files</name>
-                            <value />
-                        </property>
-                    </systemProperties>
-                    <argLine>-Dxml.catalog.files=</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java b/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
deleted file mode 100644
index 6b1d798..0000000
--- a/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
+++ /dev/null
@@ -1,176 +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.examples;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.jar.Manifest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.List;
-
-import javax.xml.transform.Source;
-
-import org.apache.cxf.Bus;
-import org.apache.servicemix.examples.cxf.HelloWorld;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-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.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.Status;
-import org.apache.servicemix.platform.testing.support.AbstractIntegrationTest;
-import org.springframework.osgi.test.platform.OsgiPlatform;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
-
-public class CXFNMRIntegrationTest extends AbstractIntegrationTest {
-
-    private Properties dependencies;
-
-    /**
-     * The manifest to use for the "virtual bundle" created
-     * out of the test classes and resources in this project
-     *
-     * This is actually the boilerplate manifest with one additional
-     * import-package added. We should provide a simpler customization
-     * point for such use cases that doesn't require duplication
-     * of the entire manifest...
-     */
-    protected String getManifestLocation() {
-        return "classpath:org/apache/servicemix/MANIFEST.MF";
-    }
-
-    /**
-     * The location of the packaged OSGi bundles to be installed
-     * for this test. Values are Spring resource paths. The bundles
-     * we want to use are part of the same multi-project maven
-     * build as this project is. Hence we use the localMavenArtifact
-     * helper method to find the bundles produced by the package
-     * phase of the maven build (these tests will run after the
-     * packaging phase, in the integration-test phase).
-     *
-     * JUnit, commons-logging, spring-core and the spring OSGi
-     * test bundle are automatically included so do not need
-     * to be specified here.
-     */
-    protected String[] getTestBundlesNames() {
-        return new String[] {
-            getBundle("org.apache.felix", "org.apache.felix.prefs"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
-            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-servlet_3.0_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.saaj-api-1.3"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxb-api-2.2"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxws-api-2.2"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cglib"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.neethi"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.saaj-impl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
-            getBundle("org.codehaus.woodstox", "stax2-api"),
-            getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
-            getBundle("org.apache.ws.commons.schema", "XmlSchema"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.bcel"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xalan"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlsec"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jetty"),
-            getBundle("javax.mail", "mail"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
-            getBundle("org.codehaus.jettison", "jettison"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jsr311-api-1.1"),
-            getBundle("org.ops4j.pax.web", "pax-web-api"),
-            getBundle("org.ops4j.pax.web", "pax-web-spi"),
-            getBundle("org.ops4j.pax.web", "pax-web-runtime"),
-            getBundle("org.ops4j.pax.web", "pax-web-jetty"),
-            getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
-            getBundle("org.apache.servicemix", "servicemix-utils"),
-            getBundle("org.fusesource.commonman", "commons-management"),
-            getBundle("org.apache.karaf", "org.apache.karaf.management"),
-            getBundle("org.apache.cxf", "cxf-bundle"),
-            getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.management"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
-            getBundle("org.apache.servicemix.document", "org.apache.servicemix.document"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.test-commons"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-nmr-osgi"),
-        };
-    }
-
-    
-    
-    public void testNMROsgi() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-nmr-osgi");
-        Thread.sleep(5000);
-        NMR nmr = getOsgiService(NMR.class);
-        assertNotNull(nmr);
-        
-        
-        ServiceReference ref = bundleContext.getServiceReference(HelloWorld.class.getName());
-        assertNotNull("Service Reference is null", ref);
-        org.apache.servicemix.examples.cxf.HelloWorld helloWorld = null;
-
-        helloWorld = (org.apache.servicemix.examples.cxf.HelloWorld) bundleContext.getService(ref);
-        assertNotNull("Cannot find the service", helloWorld);
-
-        assertEquals("Hello Bonjour", helloWorld.sayHi("Bonjour"));
- 
-    
-    }
-
-    protected Manifest getManifest() {
-        Manifest mf = super.getManifest();
-        String importP = mf.getMainAttributes().getValue(Constants.IMPORT_PACKAGE);
-        mf.getMainAttributes().putValue(Constants.IMPORT_PACKAGE,
-            importP + ",META-INF.cxf, org.apache.servicemix.jbi.jaxp");
-        String exportP = mf.getMainAttributes().getValue(Constants.EXPORT_PACKAGE);
-        mf.getMainAttributes().putValue(Constants.EXPORT_PACKAGE,
-                                      exportP + ",org.apache.handlers, "
-                                      + "org.apache.springcfg.handlers, "
-                                      + "org.apache.handlers.types,org.apache.servicemix.examples.cxf,"
-                                      + "org.apache.servicemix.examples.cxf.soaphandler,"
-                                      + "org.apache.servicemix.examples.cxf.springcfghandler,"
-                                      + "org.apache.servicemix.examples.cxf.wsaddressing,"
-                                      + "org.apache.hello_world_soap_http,"
-                                      + "org.apache.cxf,"
-                                      + "org.apache.cxf.bus,"
-                                      + "org.apache.cxf.interceptor"
-                                      );
-        return mf;
-    }
-
-   
-}
diff --git a/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java b/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
deleted file mode 100644
index d239dc3..0000000
--- a/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
+++ /dev/null
@@ -1,400 +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.examples;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.jar.Manifest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.List;
-import javax.activation.DataHandler;
-import javax.xml.transform.Source;
-import javax.xml.ws.Holder;
-import org.apache.cxf.Bus;
-import org.apache.servicemix.examples.cxf.HelloWorld;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-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.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.Status;
-import org.apache.servicemix.platform.testing.support.AbstractIntegrationTest;
-import org.apache.servicemix.util.FileUtil;
-import org.springframework.osgi.test.platform.OsgiPlatform;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
-
-public class IntegrationTest extends AbstractIntegrationTest {
-
-    private Properties dependencies;
-
-    /**
-     * The manifest to use for the "virtual bundle" created
-     * out of the test classes and resources in this project
-     *
-     * This is actually the boilerplate manifest with one additional
-     * import-package added. We should provide a simpler customization
-     * point for such use cases that doesn't require duplication
-     * of the entire manifest...
-     */
-    protected String getManifestLocation() {
-        return "classpath:org/apache/servicemix/MANIFEST.MF";
-    }
-
-    /**
-     * The location of the packaged OSGi bundles to be installed
-     * for this test. Values are Spring resource paths. The bundles
-     * we want to use are part of the same multi-project maven
-     * build as this project is. Hence we use the localMavenArtifact
-     * helper method to find the bundles produced by the package
-     * phase of the maven build (these tests will run after the
-     * packaging phase, in the integration-test phase).
-     *
-     * JUnit, commons-logging, spring-core and the spring OSGi
-     * test bundle are automatically included so do not need
-     * to be specified here.
-     */
-    protected String[] getTestBundlesNames() {
-        return new String[] {
-            getBundle("org.apache.felix", "org.apache.felix.prefs"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
-            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-servlet_3.0_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-                       
-            //for activemq
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-lang"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jasypt"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.josql"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.oro"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.velocity"),
-            getBundle("commons-collections", "commons-collections"),
-            getBundle("org.springframework", "spring-jms"),
-            getBundle("org.springframework", "spring-tx"),
-            getBundle("org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"),
-            getBundle("org.apache.geronimo.specs", "geronimo-jms_1.1_spec"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
-            getBundle("org.apache.xbean", "xbean-spring"),
-            getBundle("org.apache.activemq", "activemq-core"),
-            getBundle("org.apache.activemq", "activemq-ra"),
-            getBundle("org.apache.activemq", "activemq-console"),
-            getBundle("org.apache.activemq", "activemq-pool"),
-            getBundle("org.apache.activemq", "kahadb"),           
-            
-            //for ws-security
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.opensaml"),
-            getBundle("org.apache.ws.security", "wss4j"),
- 
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),            
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.saaj-api-1.3"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxb-api-2.2"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxws-api-2.2"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cglib"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.neethi"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.saaj-impl"),
-            getBundle("org.codehaus.woodstox", "stax2-api"),
-            getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
-            getBundle("org.apache.ws.commons.schema", "XmlSchema"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.bcel"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xalan"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlsec"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jetty"),
-            getBundle("javax.mail", "mail"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-httpclient"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
-            getBundle("org.codehaus.jettison", "jettison"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans"),
-            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jsr311-api-1.1"),
-            getBundle("org.ops4j.pax.web", "pax-web-api"),
-            getBundle("org.ops4j.pax.web", "pax-web-spi"),
-            getBundle("org.ops4j.pax.web", "pax-web-runtime"),
-            getBundle("org.ops4j.pax.web", "pax-web-jetty"),
-            getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
-            getBundle("org.apache.servicemix", "servicemix-utils"),
-            getBundle("org.fusesource.commonman", "commons-management"),
-            getBundle("org.apache.karaf", "org.apache.karaf.management"),
-            getBundle("org.apache.cxf", "cxf-bundle"),
-            getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.management"),
-            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
-            getBundle("org.apache.servicemix.document", "org.apache.servicemix.document"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.test-commons"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-http-osgi"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-ws-security-osgi"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-jms-osgi"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-soap-handler-osgi"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-mtom-osgi"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-handler-cfg"),
-            getBundle("org.apache.servicemix.examples", "cxf-ws-addressing"),
-            getBundle("org.apache.servicemix.examples", "cxf-jaxrs"),
-            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-nmr-osgi"),
-        };
-    }
-
-    public void testJbiComponent() throws Exception {
-        Thread.sleep(5000);
-        installBundle("org.apache.servicemix.examples", "cxf-osgi", null, "jar");
-        Thread.sleep(5000);
-    }
-
-    public void testHttpOsgi() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-http-osgi");
-        Thread.sleep(5000);
-
-        String filter = "(&(" + "objectclass=" + HelloWorld.class.getName() + ")(TEST-BUNDLE-NAME=cxf-http-osgi))";
-        ServiceReference ref = bundleContext.getServiceReferences(null, filter)[0];
-        assertNotNull("Service Reference is null", ref);
-
-        org.apache.servicemix.examples.cxf.HelloWorld helloWorld = null;
-
-        helloWorld = (org.apache.servicemix.examples.cxf.HelloWorld) bundleContext.getService(ref);
-        assertNotNull("Cannot find the service", helloWorld);
-
-        assertEquals("Hello Bonjour", helloWorld.sayHi("Bonjour"));
-    }
-    
-    public void testJmsOsgi() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-jms-osgi");
-        Thread.sleep(5000);
-        String filter = "(&(" + "objectclass=" + HelloWorld.class.getName() + ")(TEST-BUNDLE-NAME=cxf-jms-osgi))";
-        ServiceReference ref = bundleContext.getServiceReferences(null, filter)[0];
-        assertNotNull("Service Reference is null", ref);
-
-        org.apache.servicemix.examples.cxf.HelloWorld helloWorld = null;
-
-        helloWorld = (org.apache.servicemix.examples.cxf.HelloWorld) bundleContext.getService(ref);
-        assertNotNull("Cannot find the service", helloWorld);
-
-        assertEquals("Hello Bonjour", helloWorld.sayHi("Bonjour"));
-    }
-    
-    public void testNMROsgi() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-nmr-osgi");
-        Thread.sleep(5000);
-        NMR nmr = getOsgiService(NMR.class);
-        assertNotNull(nmr);
-        
-        Channel client = nmr.createChannel();
-        Exchange e = client.createExchange(Pattern.InOut);
-        for (Endpoint ep : nmr.getEndpointRegistry().getServices()) {
-            e.setTarget(nmr.getEndpointRegistry().lookup(nmr.getEndpointRegistry().getProperties(ep)));
-            e.getIn().setBody(new StringSource("<?xml version=\"1.0\" encoding=\"UTF-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body><ns2:sayHi xmlns:ns2=\"http://cxf.examples.servicemix.apache.org/\"><arg0>Bonjour</arg0></ns2:sayHi></soap:Body></soap:Envelope>"));
-            boolean res = client.sendSync(e);
-            assertTrue(res);
-        }
-    
-    }
-
-    protected Manifest getManifest() {
-        Manifest mf = super.getManifest();
-        String importP = mf.getMainAttributes().getValue(Constants.IMPORT_PACKAGE);
-        mf.getMainAttributes().putValue(Constants.IMPORT_PACKAGE,
-            importP + ",META-INF.cxf, org.apache.servicemix.jbi.jaxp");
-        String exportP = mf.getMainAttributes().getValue(Constants.EXPORT_PACKAGE);
-        mf.getMainAttributes().putValue(Constants.EXPORT_PACKAGE,
-                                      exportP + ",org.apache.handlers, "
-                                      + "org.apache.springcfg.handlers, "
-                                      + "org.apache.cxf.mime, "
-                                      + "javax.xml.ws, "
-                                      + "javax.activation, "
-                                      + "org.apache.handlers.types, "
-                                      + "org.apache.servicemix.examples.cxf,"
-                                      + "org.apache.servicemix.examples.cxf.soaphandler,"
-                                      + "org.apache.servicemix.examples.cxf.springcfghandler,"
-                                      + "org.apache.servicemix.examples.cxf.wsaddressing,"
-                                      + "org.apache.servicemix.util,"
-                                      + "org.apache.hello_world_soap_http,"
-                                      + "org.apache.cxf,"
-                                      + "org.apache.cxf.bus,"
-                                      + "org.apache.cxf.interceptor"
-                                      );
-        return mf;
-    }
-
-    public void testSoapHandlerOsgi() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-soap-handler-osgi");
-        Thread.sleep(5000);
-
-        ServiceReference ref = bundleContext.getServiceReference(org.apache.handlers.AddNumbers.class.getName());
-        assertNotNull("Service Reference is null", ref);
-
-        org.apache.handlers.AddNumbers addNumbers = null;
-
-        addNumbers = (org.apache.handlers.AddNumbers) bundleContext.getService(ref);
-        assertNotNull("Cannot find the service", addNumbers);
-
-        assertEquals(2, addNumbers.addNumbers(1,1));
-
-    }
-
-     public void testSpringConfigHandlerOsgi() throws Exception {
-         Thread.sleep(5000);
-         waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-handler-cfg");
-         Thread.sleep(5000);
-
-         ServiceReference ref = bundleContext.getServiceReference(org.apache.springcfg.handlers.AddNumbers.class.getName());
-         assertNotNull("Service Reference is null", ref);
-
-         org.apache.springcfg.handlers.AddNumbers addNumbers = null;
-
-         addNumbers = (org.apache.springcfg.handlers.AddNumbers) bundleContext.getService(ref);
-         assertNotNull("Cannot find the service", addNumbers);
-
-         assertEquals(1016, addNumbers.addNumbers(10, 16));
-    }
-
-    public void testWsAddressingOsgi() throws Exception {
-         Thread.sleep(5000);
-         waitOnContextCreation("cxf-ws-addressing");
-
-         ServiceReference busref = bundleContext.getServiceReference(org.apache.cxf.bus.CXFBusImpl.class.getName());
-         assertNotNull("Bus Reference is null", busref);
-
-         Bus bus = (Bus)bundleContext.getService(busref);
-
-         ByteArrayOutputStream input = new ByteArrayOutputStream();
-         PrintWriter writer = new PrintWriter(input, true);
-         org.apache.cxf.interceptor.LoggingInInterceptor in = new org.apache.cxf.interceptor.LoggingInInterceptor(writer);
-         bus.getInInterceptors().add(in);
-
-         ByteArrayOutputStream output = new ByteArrayOutputStream();
-         PrintWriter outwriter = new PrintWriter(output, true);
-         org.apache.cxf.interceptor.LoggingOutInterceptor out = new org.apache.cxf.interceptor.LoggingOutInterceptor(outwriter);
-         bus.getOutInterceptors().add(out);
-
-         ServiceReference ref = bundleContext.getServiceReference(org.apache.hello_world_soap_http.Greeter.class.getName());
-         assertNotNull("Service Reference is null", ref);
-
-
-         org.apache.hello_world_soap_http.Greeter greeter = null;
-
-         greeter = (org.apache.hello_world_soap_http.Greeter) bundleContext.getService(ref);
-         assertNotNull("Cannot find the service", greeter);
-
-         assertEquals("Bonjour", greeter.sayHi());
-
-         String expectedOut = "<Address>http://www.w3.org/2005/08/addressing/anonymous</Address>";
-         String expectedIn = "<RelatesTo xmlns=\"http://www.w3.org/2005/08/addressing\">";
-
-         assertTrue(output.toString().indexOf(expectedOut) != -1);
-         assertTrue(input.toString().indexOf(expectedIn) != -1);
-    }
-
-    public void testJaxRS() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("cxf-jaxrs");
-
-        URL url = new URL("http://localhost:8080/cxf/crm/customerservice/customers/123");
-        InputStream in = url.openStream();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        int c = 0;
-        while ((c = in.read()) != -1) {
-            bos.write(c);
-        }
-        in.close();
-        bos.close();
-        System.out.println(bos.toString());
-        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Customer><id>123</id><name>John</name></Customer>",
-                     bos.toString());
-    }
-
-    public void testWSSecurity() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-ws-security-osgi");
-        Thread.sleep(5000);
-        URLConnection connection = new URL("http://localhost:8080/cxf/HelloWorldSecurity")
-                .openConnection();
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        // Post the request file.
-        InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/request.xml");
-        FileUtil.copyInputStream(fis, os);
-        // Read the response.
-        InputStream is = connection.getInputStream();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        FileUtil.copyInputStream(is, baos);
-        assertTrue(baos.toString().indexOf("Hello John Doe") >= 0);
-
-    }
-
-    public void testMtomOsgi() throws Exception {
-        Thread.sleep(5000);
-        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-mtom-osgi");
-        Thread.sleep(5000);
-
-        ServiceReference ref = bundleContext.getServiceReference(org.apache.cxf.mime.TestMtom.class.getName());
-        assertNotNull("Service Reference is null", ref);
-
-        org.apache.cxf.mime.TestMtom testMtom = null;
-
-        testMtom = (org.apache.cxf.mime.TestMtom) bundleContext.getService(ref);
-        assertNotNull("Cannot find the service", testMtom);
-         
-        URL fileURL = getClass().getClassLoader().getResource("me.bmp");
-        System.out.println("\nStarting MTOM test with DataHandler:");
-        Holder<String> name = new Holder<String>("Bob");
-        Holder<DataHandler> handler = new Holder<DataHandler>();
-
-        handler.value = new DataHandler(fileURL);
-
-        System.out.println("--Sending the me.bmp image to server");
-        System.out.println("--Sending a name value of " + name.value);
-
-        testMtom.testXop(name, handler);
-
-        InputStream mtomIn = handler.value.getInputStream();
-        long fileSize = 0;
-        for (int i = mtomIn.read(); i != -1; i = mtomIn.read()) {
-            fileSize++;
-        }
-
-        System.out.println("--Received DataHandler back from server, "
-            + "returned size is " + fileSize);
-        System.out.println("--Returned string value is " + name.value);
-        assertEquals(fileSize, 163166);
-        System.out.println("Successfully ran MTOM/DataHandler demo");
-
-    }
-
-}
diff --git a/trunk/examples/itests/tests/src/test/resources/log4j.properties b/trunk/examples/itests/tests/src/test/resources/log4j.properties
deleted file mode 100644
index d880b6e..0000000
--- a/trunk/examples/itests/tests/src/test/resources/log4j.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.

-#

-################################################################################

-

-log4j.rootLogger=DEBUG, stdout

-

-log4j.logger.org.springframework.osgi=DEBUG

-log4j.logger.org.apache.camel=DEBUG

-log4j.logger.org.apache.servicemix=DEBUG

-

-log4j.appender.stdout=org.apache.log4j.ConsoleAppender

-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n

-

-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/trunk/examples/itests/tests/src/test/resources/me.bmp b/trunk/examples/itests/tests/src/test/resources/me.bmp
deleted file mode 100644
index 800c536..0000000
--- a/trunk/examples/itests/tests/src/test/resources/me.bmp
+++ /dev/null
Binary files differ
diff --git a/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF b/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
deleted file mode 100644
index 5ea9a96..0000000
--- a/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-License-00: . 
-License-01: Licensed to the Apache Software Foundation (ASF) under one or more
-License-02: contributor license agreements.  See the NOTICE file distributed with
-License-03: this work for additional information regarding copyright ownership.
-License-04: The ASF licenses this file to You under the Apache License, Version 2.0
-License-05: (the "License"); you may not use this file except in compliance with
-License-06: the License.  You may obtain a copy of the License at
-License-07: .
-License-08:      http://www.apache.org/licenses/LICENSE-2.0
-License-09: .
-License-10: Unless required by applicable law or agreed to in writing, software
-License-11: distributed under the License is distributed on an "AS IS" BASIS,
-License-12: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-License-13: See the License for the specific language governing permissions and
-License-14: limitations under the License.
-License-15: .
-Bundle-Name: org.apache.servicemix.test
-Bundle-SymbolicName: org.apache.servicemix.test
-Bundle-Vendor: Spring Framework
-Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator
-Import-Package: junit.framework,
- org.osgi.framework;specification-version="1.3.0",
- org.apache.commons.logging,
- org.springframework.core,
- org.springframework.core.io,
- org.springframework.osgi.test,
- org.springframework.osgi.test.platform,
- org.apache.servicemix.nmr.api,
- org.apache.servicemix.nmr.core,
- org.apache.servicemix.platform.testing.support,
- org.springframework.osgi.util
diff --git a/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/request.xml b/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/request.xml
deleted file mode 100755
index 7f00050..0000000
--- a/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/request.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-    <soap:Header>
-        <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
-            <wsse:UsernameToken >
-                <wsse:Username>joe</wsse:Username>
-                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">password</wsse:Password>
-            </wsse:UsernameToken>
-        </wsse:Security>
-    </soap:Header>
-    <soap:Body>
-        <ns2:sayHi xmlns:ns2="http://cxf.examples.servicemix.apache.org/">
-            <arg0>John Doe</arg0>
-        </ns2:sayHi>
-    </soap:Body>
-</soap:Envelope>
diff --git a/trunk/examples/loan-broker-bpel/README.txt b/trunk/examples/loan-broker-bpel/README.txt
deleted file mode 100644
index c482931..0000000
--- a/trunk/examples/loan-broker-bpel/README.txt
+++ /dev/null
@@ -1,94 +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 Loan Broker example
-=============================================
-
-This example is based on the EIP book 
-(http://www.enterpriseintegrationpatterns.com/ComposedMessagingExample.html).
-It leverages the BPEL service engine, JMS binding component and some 
-lightweight components provided by ServiceMix.
-
-Prerequisites for Running this Example
---------------------------------------
-1. You must have the following installed on your machine:
-   - JDK 1.5 or higher.
-   - Apache Maven 2.0.9 or higher.
-
-For more information, see the README in the top-level examples directory.
-
-2. Start ServiceMix by running the following command:
-   <servicemix_home>/bin/servicemix    (on UNIX)
-   <servicemix_home>\bin\servicemix    (on Windows)
-
-Installing ODE
---------------
-
-This example depends on the Apache ODE JBI service engine. This component
-has not yet been released with support ServiceMix 4 but a SNAPSHOT is
-available.
-
-Install ODE from the ServiceMix Console with the following commands:
-
-   features:install ode
-
-Building and Deploying
-----------------------
-This example uses the ServiceMix JBI Maven plugin to build the SUs and the SA.
-To build the example, run the following command (from the directory that contains
-this README):
-
-  mvn install
-
-If all of the required bundles are available in your local Maven repository, 
-the example will build quickly. Otherwise it may take some time for Maven
-to download everything it needs.
-
-Once complete, you will find the SA, called
-loan-broker-sa-${version}.zip, in the loan-broker-sa/target directory
-of this example.
-
-You can deploy the SA in two ways:
-
-- Using Hot Deployment
-  --------------------
-   
-  Copy the loan-broker-sa-${version}.zip file to the
-  <servicemix_home>/deploy directory.
-
-- Using the ServiceMix Console
-  ----------------------------
-
-  Type the following command:
-
-  osgi:install -s mvn:org.apache.servicemix.examples.loan-broker/loan-broker-sa/${version}/zip
-
-
-Running the Client
-------------------
-This example provides a simple JMS client. To run the client:
-
-1. Change to the <servicemix_home>/examples/loan-broker-bpel/client directory.
-
-2. Run the following command:
-
-   mvn compile exec:java
-
-Changing the Example
---------------------
-If you change the code or configuration in the example, use 'mvn install' to rebuild the
-JBI SA zip, and deploy it as described above.
diff --git a/trunk/examples/loan-broker-bpel/client/pom.xml b/trunk/examples/loan-broker-bpel/client/pom.xml
deleted file mode 100644
index 039dd22..0000000
--- a/trunk/examples/loan-broker-bpel/client/pom.xml
+++ /dev/null
@@ -1,72 +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.examples</groupId>
-        <artifactId>loan-broker</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-    <artifactId>loan-broker-jms-client</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL :: JMS Client</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.logicblaze.lingo</groupId>
-            <artifactId>lingo</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>incubator-activemq</groupId>
-                    <artifactId>activeio-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>incubator-activemq</groupId>
-                    <artifactId>activemq-ra</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>incubator-activemq</groupId>
-                    <artifactId>activemq-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.apache.servicemix.samples.loanbroker.JMSClient</mainClass>
-                    <includePluginDependencies>false</includePluginDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/loan-broker-bpel/client/src/main/java/org/apache/servicemix/samples/loanbroker/JMSClient.java b/trunk/examples/loan-broker-bpel/client/src/main/java/org/apache/servicemix/samples/loanbroker/JMSClient.java
deleted file mode 100644
index c400727..0000000
--- a/trunk/examples/loan-broker-bpel/client/src/main/java/org/apache/servicemix/samples/loanbroker/JMSClient.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.samples.loanbroker;
-
-import java.util.concurrent.CountDownLatch;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.logicblaze.lingo.jms.Requestor;
-import org.logicblaze.lingo.jms.JmsProducerConfig;
-import org.logicblaze.lingo.jms.impl.MultiplexingRequestor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-
-/**
- * @version $Revision: 666120 $
- */
-public class JMSClient implements Runnable {
-
-    private static ConnectionFactory factory;
-    private static CountDownLatch latch;
-    private static Requestor requestor;
-
-    /**
-     * main ...
-     * 
-     * @param args
-     * @throws Exception
-     */
-    public static void main(String[] args) throws Exception {
-        System.out.println("Connecting to JMS server.");
-        factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
-        Destination inQueue = new ActiveMQQueue("demo.org.servicemix.source");
-        Destination outQueue = new ActiveMQQueue("demo.org.servicemix.output" + (int)(1000*Math.random()));
-        requestor = MultiplexingRequestor.newInstance(factory, new JmsProducerConfig(), inQueue, outQueue); 
-
-        if (args.length == 0) {
-            new JMSClient().run();
-        } else {
-            int nb = Integer.parseInt(args[0]);
-            int th = 30;
-            if (args.length > 1) {
-                th = Integer.parseInt(args[1]);
-            }
-            latch = new CountDownLatch(nb);
-            ExecutorService threadPool = Executors.newFixedThreadPool(th);
-            for (int i = 0; i < nb; i++) {
-                threadPool.submit(new JMSClient());
-            }
-            latch.await();
-        }
-        System.out.println("Closing.");
-        requestor.close();
-        System.exit(0);
-    }
-
-    public void run() {
-        try {
-            System.out.println("Sending request.");
-            double r = Math.random();
-
-            String request =
-                "<getLoanQuoteRequest xmlns='urn:logicblaze:soa:loanbroker'>\n" +
-                "  <ssn>102-24532-53254</ssn>\n" +
-                "  <amount>" + r * 100000 + "</amount>\n" +
-                "  <duration>" + (int) r * 48 + "</duration>\n" +
-                "  <score>" + (int) r * 48 + "</score>\n" +
-                "  <length>" + (int) r * 48 + "</length>\n" +
-                "</getLoanQuoteRequest>";
-
-            TextMessage out = requestor.getSession().createTextMessage(request);
-
-            TextMessage in = (TextMessage) requestor.request(null, out); 
-            if (in == null) {
-                System.out.println("Response timed out.");
-            }
-            else {
-                System.out.println("Response was: " + in.getText());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (latch != null) {
-                latch.countDown();
-            }
-        }
-    }
-
-}
diff --git a/trunk/examples/loan-broker-bpel/client/src/main/resources/log4j.properties b/trunk/examples/loan-broker-bpel/client/src/main/resources/log4j.properties
deleted file mode 100644
index 380df3d..0000000
--- a/trunk/examples/loan-broker-bpel/client/src/main/resources/log4j.properties
+++ /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.
-#
-################################################################################
-
-log4j.rootLogger=WARN, STDOUT
-
-log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
-log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
-log4j.appender.STDOUT.layout.ConversionPattern=%m%n
diff --git a/trunk/examples/loan-broker-bpel/loan-broker-bean-su/pom.xml b/trunk/examples/loan-broker-bpel/loan-broker-bean-su/pom.xml
deleted file mode 100644
index a732b60..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-bean-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>loan-broker</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-    <artifactId>loan-broker-bean-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL :: Bean SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-bean</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/loan-broker-bpel/loan-broker-bean-su/src/main/java/loanbroker/Bank.java b/trunk/examples/loan-broker-bpel/loan-broker-bean-su/src/main/java/loanbroker/Bank.java
deleted file mode 100644
index 434fbf9..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-bean-su/src/main/java/loanbroker/Bank.java
+++ /dev/null
@@ -1,54 +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 loanbroker;

-

-import javax.annotation.Resource;

-import javax.jbi.messaging.DeliveryChannel;

-import javax.jbi.messaging.ExchangeStatus;

-import javax.jbi.messaging.InOut;

-import javax.jbi.messaging.MessageExchange;

-import javax.jbi.messaging.MessagingException;

-import javax.jbi.messaging.NormalizedMessage;

-

-import org.apache.servicemix.jbi.listener.MessageExchangeListener;

-import org.apache.servicemix.jbi.jaxp.StringSource;

-

-public class Bank implements MessageExchangeListener {

-    

-    @Resource

-    DeliveryChannel channel;

-    

-    public void onMessageExchange(MessageExchange exchange) throws MessagingException {

-        InOut inOut = (InOut) exchange;

-        if (inOut.getStatus() == ExchangeStatus.DONE) {

-            return;

-        } else if (inOut.getStatus() == ExchangeStatus.ERROR) {

-            return;

-        }

-        System.err.println(inOut.getService().getLocalPart() + " requested");

-        try {

-            String output = "<getLoanQuoteResponse xmlns=\"urn:logicblaze:soa:bank\"><rate>" + (Math.ceil(1000 * Math.random()) / 100) + "</rate></getLoanQuoteResponse>";

-            NormalizedMessage answer = inOut.createMessage();

-            answer.setContent(new StringSource(output));

-            inOut.setOutMessage(answer);

-            channel.send(inOut);

-        } catch (Exception e) {

-            inOut.setError(e);

-            channel.send(inOut);

-        }

-    }

-}

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-bean-su/src/main/resources/xbean.xml b/trunk/examples/loan-broker-bpel/loan-broker-bean-su/src/main/resources/xbean.xml
deleted file mode 100644
index dc39d34..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-bean-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,53 +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:bean="http://servicemix.apache.org/bean/1.0" 

-       xmlns:bk="urn:logicblaze:soa:bank">

-

-  <bean:endpoint service="bk:Bank1" endpoint="bank">

-      <bean:bean>

-          <bean class="loanbroker.Bank" />

-      </bean:bean>

-  </bean:endpoint>

-

-  <bean:endpoint service="bk:Bank2" endpoint="bank">

-      <bean:bean>

-          <bean class="loanbroker.Bank" />

-      </bean:bean>

-  </bean:endpoint>

-

-  <bean:endpoint service="bk:Bank3" endpoint="bank">

-      <bean:bean>

-          <bean class="loanbroker.Bank" />

-      </bean:bean>

-  </bean:endpoint>

-

-  <bean:endpoint service="bk:Bank4" endpoint="bank">

-      <bean:bean>

-          <bean class="loanbroker.Bank" />

-      </bean:bean>

-  </bean:endpoint>

-

-  <bean:endpoint service="bk:Bank5" endpoint="bank">

-      <bean:bean>

-          <bean class="loanbroker.Bank" />

-      </bean:bean>

-  </bean:endpoint>

-

-</beans>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml b/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml
deleted file mode 100644
index 8500fa6..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml
+++ /dev/null
@@ -1,93 +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.examples</groupId>
-        <artifactId>loan-broker</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-    <artifactId>loan-broker-drools-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL :: Drools SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-drools</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jung</groupId>
-                    <artifactId>jung</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xpp3</groupId>
-                    <artifactId>xpp3</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-jci-janino</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/main/resources/credit-agency.drl b/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/main/resources/credit-agency.drl
deleted file mode 100644
index 902fa08..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/main/resources/credit-agency.drl
+++ /dev/null
@@ -1,52 +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.drools

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.apache.servicemix.drools.model.Exchange;

-

-global org.apache.servicemix.drools.model.JbiHelper jbi;

-

-rule UnkownOperation

-    when

-      Exchange( status == Exchange.ACTIVE, $in : in !=null,

-         operation != "{urn:logicblaze:soa:creditagency}getCreditHistoryLength",

-         operation != "{urn:logicblaze:soa:creditagency}getCreditScore",

-         eval(jbi == null || !jbi.isExchangeHandled()))

-    then

-        jbi.fault("<UnknownOperation xmlns='urn:logicblaze:soa:creditagency'/>");

-end

-

-rule CreditHistory

-    when

-      Exchange( status == Exchange.ACTIVE, $in : in != null,

-         operation == "{urn:logicblaze:soa:creditagency}getCreditHistoryLength",

-         eval(jbi == null || !jbi.isExchangeHandled()))

-    then

-        jbi.answer("<getCreditHistoryLengthResponse xmlns='urn:logicblaze:soa:creditagency'><length>" + 100 + "</length></getCreditHistoryLengthResponse>");

-end

-

-rule CreditScore

-    when

-      Exchange( status == Exchange.ACTIVE, $in : in != null,

-         operation == "{urn:logicblaze:soa:creditagency}getCreditScore",

-         eval(jbi == null || !jbi.isExchangeHandled()))

-    then

-        jbi.answer("<getCreditScoreResponse xmlns='urn:logicblaze:soa:creditagency'><score>" + 1000 + "</score></getCreditScoreResponse>");

-end

-

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/main/resources/xbean.xml b/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/main/resources/xbean.xml
deleted file mode 100644
index af6adda..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/main/resources/xbean.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:drools="http://servicemix.apache.org/drools/1.0"

-       xmlns:ca="urn:logicblaze:soa:creditagency">

-

-  <drools:endpoint service="ca:CreditAgencyService"

-                   endpoint="agency"

-                   ruleBaseResource="classpath:credit-agency.drl"

-                   namespaceContext="#nsContext" />

-

-

-  <drools:namespace-context id="nsContext">

-    <drools:namespaces>

-      <drools:namespace prefix="ca">urn:logicblaze:soa:creditagency</drools:namespace>

-    </drools:namespaces>

-  </drools:namespace-context>

-

-</beans>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/test/java/loanbroker/CreditAgencyTest.java b/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/test/java/loanbroker/CreditAgencyTest.java
deleted file mode 100644
index 700c9ed..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/test/java/loanbroker/CreditAgencyTest.java
+++ /dev/null
@@ -1,78 +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 loanbroker;

-

-import javax.jbi.messaging.ExchangeStatus;

-import javax.jbi.messaging.InOnly;

-import javax.jbi.messaging.InOut;

-import javax.xml.namespace.QName;

-

-import org.w3c.dom.Element;

-

-import org.apache.servicemix.client.DefaultServiceMixClient;

-import org.apache.servicemix.client.ServiceMixClient;

-import org.apache.servicemix.drools.DroolsComponent;

-import org.apache.servicemix.drools.DroolsEndpoint;

-import org.apache.servicemix.jbi.container.JBIContainer;

-import org.apache.servicemix.jbi.jaxp.SourceTransformer;

-import org.apache.servicemix.jbi.jaxp.StringSource;

-import org.apache.servicemix.tck.ReceiverComponent;

-import org.springframework.core.io.ClassPathResource;

-

-import junit.framework.TestCase;

-

-public class CreditAgencyTest extends TestCase {

-

-    private JBIContainer jbi;

-    private DroolsComponent drools;

-    private ServiceMixClient client;

-    

-    protected void setUp() throws Exception {

-        super.setUp();

-        jbi = new JBIContainer();

-        jbi.setEmbedded(true);

-        jbi.init();

-        client = new DefaultServiceMixClient(jbi);

-    }

-    

-    protected void tearDown() throws Exception {

-        jbi.shutDown();

-    }

-    

-    public void testCreditHistory() throws Exception {

-        drools = new DroolsComponent();

-        DroolsEndpoint endpoint = new DroolsEndpoint(drools.getServiceUnit(),

-                                                     new QName("drools"), "endpoint");

-        endpoint.setRuleBaseResource(new ClassPathResource("credit-agency.drl"));

-        drools.setEndpoints(new DroolsEndpoint[] {endpoint });

-        jbi.activateComponent(drools, "servicemix-drools");

-        

-        jbi.start();

-        

-        InOut me = client.createInOutExchange();

-        me.setService(new QName("drools"));

-        me.setOperation(new QName("urn:logicblaze:soa:creditagency", "getCreditHistoryLength"));

-        me.getInMessage().setContent(new StringSource("<getCreditHistoryLengthRequest xmlns='urn:logicblaze:soa:creditagency'><ssn>123456</ssn></getCreditHistoryLengthRequest>"));

-        client.sendSync(me);

-        Element e = new SourceTransformer().toDOMElement(me.getOutMessage());

-        assertEquals("getCreditHistoryLengthResponse", e.getLocalName());

-        client.done(me);

-        

-        Thread.sleep(50);

-    }

-

-}

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/test/resources/log4j-tests.properties b/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/test/resources/log4j-tests.properties
deleted file mode 100644
index e9a4887..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-drools-su/src/test/resources/log4j-tests.properties
+++ /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.

-#

-#

-

-#

-# The logging properties used during tests..

-#

-log4j.rootLogger=DEBUG, out

-

-log4j.logger.org.apache.activemq=INFO

-log4j.logger.org.apache.activemq.spring=WARN

-log4j.logger.org.apache.activemq.store.journal=INFO

-log4j.logger.org.activeio.journal=INFO

-

-# 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/trunk/examples/loan-broker-bpel/loan-broker-jms-su/pom.xml b/trunk/examples/loan-broker-bpel/loan-broker-jms-su/pom.xml
deleted file mode 100644
index c5e66ea..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-jms-su/pom.xml
+++ /dev/null
@@ -1,86 +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.examples</groupId>
-        <artifactId>loan-broker</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-    <artifactId>loan-broker-jms-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL :: JMS SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-pool</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.activemq.protobuf</groupId>
-                    <artifactId>activemq-protobuf</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>kahadb</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-net</groupId>
-                    <artifactId>commons-net</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/loan-broker-bpel/loan-broker-jms-su/src/main/resources/xbean.xml b/trunk/examples/loan-broker-bpel/loan-broker-jms-su/src/main/resources/xbean.xml
deleted file mode 100644
index 91ec97e..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-jms-su/src/main/resources/xbean.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.

-

--->

-<beans xmlns:jms="http://servicemix.apache.org/jms/1.0"

-       xmlns:lb="urn:logicblaze:soa:loanbroker">

-

-  <jms:endpoint service="lb:LoanBrokerService"

-                endpoint="broker"

-                targetService="lb:LoanBrokerService"

-                defaultOperation="lb:getLoanQuote" 

-                role="consumer"

-                connectionFactory="#jmsFactory"

-                destinationStyle="queue"

-                jmsProviderDestinationName="demo.org.servicemix.source"

-                defaultMep="http://www.w3.org/2004/08/wsdl/in-out" />

-

-  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">

-    <property name="connectionFactory">

-      <bean class="org.apache.activemq.ActiveMQConnectionFactory">

-        <property name="brokerURL" value="tcp://localhost:61616" />

-      </bean>

-    </property>

-  </bean>

-

-</beans>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/pom.xml b/trunk/examples/loan-broker-bpel/loan-broker-ode-su/pom.xml
deleted file mode 100644
index 1f044be..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/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.examples</groupId>
-        <artifactId>loan-broker</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-    <artifactId>loan-broker-ode-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL :: ODE SU</name>
-
-    <properties>
-        <componentName>OdeBpelEngine</componentName>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/bank.wsdl b/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/bank.wsdl
deleted file mode 100644
index 8b422ab..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/bank.wsdl
+++ /dev/null
@@ -1,73 +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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->

-<definitions targetNamespace="urn:logicblaze:soa:bank"

-    xmlns:tns="urn:logicblaze:soa:bank"

-    xmlns="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-    <types>

-        <xsd:schema

-            targetNamespace="urn:logicblaze:soa:bank"

-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-            <xsd:complexType name="getLoanQuoteRequest">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                    <xsd:element name="amount" type="xsd:double" />

-                    <xsd:element name="duration" type="xsd:int" />

-                    <xsd:element name="score" type="xsd:int" />

-                    <xsd:element name="length" type="xsd:int" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="getLoanQuoteResponse">

-                <xsd:sequence>

-                    <xsd:element name="rate" type="xsd:double" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="getLoanQuoteRequest" type="tns:getLoanQuoteRequest" />

-            <xsd:element name="getLoanQuoteResponse" type="tns:getLoanQuoteResponse" />

-

-        </xsd:schema>

-    </types>

-

-    <message name="getLoanQuoteRequest">

-        <part name="payload" element="tns:getLoanQuoteRequest" />

-    </message>

-

-    <message name="getLoanQuoteResponse">

-        <part name="payload" element="tns:getLoanQuoteResponse" />

-    </message>

-

-    <portType name="Bank">

-        <operation name="getLoanQuote">

-            <input message="tns:getLoanQuoteRequest" />

-            <output message="tns:getLoanQuoteResponse" />

-        </operation>

-    </portType>

-

-    <plnk:partnerLinkType name="BankPL">

-        <plnk:role name="BankService" portType="tns:Bank" />

-    </plnk:partnerLinkType>

-

-</definitions>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/creditagency.wsdl b/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/creditagency.wsdl
deleted file mode 100644
index 32b3ec2..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/creditagency.wsdl
+++ /dev/null
@@ -1,121 +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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->

-<definitions targetNamespace="urn:logicblaze:soa:creditagency"

-    xmlns:tns="urn:logicblaze:soa:creditagency"

-    xmlns="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-    <types>

-        <xsd:schema

-            targetNamespace="urn:logicblaze:soa:creditagency"

-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-            <xsd:complexType name="getCreditScoreRequest">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="getCreditScoreResponse">

-                <xsd:sequence>

-                    <xsd:element name="score" type="xsd:int" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="getCreditHistoryLengthRequest">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="getCreditHistoryLengthResponse">

-                <xsd:sequence>

-                    <xsd:element name="length" type="xsd:int" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="unknownSSNFault">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="invalidSSNFault">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="getCreditScoreRequest" type="tns:getCreditScoreRequest" />

-            <xsd:element name="getCreditScoreResponse" type="tns:getCreditScoreResponse" />

-            <xsd:element name="getCreditHistoryLengthRequest" type="tns:getCreditHistoryLengthRequest" />

-            <xsd:element name="getCreditHistoryLengthResponse" type="tns:getCreditHistoryLengthResponse" />

-            <xsd:element name="unknownSSNFault" type="tns:unknownSSNFault" />

-            <xsd:element name="invalidSSNFault" type="tns:invalidSSNFault" />

-

-        </xsd:schema>

-    </types>

-

-    <message name="getCreditScoreRequest">

-        <part name="payload" element="tns:getCreditScoreRequest" />

-    </message>

-

-    <message name="getCreditScoreResponse">

-        <part name="payload" element="tns:getCreditScoreResponse" />

-    </message>

-

-    <message name="getCreditHistoryLengthRequest">

-        <part name="payload" element="tns:getCreditHistoryLengthRequest" />

-    </message>

-

-    <message name="getCreditHistoryLengthResponse">

-        <part name="payload" element="tns:getCreditHistoryLengthResponse" />

-    </message>

-

-    <message name="unknownSSNFault">

-        <part name="payload" element="tns:unknownSSNFault" />

-    </message>

-

-    <message name="invalidSSNFault">

-        <part name="payload" element="tns:invalidSSNFault" />

-    </message>

-

-    <portType name="CreditAgency">

-        <operation name="getCreditScore">

-            <input message="tns:getCreditScoreRequest" />

-            <output message="tns:getCreditScoreResponse" />

-            <fault name="UnknownSSN" message="tns:unknownSSNFault" />

-            <fault name="InvalidSSN" message="tns:invalidSSNFault" />

-        </operation>

-        <operation name="getCreditHistoryLength">

-            <input message="tns:getCreditHistoryLengthRequest" />

-            <output message="tns:getCreditHistoryLengthResponse" />

-            <fault name="UnknownSSN" message="tns:unknownSSNFault">

-            </fault>

-        </operation>

-    </portType>

-

-    <plnk:partnerLinkType name="CreditAgencyPL">

-        <plnk:role name="CreditAgencyService" portType="tns:CreditAgency" />

-    </plnk:partnerLinkType>

-

-</definitions>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/deploy.xml b/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/deploy.xml
deleted file mode 100644
index 3dc48bc..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/deploy.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.

--->

-

-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"

-        xmlns:lb="urn:logicblaze:soa:loanbroker"

-        xmlns:ca="urn:logicblaze:soa:creditagency"

-        xmlns:bk="urn:logicblaze:soa:bank">

-

-  <process name="lb:LoanBrokerService">

-    <active>true</active>

-    <provide partnerLink="LoanBroker">

-      <service name="lb:LoanBrokerService" port="broker" />

-    </provide>

-    <invoke partnerLink="CreditAgency">

-      <service name="ca:CreditAgencyService" port="agency" />

-    </invoke>

-    <invoke partnerLink="Bank1">

-      <service name="bk:Bank1" port="bank" />

-    </invoke>

-    <invoke partnerLink="Bank2">

-      <service name="bk:Bank2" port="bank" />

-    </invoke>

-    <invoke partnerLink="Bank3">

-      <service name="bk:Bank3" port="bank" />

-    </invoke>

-    <invoke partnerLink="Bank4">

-      <service name="bk:Bank4" port="bank" />

-    </invoke>

-    <invoke partnerLink="Bank5">

-      <service name="bk:Bank5" port="bank" />

-    </invoke>

-  </process>

-

-</deploy>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/loanbroker.bpel b/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/loanbroker.bpel
deleted file mode 100644
index 308f4b0..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/loanbroker.bpel
+++ /dev/null
@@ -1,305 +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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->

-<bpel:process name="LoanBrokerService"

-    targetNamespace="urn:logicblaze:soa:loanbroker"

-    suppressJoinFailure="yes"

-    exitOnStandardFault="yes"

-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

-    xmlns:tns="urn:logicblaze:soa:loanbroker"

-    xmlns:ca="urn:logicblaze:soa:creditagency"

-    xmlns:bk="urn:logicblaze:soa:bank"

-    xmlns:svc="urn:logicblaze:soa:service"

-    xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">

-

-    <bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="loanbroker.wsdl" namespace="urn:logicblaze:soa:loanbroker"/>

-

-    <bpel:partnerLinks>

-        <bpel:partnerLink myRole="LoanBrokerService" name="LoanBroker" partnerLinkType="tns:LoanBrokerPL"/>

-        <bpel:partnerLink partnerRole="CreditAgencyService" name="CreditAgency" partnerLinkType="ca:CreditAgencyPL"/>

-        <bpel:partnerLink partnerRole="BankService" name="Bank1" partnerLinkType="bk:BankPL"/>

-        <bpel:partnerLink partnerRole="BankService" name="Bank2" partnerLinkType="bk:BankPL"/>

-        <bpel:partnerLink partnerRole="BankService" name="Bank3" partnerLinkType="bk:BankPL"/>

-        <bpel:partnerLink partnerRole="BankService" name="Bank4" partnerLinkType="bk:BankPL"/>

-        <bpel:partnerLink partnerRole="BankService" name="Bank5" partnerLinkType="bk:BankPL"/>

-    </bpel:partnerLinks>

-

-    <bpel:variables>

-        <bpel:variable name="request" messageType="tns:getLoanQuoteRequest" />

-        <bpel:variable name="response" messageType="tns:getLoanQuoteResponse" />

-        <bpel:variable name="ca-score-request" messageType="ca:getCreditScoreRequest" />

-        <bpel:variable name="ca-score-response" messageType="ca:getCreditScoreResponse" />

-        <bpel:variable name="ca-history-request" messageType="ca:getCreditHistoryLengthRequest" />

-        <bpel:variable name="ca-history-response" messageType="ca:getCreditHistoryLengthResponse" />

-        <bpel:variable name="bk-loanquote-request" messageType="bk:getLoanQuoteRequest" />

-        <bpel:variable name="bk-loanquote-response-1" messageType="bk:getLoanQuoteResponse" />

-        <bpel:variable name="bk-loanquote-response-2" messageType="bk:getLoanQuoteResponse" />

-        <bpel:variable name="bk-loanquote-response-3" messageType="bk:getLoanQuoteResponse" />

-        <bpel:variable name="bk-loanquote-response-4" messageType="bk:getLoanQuoteResponse" />

-        <bpel:variable name="bk-loanquote-response-5" messageType="bk:getLoanQuoteResponse" />

-        <bpel:variable name="invalidSSN" messageType="tns:invalidSSNFault" />

-        <bpel:variable name="unknownSSN" messageType="tns:unknownSSNFault" />

-    </bpel:variables>

-    

-    <bpel:faultHandlers>

-        <bpel:catch faultName="ca:InvalidSSN">

-            <bpel:sequence>

-                <bpel:assign>

-                    <bpel:copy>

-                        <bpel:from>

-                            <bpel:literal>

-                                <tns:invalidSSNFault><tns:ssn/></tns:invalidSSNFault>

-                            </bpel:literal>

-                        </bpel:from>

-                        <bpel:to>$invalidSSN.payload</bpel:to>

-                    </bpel:copy>

-                    <bpel:copy>

-                        <bpel:from>$request.payload/tns:ssn</bpel:from>

-                        <bpel:to>$invalidSSN.payload/tns:ssn</bpel:to>

-                    </bpel:copy>

-                </bpel:assign>

-                <bpel:reply name="response" partnerLink="LoanBroker"

-                    portType="tns:LoanBroker" operation="getLoanQuote"

-                    variable="invalidSSN" faultName="tns:InvalidSSN" >

-                </bpel:reply>

-            </bpel:sequence>

-        </bpel:catch>

-        <bpel:catch faultName="ca:UnkownSSN">

-            <bpel:sequence>

-                <bpel:assign>

-                    <bpel:copy>

-                        <bpel:from>

-                            <bpel:literal>

-                                <tns:unknownSSNFault><tns:ssn/></tns:unknownSSNFault>

-                            </bpel:literal>

-                        </bpel:from>

-                        <bpel:to>$invalidSSN.payload</bpel:to>

-                    </bpel:copy>

-                    <bpel:copy>

-                        <bpel:from>$request.payload/tns:ssn</bpel:from>

-                        <bpel:to>$unknownSSN.payload/tns:ssn</bpel:to>

-                    </bpel:copy>

-                </bpel:assign>

-                <bpel:reply name="response" partnerLink="LoanBroker"

-                    portType="tns:LoanBroker" operation="getLoanQuote"

-                    variable="unknownSSN" faultName="tns:UnknownSSN" >

-                </bpel:reply>

-            </bpel:sequence>

-        </bpel:catch>

-    </bpel:faultHandlers>

-

-    <bpel:sequence>

-        <bpel:receive name="request" partnerLink="LoanBroker"

-            portType="tns:LoanBroker" operation="getLoanQuote" variable="request"

-            createInstance="yes">

-        </bpel:receive>

-

-            

-        <bpel:flow>

-        

-            <bpel:sequence>

-                <bpel:assign>

-                    <bpel:copy>

-                        <bpel:from>

-                            <bpel:literal>

-                                <ca:getCreditHistoryLengthRequest><ca:ssn/></ca:getCreditHistoryLengthRequest>

-                            </bpel:literal>

-                        </bpel:from>

-                        <bpel:to>$ca-history-request.payload</bpel:to>

-                    </bpel:copy>

-                    <bpel:copy>

-                        <bpel:from>$request.payload/tns:ssn</bpel:from>

-                        <bpel:to>$ca-history-request.payload/ca:ssn</bpel:to>

-                    </bpel:copy>

-                </bpel:assign>

-        

-                <bpel:invoke name="service" partnerLink="CreditAgency"

-                    portType="ca:CreditAgency" operation="getCreditHistoryLength"

-                    inputVariable="ca-history-request"

-                    outputVariable="ca-history-response" />

-            </bpel:sequence>

-            

-            <bpel:sequence>

-                <bpel:assign>

-                    <bpel:copy>

-                        <bpel:from>

-                            <bpel:literal>

-                                <ca:getCreditScoreRequest><ca:ssn/></ca:getCreditScoreRequest>

-                            </bpel:literal>

-                        </bpel:from>

-                        <bpel:to>$ca-score-request.payload</bpel:to>

-                    </bpel:copy>

-                    <bpel:copy>

-                        <bpel:from>$request.payload/tns:ssn</bpel:from>

-                        <bpel:to>$ca-score-request.payload/ca:ssn</bpel:to>

-                    </bpel:copy>

-                </bpel:assign>

-        

-                <bpel:invoke name="service" partnerLink="CreditAgency"

-                    portType="ca:CreditAgency" operation="getCreditScore"

-                    inputVariable="ca-score-request"

-                    outputVariable="ca-score-response" />

-            </bpel:sequence>

-        </bpel:flow>

-

-        <bpel:assign>

-            <bpel:copy>

-                <bpel:from>

-                    <bpel:literal>

-                        <bk:getLoanQuoteRequest><bk:ssn/><bk:amount/><bk:duration/><bk:score/><bk:length/></bk:getLoanQuoteRequest>

-                    </bpel:literal>

-                </bpel:from>

-                <bpel:to>$bk-loanquote-request.payload</bpel:to>

-            </bpel:copy>

-            <bpel:copy>

-                <bpel:from>$request.payload/tns:ssn</bpel:from>

-                <bpel:to>$bk-loanquote-request.payload/bk:ssn</bpel:to>

-            </bpel:copy>

-            <bpel:copy>

-                <bpel:from>$request.payload/tns:amount</bpel:from>

-                <bpel:to>$bk-loanquote-request.payload/bk:amount</bpel:to>

-            </bpel:copy>

-            <bpel:copy>

-                <bpel:from>$request.payload/tns:duration</bpel:from>

-                <bpel:to>$bk-loanquote-request.payload/bk:duration</bpel:to>

-            </bpel:copy>

-            <bpel:copy>

-                <bpel:from>$ca-score-response.payload/ca:score</bpel:from>

-                <bpel:to>$bk-loanquote-request.payload/bk:score</bpel:to>

-            </bpel:copy>

-            <bpel:copy>

-                <bpel:from>$ca-history-response.payload/ca:length</bpel:from>

-                <bpel:to>$bk-loanquote-request.payload/bk:length</bpel:to>

-            </bpel:copy>

-            <bpel:copy>

-                <bpel:from>

-                    <bpel:literal>

-                        <tns:getLoanQuoteResponse><tns:rate/></tns:getLoanQuoteResponse>

-                    </bpel:literal>

-                </bpel:from>

-                <bpel:to>$response.payload</bpel:to>

-            </bpel:copy>

-        </bpel:assign>

-

-        <bpel:if>

-            <bpel:condition>

-                $bk-loanquote-request.payload/bk:amount >= 75000.0 and

-                $bk-loanquote-request.payload/bk:score >= 600 and

-                $bk-loanquote-request.payload/bk:length >= 8

-            </bpel:condition>

-            <bpel:sequence>

-                <bpel:flow>

-                    <bpel:invoke name="bank1" partnerLink="Bank1"

-                            portType="bk:Bank" operation="getLoanQuote" 

-                            inputVariable="bk-loanquote-request"

-                            outputVariable="bk-loanquote-response-1" />

-                            

-                    <bpel:invoke name="bank2" partnerLink="Bank2"

-                            portType="bk:Bank" operation="getLoanQuote" 

-                            inputVariable="bk-loanquote-request"

-                            outputVariable="bk-loanquote-response-2" />

-                </bpel:flow>

-                <bpel:if>

-                    <bpel:condition>

-                        $bk-loanquote-response-1.payload/bk:rate > $bk-loanquote-response-2.payload/bk:rate

-                    </bpel:condition>

-                    <bpel:assign>

-                        <bpel:copy>

-                            <bpel:from>$bk-loanquote-response-2.payload/bk:rate</bpel:from>

-                            <bpel:to>$response.payload/tns:rate</bpel:to>

-                        </bpel:copy>

-                    </bpel:assign>

-                    <bpel:else>

-                        <bpel:assign>

-                            <bpel:copy>

-                                <bpel:from>$bk-loanquote-response-1.payload/bk:rate</bpel:from>

-                                <bpel:to>$response.payload/tns:rate</bpel:to>

-                            </bpel:copy>

-                        </bpel:assign>

-                    </bpel:else>

-                </bpel:if>

-            </bpel:sequence>

-        

-            <bpel:elseif>

-                <bpel:condition>

-                    $bk-loanquote-request.payload/bk:amount >= 10000.0 and

-                    $bk-loanquote-request.payload/bk:amount &lt; 75000.0 and

-                    $bk-loanquote-request.payload/bk:score >= 400 and

-                    $bk-loanquote-request.payload/bk:length >= 3

-                </bpel:condition>

-                <bpel:sequence>

-                    <bpel:flow>      

-                        <bpel:invoke name="bank3" partnerLink="Bank3"

-                                portType="bk:Bank" operation="getLoanQuote" 

-                                inputVariable="bk-loanquote-request"

-                                outputVariable="bk-loanquote-response-3" />

-                        <bpel:invoke name="bank4" partnerLink="Bank4"

-                                portType="bk:Bank" operation="getLoanQuote" 

-                                inputVariable="bk-loanquote-request"

-                                outputVariable="bk-loanquote-response-4" />

-                    </bpel:flow>

-                    <bpel:if>

-                        <bpel:condition>

-                            $bk-loanquote-response-3.payload/bk:rate > $bk-loanquote-response-4.payload/bk:rate

-                        </bpel:condition>

-                        <bpel:assign>

-                            <bpel:copy>

-                                <bpel:from>$bk-loanquote-response-4.payload/bk:rate</bpel:from>

-                                <bpel:to>$response.payload/tns:rate</bpel:to>

-                            </bpel:copy>

-                        </bpel:assign>

-                        <bpel:else>

-                            <bpel:assign>

-                                <bpel:copy>

-                                    <bpel:from>$bk-loanquote-response-3.payload/bk:rate</bpel:from>

-                                    <bpel:to>$response.payload/tns:rate</bpel:to>

-                                </bpel:copy>

-                            </bpel:assign>

-                        </bpel:else>

-                    </bpel:if>

-                </bpel:sequence>

-            </bpel:elseif>

-        

-            <bpel:else>

-            

-                <bpel:sequence>

-                    <bpel:invoke name="bank5" partnerLink="Bank5"

-                            portType="bk:Bank" operation="getLoanQuote" 

-                            inputVariable="bk-loanquote-request"

-                            outputVariable="bk-loanquote-response-5" />

-                    <bpel:assign>

-                        <bpel:copy>

-                            <bpel:from>$bk-loanquote-response-5.payload/bk:rate</bpel:from>

-                            <bpel:to>$response.payload/tns:rate</bpel:to>

-                        </bpel:copy>

-                    </bpel:assign>

-                </bpel:sequence>

-    

-            </bpel:else>

-    

-        </bpel:if>

-        

-        <bpel:reply name="response" partnerLink="LoanBroker"

-            portType="tns:LoanBroker" operation="getLoanQuote"

-            variable="response" />

-

-    </bpel:sequence>

-

-</bpel:process>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/loanbroker.wsdl b/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/loanbroker.wsdl
deleted file mode 100644
index 28f4272..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-ode-su/src/main/resources/loanbroker.wsdl
+++ /dev/null
@@ -1,103 +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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->

-<definitions targetNamespace="urn:logicblaze:soa:loanbroker"

-    xmlns:tns="urn:logicblaze:soa:loanbroker"

-    xmlns="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/">

-

-    <import namespace="urn:logicblaze:soa:creditagency"

-        location="creditagency.wsdl" />

-

-    <import namespace="urn:logicblaze:soa:bank"

-        location="bank.wsdl" />

-

-    <!-- type defs -->

-    <types>

-        <xsd:schema

-            targetNamespace="urn:logicblaze:soa:loanbroker"

-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-            <xsd:complexType name="getLoanQuoteRequest">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                    <xsd:element name="amount" type="xsd:double" />

-                    <xsd:element name="duration" type="xsd:int" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="getLoanQuoteResponse">

-                <xsd:sequence>

-                    <xsd:element name="rate" type="xsd:double" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="unknownSSNFault">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="invalidSSNFault">

-                <xsd:sequence>

-                    <xsd:element name="ssn" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="getLoanQuoteRequest" type="tns:getLoanQuoteRequest" />

-            <xsd:element name="getLoanQuoteResponse" type="tns:getLoanQuoteResponse" />

-            <xsd:element name="unknownSSNFault" type="tns:unknownSSNFault" />

-            <xsd:element name="invalidSSNFault" type="tns:invalidSSNFault" />

-

-        </xsd:schema>

-    </types>

-

-    <message name="getLoanQuoteRequest">

-        <part name="payload" element="tns:getLoanQuoteRequest" />

-    </message>

-

-    <message name="getLoanQuoteResponse">

-        <part name="payload" element="tns:getLoanQuoteResponse" />

-    </message>

-

-    <message name="unknownSSNFault">

-        <part name="payload" element="tns:unknownSSNFault" />

-    </message>

-

-    <message name="invalidSSNFault">

-        <part name="payload" element="tns:invalidSSNFault" />

-    </message>

-

-    <portType name="LoanBroker">

-        <operation name="getLoanQuote">

-            <input message="tns:getLoanQuoteRequest" />

-            <output message="tns:getLoanQuoteResponse" />

-            <fault name="UnknownSSN" message="tns:unknownSSNFault" />

-            <fault name="InvalidSSN" message="tns:invalidSSNFault" />

-        </operation>

-    </portType>

-

-    <plnk:partnerLinkType name="LoanBrokerPL">

-        <plnk:role name="LoanBrokerService" portType="tns:LoanBroker" />

-    </plnk:partnerLinkType>

-

-</definitions>

diff --git a/trunk/examples/loan-broker-bpel/loan-broker-sa/pom.xml b/trunk/examples/loan-broker-bpel/loan-broker-sa/pom.xml
deleted file mode 100644
index adb72af..0000000
--- a/trunk/examples/loan-broker-bpel/loan-broker-sa/pom.xml
+++ /dev/null
@@ -1,68 +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.examples</groupId>
-        <artifactId>loan-broker</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-    <artifactId>loan-broker-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-            <artifactId>loan-broker-ode-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-            <artifactId>loan-broker-bean-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-            <artifactId>loan-broker-drools-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.loan-broker</groupId>
-            <artifactId>loan-broker-jms-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/examples/loan-broker-bpel/pom.xml b/trunk/examples/loan-broker-bpel/pom.xml
deleted file mode 100644
index 7f9cda3..0000000
--- a/trunk/examples/loan-broker-bpel/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <artifactId>loan-broker</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: Loan Broker BPEL</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>loan-broker-bean-su</module>
-        <module>loan-broker-drools-su</module>
-        <module>loan-broker-ode-su</module>
-        <module>loan-broker-jms-su</module>
-        <module>loan-broker-sa</module>
-        <module>client</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/loan-broker-bpel/src/main/assembly/src.xml b/trunk/examples/loan-broker-bpel/src/main/assembly/src.xml
deleted file mode 100644
index 6399670..0000000
--- a/trunk/examples/loan-broker-bpel/src/main/assembly/src.xml
+++ /dev/null
@@ -1,40 +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>

-    <format>zip</format>

-  </formats>

-  <fileSets>

-    <fileSet>

-      <includes>

-        <include>README*</include>

-        <include>LICENSE*</include>

-        <include>NOTICE*</include>

-        <include>pom.xml</include>

-    <include>build.xml</include>

-        <include>src/**/*</include>

-        <include>*/pom.xml</include>

-        <include>*/src/**/*</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-</assembly>

diff --git a/trunk/examples/pom.xml b/trunk/examples/pom.xml
deleted file mode 100644
index aa0a442..0000000
--- a/trunk/examples/pom.xml
+++ /dev/null
@@ -1,57 +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.features</groupId>
-        <artifactId>features</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>examples</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Examples</name>
-
-    <modules>
-        <module>bridge</module>
-        <module>bridge-camel</module>
-        <module>camel</module>
-        <module>camel-blueprint</module>
-        <module>camel-nmr-blueprint</module>
-        <module>cxf-wsdl-first</module>
-        <module>wsdl-first</module>
-        <module>loan-broker-bpel</module>
-        <module>camel-nmr</module>
-        <module>camel-osgi</module>
-        <module>cxf-camel-nmr</module>
-        <module>cxf-nmr</module>
-        <module>cxf-osgi</module>
-        <module>cxf-jaxrs</module>
-        <module>cxf-ws-addressing</module>
-        <module>cxf-wsdl-first-osgi-package</module>
-        <module>cxf-ws-security-osgi</module>
-        <module>cxf-ws-rm</module>
-        <module>itests</module>
-    </modules>
-
-</project>
diff --git a/trunk/examples/simple/README.txt b/trunk/examples/simple/README.txt
deleted file mode 100644
index 31a92c1..0000000
--- a/trunk/examples/simple/README.txt
+++ /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.
- */
-
-Simple Configuration Only Example
-=================================
-
-Purpose
--------
-Add new endpoints using XML configuration files only.
-
-
-Explanation
------------
-There are two parts to this example: Quartz and Groovy. In both cases,
-the JBI endpoints are specified in Spring XML files. When the XML files 
-are deployed to ServiceMix the endpoints are automatically registered
-in the NMR.  
-
-1. Quartz
-The quartz.xml file, located in the same director as this README,
-shows you how to deploy a Camel route together with a JBI endpoint
-in the same XML file. It contains configuration for using the
-Quartz job scheduling system to send messages periodically to
-a JBI endpoint called 'endpoint'. These messages are routed,
-using Camel, to the 'test' logger.
-
-2. Groovy:
-The groovy.xml file, also located in the same directory as this
-README, demonstrates how to embed a service implementation in a
-configuration file, using a scripting language. In this case, we
-use groovy. It uses quartz to send a message every second to the
-service 'receiver'. This service is defined as a scripting endpoint, 
-written in Groovy, using the ServiceMix scripting service engine.
-The Groovy script is stored in ServiceMix's document repository
-and the script is executed whenever a message is received by the
-'receiver' service.
-
-
-Prerequisites for Running the Example
--------------------------------------
-1. You must have the following installed on your machine:
-
-   - JDK 1.5 or higher
-      
-  For more information, see the README in the top-level examples
-  directory.
-
-2. Start ServiceMix by running the following command:
-
-  <servicemix_home>/bin/servicemix          (on UNIX)
-  <servicemix_home>\bin\servicemix          (on Windows)
-
-
-Running the Example
--------------------
-To run the example, copy either of the XML files, quartz.xml or
-groovy.xml, from the examples/simple directory to the
-<servicemix_home>/deploy directory.
-
-When the quartz.xml file is copied to the deploy directory, it sends
-messages to the log. You can view the log entries by typing the
-following command in the ServiceMix console:
-
-  log:display
-
-You should see an entry similar to the following:
-
-  14:15:51,202 | INFO  | x-camel-thread-4 | test                 
-  | rg.apache.camel.processor.Logger   88 | Exchange
-  [BodyType:javax.xml.transform.dom.DOMSource, 
-  Body:<timer><name>{http://servicemix.apache.org/examples/camel}
-  service:endpoint</name><group>DEFAULT</group><fullname>DEFAULT.
-  {http://servicemix.apache.org/examples/camel}service:endpoint
-  </fullname><description/><fireTime>Mon Mar 23 14:15:51 CST 2009
-  </fireTime></timer>]
-
-When the groovy.xml file is copied to the deploy directory, you should 
-see the output similar to the following displayed in the console:
-
-  Starting JSR-223 groovy processor
-  org.apache.servicemix.jbi.runtime.impl.InOnlyImpl@41a330e4
-  Hello, I got an input message <?xml version="1.0" encoding="UTF-8"
-  standalone="no"?><timer><name>{http://servicemix.apache.org/examples
-  /groovy} service:endpoint</name><group>DEFAULT</group><fullname>
-  DEFAULT.{http://servicemix.apache.org/examples/groovy}service:
-  endpoint</fullname><description/><fireTime>Fri Aug 08 13:50:16 
-  CEST 2008</fireTime></timer>
-
-
-Removing the Example
---------------------
-To remove the example, remove the XML file from the
-deploy directory.
diff --git a/trunk/examples/simple/groovy.xml b/trunk/examples/simple/groovy.xml
deleted file mode 100644
index da0ea62..0000000
--- a/trunk/examples/simple/groovy.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:quartz="http://servicemix.apache.org/quartz/1.0"
-       xmlns:scripting="http://servicemix.apache.org/scripting/1.0"
-       xmlns:camel="http://activemq.apache.org/camel/schema/spring"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       xmlns:b="http://servicemix.apache.org/examples/groovy"
-       xsi:schemaLocation="
-         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-         http://www.springframework.org/schema/util  http://www.springframework.org/schema/util/spring-util.xsd
-         http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd
-         http://www.springframework.org/schema/osgi-compendium   http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-         http://servicemix.apache.org/quartz/1.0     http://servicemix.apache.org/quartz/1.0/servicemix-quartz.xsd
-         http://servicemix.apache.org/scripting/1.0  http://servicemix.apache.org/scripting/1.0/servicemix-scripting.xsd
-         http://activemq.apache.org/camel/schema/spring  http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-         http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-    <quartz:endpoint service="b:service" endpoint="endpoint" targetService="b:receiver">
-       <quartz:trigger>
-          <quartz:simple name="groovy-trigger" repeatCount="500" repeatInterval="1000" startDelay="2000" />
-       </quartz:trigger>
-    </quartz:endpoint>
-
-    <scripting:endpoint service="b:receiver" endpoint="endpoint" 
-                        script="document-name:myscript"
-                        disableOutput="true"
-                        language="groovy" />
-	
-    <bean id="myscript" class="org.apache.servicemix.document.factory.DocumentFactory">
-      <property name="repository" ref="repository" />
-      <property name="document">
-        <value>
-           import javax.jbi.messaging.MessageExchange;
-           import javax.jbi.messaging.NormalizedMessage;
-           import org.apache.servicemix.jbi.jaxp.StringSource;
-           import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-
-           println "Starting JSR-223 groovy processor";
-
-           println exchange;       
-           def inputMessage = new SourceTransformer().toString(inMessage.getContent());
-           println "Hello, I got an input message " + inputMessage;
-        </value>
-      </property>
-    </bean>
-
-    <osgi:reference id="repository" interface="org.apache.servicemix.document.DocumentRepository" />
-
-    <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
-
-</beans>
diff --git a/trunk/examples/simple/quartz.xml b/trunk/examples/simple/quartz.xml
deleted file mode 100644
index 9540d50..0000000
--- a/trunk/examples/simple/quartz.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:quartz="http://servicemix.apache.org/quartz/1.0"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       xmlns:b="http://servicemix.apache.org/examples/camel"
-       xsi:schemaLocation="
-         http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans.xsd
-         http://www.springframework.org/schema/util
-         http://www.springframework.org/schema/util/spring-util.xsd
-         http://www.springframework.org/schema/osgi
-         http://www.springframework.org/schema/osgi/spring-osgi.xsd
-         http://www.springframework.org/schema/osgi-compendium
-         http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-         http://servicemix.apache.org/quartz/1.0
-         http://servicemix.apache.org/quartz/1.0/servicemix-quartz.xsd
-         http://camel.apache.org/schema/spring
-         http://camel.apache.org/schema/spring/camel-spring.xsd
-         http://www.springframework.org/schema/osgi
-         http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-	<camel:camelContext>
-	    <camel:route>
-	        <camel:from uri="jbi:endpoint:http://servicemix.apache.org/examples/camel/receiver/endpoint" />
-	        <camel:to uri="log:test" />
-        </camel:route>
-	</camel:camelContext>
-	
-	<quartz:endpoint service="b:service" endpoint="endpoint" targetService="b:receiver">
-        <quartz:trigger>
-            <quartz:simple repeatCount="500" repeatInterval="1000" startDelay="2000" />
-        </quartz:trigger>
-	</quartz:endpoint>
-	
-    <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
-
-</beans>
diff --git a/trunk/examples/simple/wsn.xml b/trunk/examples/simple/wsn.xml
deleted file mode 100644
index 2108eff..0000000
--- a/trunk/examples/simple/wsn.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://servicemix.apache.org/http/1.0"
-       xmlns:ctx="http://www.springframework.org/schema/context"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xmlns:wsn="http://servicemix.org/wsnotification"
-       xsi:schemaLocation="
-         http://www.springframework.org/schema/beans             http://www.springframework.org/schema/beans/spring-beans.xsd
-         http://www.springframework.org/schema/context           http://www.springframework.org/schema/context/spring-context.xsd
-         http://www.springframework.org/schema/util              http://www.springframework.org/schema/util/spring-util.xsd
-         http://www.springframework.org/schema/osgi              http://www.springframework.org/schema/osgi/spring-osgi.xsd
-         http://www.springframework.org/schema/osgi-compendium   http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-         http://servicemix.apache.org/http/1.0                   http://servicemix.apache.org/http/1.0/servicemix-http.xsd">
-
-    <!-- Define a soap consumer targeting the ws-notification NotificationBroker endpoint.
-         The targetService and targetEndpoint attributes are not specified because 
-         the target endpoint has the same service / endpoint name as this endpoint.
-      -->
-    <http:soap-consumer service="wsn:NotificationBroker" endpoint="Broker"
-                        locationURI="${baseUrl}/Broker/"
-                        validateWsdl="true">
-        <!-- Enable WS-Addressing on this endpoint -->
-        <http:policies>
-            <bean class="org.apache.servicemix.soap.ws.addressing.WsAddressingPolicy" />
-        </http:policies>
-    </http:soap-consumer>
-
-    <!-- Define a soap consumer targeting the ws-notification CreatePullPoint endpoint.
-         The targetService and targetEndpoint attributes are not specified because 
-         the target endpoint has the same service / endpoint name as this endpoint.
-      -->
-    <http:soap-consumer service="wsn:CreatePullPoint" endpoint="Broker"
-                        locationURI="${baseUrl}/CreatePullPoint/"
-                        validateWsdl="true">
-        <!-- Enable WS-Addressing on this endpoint -->
-        <http:policies>
-            <bean class="org.apache.servicemix.soap.ws.addressing.WsAddressingPolicy" />
-        </http:policies>
-    </http:soap-consumer>
-
-    <!-- Export this service assembly to the OSGi registry -->
-    <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
-    
-    <!-- The target endpoints for this Service Assembly are defined outside the scope of this SA.
-         To make sure the SA is not create before those endpoints are available, we add
-         two dependencies at spring-dm level on the required endpoints.
-      -->
-    <osgi:reference id="notificationBrokerEndpoint" 
-                    interface="org.apache.servicemix.nmr.api.Endpoint" 
-                    filter="(&amp;(jbi.internal=true)(SERVICE_NAME={http://servicemix.org/wsnotification}NotificationBroker))" />
-    <osgi:reference id="createPullpointEndpoint" 
-                    interface="org.apache.servicemix.nmr.api.Endpoint" 
-                    filter="(&amp;(jbi.internal=true)(SERVICE_NAME={http://servicemix.org/wsnotification}CreatePullPoint))" />
-
-    <!-- Expose some properties using the OSGi Configuration Admin service.
-         The values specified here is the default value which can be overriden
-         by feeding the configuration admin service with the needed configuration.
-         This can be done by creating a file named etc/org.apache.servicemix.examples.wsn.cfg
-         containing the property below. -->
-    <osgix:cm-properties id="wsnProps" persistent-id="org.apache.servicemix.examples.wsn">
-        <prop key="baseUrl">http://0.0.0.0:8192/wsn</prop>
-    </osgix:cm-properties>
-    <ctx:property-placeholder properties-ref="wsnProps" />
-
-</beans>
diff --git a/trunk/examples/web/NOTICE b/trunk/examples/web/NOTICE
deleted file mode 100644
index 2f69501..0000000
--- a/trunk/examples/web/NOTICE
+++ /dev/null
@@ -1,21 +0,0 @@
-Apache Felix Karaf

-Copyright 2009 The Apache Software Foundation

-

-

-I. Included Software

-

-This product includes software developed at

-The Apache Software Foundation (http://www.apache.org/).

-Licensed under the Apache License 2.0.

-

-

-II. Used Software

-

-This product uses software developed at

-The OSGi Alliance (http://www.osgi.org/).

-Copyright (c) OSGi Alliance (2000, 2009).

-Licensed under the Apache License 2.0.

-

-

-III. License Summary

-- Apache License 2.0

diff --git a/trunk/examples/web/README.txt b/trunk/examples/web/README.txt
deleted file mode 100644
index cb10f38..0000000
--- a/trunk/examples/web/README.txt
+++ /dev/null
@@ -1,108 +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.

- */

-

-EMBEDDING KARAF IN A WEB APPLICATION

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

-

-Purpose

--------

-Embed Karaf in a web application.

-

-

-Prerequisites for Running the Example

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

-You must have the following installed on your machine:

-

-  - JDK 1.5 or higher

-

-  - Maven 2.0.9 or higher

-

-

-Building and Deploying

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

-You can build and deploy this example in two ways:

-

-- A. Using Jetty: Quick and Easy

-  This option is useful if you want to see the example up and

-  running quickly.

-   

-- B. Using Your Favorite Web Container

-  This option is useful if you want to see Karaf running

-  as a web application inside your favorite web container.

-

-

-A. Using Jetty: Quick and Easy

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

-To build the example and deploy to Jetty, complete the

-following steps:

-

-1. In a command prompt/shell, change to the directory

-   that contains this README.txt file.

-

-2. Enter the following Maven command:

-

-     mvn package jetty:run

-

-This Maven command builds the example web application, starts

-Jetty and deploys the web application to Jetty. Once complete,

-you should see the following printed to the console:

-

-[INFO] Started Jetty Server

-[INFO] Starting scanner at interval of 10 seconds.

-

-Running a Client

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

-To test the example, you can use the Apache Felix Karaf client

-to connect to the server and issue a Karaf command. For example,

-try executing the "features:list" command as follows:

-

-1. In a command prompt/shell, change to your product

-   installation directory.

-

-2. Run the following command:

-

-    java -jar lib/karaf-client.jar features:list

-

-In this case, you should see output similar to the following:

-

-[uninstalled] [2.5.6.SEC01          ] spring     karaf-${version}

-[uninstalled] [1.2.0                ] spring-dm  karaf-${version}

-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] wrapper    karaf-${version}

-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] obr        karaf-${version}

-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] http       karaf-${version}

-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] webconsole karaf-${version}

-[installed  ] [1.1.0.1-fuse-SNAPSHOT] ssh        karaf-${version}

-[installed  ] [1.1.0.1-fuse-SNAPSHOT] management karaf-${version}

-

-

-B. Using Your Favorite Web Container

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

-You can deploy the web application to your favorite web

-container, by completing the following steps:

-

-1. In a command prompt/shell, change to the directory

-   that contains this README.txt file.

-   

-2. Enter the following command:

-

-     mvn package

-     

-Maven builds the web application, web-${version}.war, and 

-saves it in the target directory of this example. Deploy this

-WAR file to your favorite web container. Once the application

-is running, you can test it using the Apache Felix Karaf client

-as described in the "Running a Client" section above.

diff --git a/trunk/examples/web/pom.xml b/trunk/examples/web/pom.xml
deleted file mode 100644
index f4179db..0000000
--- a/trunk/examples/web/pom.xml
+++ /dev/null
@@ -1,163 +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.examples</groupId>

-        <artifactId>examples</artifactId>

-        <version>4.3.0-SNAPSHOT</version>

-    </parent>

-

-  <groupId>org.apache.servicemix.examples</groupId>

-  <artifactId>web</artifactId>

-  <packaging>war</packaging>

-  <name>Apache ServiceMix4 :: Demos :: web</name>

-  

-  <properties>

-    <jetty.port>8080</jetty.port>

-    <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>

-  </properties>

-

-

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.karaf</groupId>

-      <artifactId>org.apache.karaf.main</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.karaf.jaas</groupId>

-      <artifactId>org.apache.karaf.jaas.boot</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.geronimo.specs</groupId>

-      <artifactId>geronimo-servlet_2.5_spec</artifactId>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.servicemix</groupId>

-      <artifactId>apache-servicemix</artifactId>

-      <version>${pom.version}</version>

-      <type>zip</type>

-    </dependency>

-  </dependencies>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-compiler-plugin</artifactId>

-        <configuration>

-          <source>1.5</source>

-          <target>1.5</target>

-        </configuration>

-      </plugin>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-war-plugin</artifactId>

-        <configuration>

-          <warSourceDirectory>src/main/webapp/</warSourceDirectory>

-          <webResources>

-            <resource>

-              <directory>target/smx4</directory>

-            </resource>

-          </webResources>

-        </configuration>

-      </plugin>

-      <plugin>

-        <groupId>org.mortbay.jetty</groupId>

-        <artifactId>maven-jetty-plugin</artifactId>

-        <version>6.1.26RC0</version>

-        <configuration>

-          <connectors>

-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

-              <port>${jetty.port}</port>

-              <maxIdleTime>60000</maxIdleTime>

-            </connector>

-          </connectors>

-          <systemProperties>

-            <!-- enable easy connection to JConsole -->

-            <systemProperty>

-              <name>com.sun.management.jmxremote</name>

-              <value />

-            </systemProperty>

-          </systemProperties>

-          <scanIntervalSeconds>10</scanIntervalSeconds>

-          <webAppSourceDirectory>${basedir}/target/${artifactId}-${version}</webAppSourceDirectory>

-          <webApp>${basedir}/target/${artifactId}-${version}.war</webApp>

-        </configuration>

-      </plugin>

-      <plugin>

-          <groupId>org.apache.maven.plugins</groupId>

-          <artifactId>maven-dependency-plugin</artifactId>

-          <version>2.0</version>

-          <executions>

-              <execution>

-                  <id>unpack-unix</id>

-                  <phase>generate-resources</phase>

-                  <goals>

-                      <goal>unpack</goal>

-                  </goals>

-                  <configuration>

-                      <artifactItems>

-                          <artifactItem>

-                              <groupId>org.apache.servicemix</groupId>

-                              <artifactId>apache-servicemix</artifactId>

-                              <version>${pom.version}</version>                     

-                              <!--<groupId>org.apache.karaf</groupId>

-                              <artifactId>apache-karaf</artifactId>

-                              <version>2.1.0</version>

-                              -->

-

-                              <type>zip</type>

-                              <overWrite>true</overWrite>

-                              <outputDirectory>${project.build.directory}/smx4/WEB-INF</outputDirectory>

-                              <excludes>**/lib/*,**/*.txt,**/bin/*,**/demos/**,**/lib,**/bin,**/demos</excludes>

-                          </artifactItem>

-                      </artifactItems>

-                  </configuration>

-              </execution>

-        </executions>

-      </plugin>

-      <plugin>

-          <groupId>org.apache.maven.plugins</groupId>

-          <artifactId>maven-antrun-plugin</artifactId>

-          <executions>

-              <execution>

-                  <id>copy-servicemix</id>

-                  <phase>process-resources</phase>

-                  <goals>

-                      <goal>run</goal>

-                  </goals>

-                  <configuration>

-                      <tasks>

-                          <move todir="${project.build.directory}/smx4/WEB-INF/servicemix">

-                              <fileset dir="${project.build.directory}/smx4/WEB-INF/apache-servicemix-${pom.version}" /> 

-                              <!--      <fileset dir="${project.build.directory}/smx4/WEB-INF/apache-karaf-2.1.0" /> -->

-                          </move>

-                      </tasks>

-                  </configuration>

-              </execution>

-          </executions>

-      </plugin>

-    </plugins>

-  </build>

-

-</project>

diff --git a/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java b/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
deleted file mode 100644
index c49f246..0000000
--- a/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
+++ /dev/null
@@ -1,59 +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.web;

-

-import java.io.File;

-

-import javax.servlet.ServletContextEvent;

-import javax.servlet.ServletContextListener;

-

-import org.apache.karaf.main.Main;

-import org.apache.karaf.main.Bootstrap;

-

-public class WebAppListener implements ServletContextListener {

-    

-    private Main main;

-    

-    public void contextInitialized(ServletContextEvent sce) {

-        try {

-            System.err.println("contextInitialized");

-            String root = new File(sce.getServletContext().getRealPath("/") + "/WEB-INF/servicemix").getAbsolutePath();

-            System.err.println("Root: " + root);

-            System.setProperty("karaf.home", root);

-            System.setProperty("karaf.base", root);

-            System.setProperty("karaf.startLocalConsole", "false");

-            System.setProperty("karaf.startRemoteShell", "true");

-            main = new Main(new String[0]); //Bootstrap.main(new String[0]);

-            main.launch();

-        } catch (Exception e) {

-            main = null;

-            e.printStackTrace();

-        }

-    }

-

-    public void contextDestroyed(ServletContextEvent sce) {

-        try {

-            System.err.println("contextDestroyed");

-            if (main != null) {

-                main.destroy(false);

-            }

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-    }

-

-}

diff --git a/trunk/examples/web/src/main/webapp/WEB-INF/web.xml b/trunk/examples/web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a497dfc..0000000
--- a/trunk/examples/web/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,36 +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.
--->
-
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-                             http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-  <description>ServiceMix Embedded Example</description>
-  <display-name>ServiceMix Embedded Example</display-name>
-
-  <listener>
-    <listener-class>org.apache.servicemix.web.WebAppListener</listener-class>
-  </listener>
-
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-        
-</web-app>
diff --git a/trunk/examples/web/src/main/webapp/index.jsp b/trunk/examples/web/src/main/webapp/index.jsp
deleted file mode 100644
index 482217b..0000000
--- a/trunk/examples/web/src/main/webapp/index.jsp
+++ /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.
---%>
-<html>
-<head>
-<title>Apache Karaf</title>
-</head>
-<body>
-
-<h2>Welcome!</h2>
-
-<p>
-Welcome to Apache Karaf web application demo
-</p>
-
-<p>
-You can find more information about Karaf on the <a href="http://karaf.apache.org/">Apache Karaf Site</a>
-</p>
-</body>
-</html>
-    
diff --git a/trunk/examples/wsdl-first/README.txt b/trunk/examples/wsdl-first/README.txt
deleted file mode 100644
index bef18c6..0000000
--- a/trunk/examples/wsdl-first/README.txt
+++ /dev/null
@@ -1,42 +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 ServiceMix WSDL design first example
-===============================================
-
-This example shows how to expose a service, beginning from the
-WSDL, and exposing it over HTTP.
-
-First start a ServiceMix server (if not already started) by running
-  bin/servicemix
-in the root dir of this distribution.
-
-To build this sample, launch the following commands:
-  mvn install
-
-You can deploy the example on ServiceMix 4 in two different ways:
-- using hotdeploy: 
-   copy the wsdl-first-sa/target/wsdl-first-sa-${version}.zip to <servicemix_home>/deploy
-- using the ServiceMix console:
-   osgi/install -s mvn:org.apache.servicemix.examples.wsdl-first/wsdl-first-sa/${version}/zip
-
-You can browse the WSDL at
-  http://localhost:8192/PersonService/main.wsdl
-  
-You can also open the client.html page in a browser
-to send a request to the service.
-
diff --git a/trunk/examples/wsdl-first/client.html b/trunk/examples/wsdl-first/client.html
deleted file mode 100644
index 9a2b227..0000000
--- a/trunk/examples/wsdl-first/client.html
+++ /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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 dv©c. 2005) $ -->

-<html>

-<head>

-<title>ServiceMix WSDL-First Example</title>

-<script type="text/javascript">

-var urlToOpen = "http://localhost:8192/PersonService/"; //default URL to open

-

-function getHTTPObject() {

-  var xmlhttp = false;

-

-  /* Compilation conditionnelle d'IE */

-  /*@cc_on

-  @if (@_jscript_version >= 5)

-     try {

-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");

-     } catch (e) {

-        try {

-           xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");

-        } catch (E) {

-           xmlhttp = false;

-        }

-     }

-  @else

-     xmlhttp = false;

-  @end @*/

-

-  /* on essaie de créer l'objet si ce n'est pas déjà fait */

-  if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {

-     try {

-        xmlhttp = new XMLHttpRequest();

-     } catch (e) {

-        xmlhttp = false;

-     }

-  }

-

-  if (xmlhttp) {

-     /* on définit ce qui doit se passer quand la page répondra */

-     xmlhttp.onreadystatechange=function() {

-        if (xmlhttp.readyState == 4) { /* 4 : état "complete" */

-           var response = document.getElementById("response");

-           var responseStatus = "";

-           try {

-             responseStatus = xmlhttp.status + "";

-           } catch (e) {

-             responseStatus = "ERROR WHILE RETRIEVING STATUS; MAYBE UNABLE TO CONNECT.";

-           }

-           response.value = "STATUS: " + responseStatus + "\n" + xmlhttp.responseText;

-        }

-     }

-  }

-  return xmlhttp;

-}

-

-function send() {

-  if ((document.getElementById("urlToOpen").value != urlToOpen) && (document.getElementById("urlToOpen").value != "")) {

-    //use user entry only if it at least can be okay

-    urlToOpen = document.getElementById("urlToOpen").value;

-  }  

-  var xmlhttp = getHTTPObject();

-  if (!xmlhttp) {

-    alert('cound not create XMLHttpRequest object');

-    return;

-  }

-  var request = document.getElementById("request");

-  var response = document.getElementById("response");

-  try {

-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");

-  } catch (e) {

-  }

-  try {

-    xmlhttp.open("POST", urlToOpen, true);

-  } catch (e) {

-    alert('error opening');

-  }

-  xmlhttp.send(request.value);

-}

-

-</script>

-</head>

-

-<body>

-

-<h1>ServiceMix WSDL-First Example</h1>

-

-<p>Welcome to the WSDL-First example for ServiceMix</p>

-

-<p>Perform a POST into the HTTP binding. This requires JavaScript.</p> 

-<p>Target: <input type="text" size="50" id="urlToOpen" value=""><script type="text/javascript">document.getElementById("urlToOpen").value = urlToOpen;</script>.</p>

-  

-<table>

-  <tr>

-    <td>

-  <textarea id="request" style="width:600px;height:400px" onKeyUp="send();"><?xml version="1.0" encoding="UTF-8"?>

-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"

-              xmlns:tns="http://servicemix.apache.org/samples/wsdl-first/types">

-  <env:Body>

-    <tns:GetPerson>

-      <tns:personId>world</tns:personId>

-    </tns:GetPerson>

-  </env:Body>

-</env:Envelope>

-

-  </textarea>

-    </td>

-    <td>

-  <textarea id="response" style="width:600px;height:400px">

-  </textarea>

-    </td>

-  </tr>

-  <tr>

-    <td colspan=2>

-  <input type="button" value="Send" onClick="send();"/>

-    </td>

-  </tr>

-</table>

-</body>

-</html>

diff --git a/trunk/examples/wsdl-first/pom.xml b/trunk/examples/wsdl-first/pom.xml
deleted file mode 100644
index 9c0e973..0000000
--- a/trunk/examples/wsdl-first/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.examples</groupId>
-        <artifactId>examples</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>wsdl-first</artifactId>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>wsdl-first-jsr181-su</module>
-        <module>wsdl-first-http-su</module>
-        <module>wsdl-first-sa</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/wsdl-first/src/main/assembly/src.xml b/trunk/examples/wsdl-first/src/main/assembly/src.xml
deleted file mode 100644
index cf57c6d..0000000
--- a/trunk/examples/wsdl-first/src/main/assembly/src.xml
+++ /dev/null
@@ -1,40 +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>

-    <format>zip</format>

-  </formats>

-  <fileSets>

-    <fileSet>

-      <includes>

-        <include>README*</include>

-        <include>LICENSE*</include>

-        <include>NOTICE*</include>

-        <include>pom.xml</include>

-        <include>*.html</include>

-        <include>src/**/*</include>

-        <include>*/pom.xml</include>

-        <include>*/src/**/*</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-</assembly>

diff --git a/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml b/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml
deleted file mode 100644
index 472a2f6..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml
+++ /dev/null
@@ -1,52 +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.examples</groupId>
-        <artifactId>wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.wsdl-first</groupId>
-    <artifactId>wsdl-first-http-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: HTTP SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-http</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/wsdl-first/wsdl-first-http-su/src/main/resources/xbean.xml b/trunk/examples/wsdl-first/wsdl-first-http-su/src/main/resources/xbean.xml
deleted file mode 100644
index 2b2c62a..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-http-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,31 +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="http://servicemix.apache.org/http/1.0"

-       xmlns:person="http://servicemix.apache.org/samples/wsdl-first">

-

-  <http:endpoint service="person:PersonService"

-                 endpoint="soap"

-                 targetService="person:PersonService"

-                 role="consumer" 

-                 locationURI="http://0.0.0.0:8192/PersonService/"

-                 defaultMep="http://www.w3.org/2004/08/wsdl/in-out"

-                 soap="true" />

-

-</beans>

diff --git a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml b/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml
deleted file mode 100644
index 9be9918..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml
+++ /dev/null
@@ -1,79 +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.examples</groupId>
-        <artifactId>wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.wsdl-first</groupId>
-    <artifactId>wsdl-first-jsr181-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: JSR181 SU</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jsr181</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>xfire-maven-plugin</artifactId>
-                <version>4.2</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <wsdls>
-                                <wsdl>${basedir}/src/main/resources/person.wsdl</wsdl>
-                            </wsdls>
-                            <profile>org.codehaus.xfire.gen.jsr181.Jsr181Profile</profile>
-                            <outputDirectory>${basedir}/target/jaxws</outputDirectory>
-                        </configuration>
-                        <goals>
-                            <goal>wsgen</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java b/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
deleted file mode 100644
index 9926b6e..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
+++ /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.

- */

-package org.apache.servicemix.samples.wsdl_first;

-

-import javax.jws.WebService;

-import javax.xml.ws.Holder;

-

-import org.apache.servicemix.samples.wsdl_first.types.GetPerson;

-import org.apache.servicemix.samples.wsdl_first.types.GetPersonResponse;

-

-@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 String getPerson(String personId, Holder<String> ssn, Holder<String> name)

-        throws UnknownPersonFault

-    {

-        if (personId == null || personId.length() == 0) {

-            org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault fault = new org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault();

-            fault.setPersonId(personId);

-            throw new UnknownPersonFault(null, fault);

-        }

-        name.value = "Guillaume";

-        ssn.value = "000-000-0000";

-        return personId;

-    }

-

-}

diff --git a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/resources/person.wsdl b/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/resources/person.wsdl
deleted file mode 100644
index d08f33c..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/resources/person.wsdl
+++ /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.

-

--->

-<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->

-<wsdl:definitions name="wsdl-first"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"

-    xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"

-    targetNamespace="http://servicemix.apache.org/samples/wsdl-first">

-

-    <wsdl:types>

-        <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types"

-                    elementFormDefault="qualified">

-            <xsd:element name="GetPerson">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="GetPersonResponse">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                        <xsd:element name="ssn" type="xsd:string"/>

-                        <xsd:element name="name" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="UnknownPersonFault">

-              <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="personId" type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-  </wsdl:types>

-    

-    <wsdl:message name="GetPersonRequest">

-        <wsdl:part name="payload" element="typens:GetPerson"/>

-    </wsdl:message>

-    <wsdl:message name="GetPersonResponse">

-        <wsdl:part name="payload" element="typens:GetPersonResponse"/>

-    </wsdl:message>

-    <wsdl:message name="UnknownPersonFault">

-        <wsdl:part name="payload" element="typens:UnknownPersonFault"/>

-    </wsdl:message>

-

-    <wsdl:portType name="Person">

-        <wsdl:operation name="GetPerson">

-            <wsdl:input message="tns:GetPersonRequest"/>

-            <wsdl:output message="tns:GetPersonResponse"/>

-            <wsdl:fault name="UnknownPerson" message="tns:UnknownPersonFault"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    

-    <wsdl:binding name="PersonSOAPBinding" type="tns:Person">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="GetPerson">

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="UnknownPerson">

-                <soap:fault use="literal" name="UnknownPerson" />

-            </wsdl:fault>

-       </wsdl:operation>

-   </wsdl:binding>

-

-    <wsdl:service name="PersonService">

-        <wsdl:port binding="tns:PersonSOAPBinding" name="soap">

-           <soap:address location="http://localhost:8192/PersonService/" />

-       </wsdl:port>

-   </wsdl:service>

-

-</wsdl:definitions>

diff --git a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/resources/xbean.xml b/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/resources/xbean.xml
deleted file mode 100644
index 054acc0..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-jsr181-su/src/main/resources/xbean.xml
+++ /dev/null
@@ -1,24 +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:jsr181="http://servicemix.apache.org/jsr181/1.0">

-

-    <jsr181:endpoint pojoClass="org.apache.servicemix.samples.wsdl_first.PersonImpl" />

-

-</beans>

diff --git a/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml b/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml
deleted file mode 100644
index b7772b9..0000000
--- a/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml
+++ /dev/null
@@ -1,58 +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.examples</groupId>
-        <artifactId>wsdl-first</artifactId>
-        <version>4.3.0</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.examples.wsdl-first</groupId>
-    <artifactId>wsdl-first-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>Apache ServiceMix :: Features :: Examples :: WSDL First :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.wsdl-first</groupId>
-            <artifactId>wsdl-first-jsr181-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.examples.wsdl-first</groupId>
-            <artifactId>wsdl-first-http-su</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/trunk/pom.xml b/trunk/pom.xml
deleted file mode 100644
index 55ba92b..0000000
--- a/trunk/pom.xml
+++ /dev/null
@@ -1,1693 +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>servicemix-pom</artifactId>
-        <relativePath>../servicemix-pom/pom.xml</relativePath>
-        <version>5</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.features</groupId>
-    <artifactId>features</artifactId>
-    <packaging>pom</packaging>
-    <version>4.3.0</version>
-    <name>Apache ServiceMix :: Features</name>
-    <inceptionYear>2005</inceptionYear>
-
-    <modules>
-        <module>deps</module>
-        <module>branding</module>
-        <module>camel</module>
-        <module>cxf</module>
-        <module>examples</module>
-        <module>assembly</module>
-    </modules>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/smx4/features/tags/features-4.3.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/smx4/features/tags/features-4.3.0</developerConnection>
-        <url>http://svn.apache.org/viewvc/servicemix/smx4/features/tags/features-4.3.0</url>
-    </scm>
-    
-    <issueManagement>
-        <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/SMX4</url>
-    </issueManagement>
-
-    <prerequisites>
-        <maven>2.2.1</maven>
-    </prerequisites>
-
-    <repositories>
-        <!-- Java.net Maven Repository, required by javax.mail -->
-        <repository>
-            <id>java.net</id>
-            <name>Java.net Maven2 Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- JBoss Maven Repository, required by Drools -->
-        <repository>
-            <id>jboss</id>
-            <name>JBoss Maven2 Repository</name>
-            <url>http://repository.jboss.com/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- Scriptengines Google Maven Repository, required by scriptengines -->
-        <repository>
-            <id>scriptengines</id>
-            <name>Scriptengines Google Code Maven Repository</name>
-            <url>http://scriptengines.googlecode.com/svn/m2-repo</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- ServiceMix Maven 2 repository: jsmpp 2.0 is not in central repo -->
-        <repository>
-            <id>servicemix.m2-repo</id>
-            <name>ServiceMix Maven 2 repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <properties>
-        <sonar.skippedModules>examples</sonar.skippedModules>
-
-        <!-- OSGi (Karaf, Felix, Aries) -->
-        <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
-        <aries.jpa.version>0.2-incubating</aries.jpa.version>
-        <aries.util.version>0.2-incubating</aries.util.version>
-        <aries.transaction.version>0.2-incubating</aries.transaction.version>
-        <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
-        <felix.prefs.version>1.0.4</felix.prefs.version>
-        <karaf.version>2.1.3</karaf.version>
-        <osgi.compendium.version>4.2.0</osgi.compendium.version>
-        <osgi.core.version>4.2.0</osgi.core.version>
-
-        <!-- ActiveMQ -->
-        <activemq.version>5.4.2</activemq.version>
-
-        <!-- Camel -->
-        <camel.version>2.6.0</camel.version>
-
-        <!-- CXF -->
-        <cxf.xjc-utils.version>2.3.2</cxf.xjc-utils.version>
-        <cxf.version>2.3.2</cxf.version>
-
-        <!-- Geronimo -->
-        <geronimo-annotation.version>1.1.1</geronimo-annotation.version>
-        <geronimo-connector.version>2.1.3</geronimo-connector.version>
-        <geronimo-el.version>1.0.1</geronimo-el.version>
-        <geronimo-j2ee-connector.version>2.0.0</geronimo-j2ee-connector.version>
-        <geronimo-j2ee-management.version>1.0.1</geronimo-j2ee-management.version>
-        <geronimo-jaxws.version>1.0</geronimo-jaxws.version>
-        <geronimo-jms.version>1.1.1</geronimo-jms.version>
-        <geronimo-jpa.version>1.1</geronimo-jpa.version>
-        <geronimo-jsp.version>1.0.1</geronimo-jsp.version>
-        <geronimo-jta.version>1.1.1</geronimo-jta.version>
-        <geronimo-saaj.version>1.0.0</geronimo-saaj.version>
-        <geronimo-servlet.version>1.0</geronimo-servlet.version>
-        <geronimo-ws-metadata.version>1.1.2</geronimo-ws-metadata.version>
-        <geronimo-transaction.version>2.1.3</geronimo-transaction.version>
-
-        <!-- ServiceMix Bundles -->
-        <abdera.bundle.version>0.4.0-incubating_4</abdera.bundle.version>
-        <ant.bundle.version>1.7.0_4</ant.bundle.version>
-        <antlr2.bundle.version>2.7.7_3</antlr2.bundle.version>
-        <antlr.bundle.version>3.0.1_4</antlr.bundle.version>
-        <antlr-runtime.bundle.version>3.0.1_2</antlr-runtime.bundle.version>
-        <aopalliance.bundle.version>1.0_4</aopalliance.bundle.version>
-        <asm.bundle.version>2.2.3_4</asm.bundle.version>
-        <bcel.bundle.version>5.2_3</bcel.bundle.version>
-        <cglib.bundle.version>2.1_3_6</cglib.bundle.version>
-        <castor.bundle.version>1.3.1_1</castor.bundle.version>
-        <cometd-java-server.bundle.version>1.0.1_2</cometd-java-server.bundle.version>
-        <commons-beanutils.bundle.version>1.8.2_1</commons-beanutils.bundle.version>
-        <commons-codec.bundle.version>1.4</commons-codec.bundle.version>
-        <commons-collections.bundle.version>3.2.1_1</commons-collections.bundle.version>
-        <commons-csv.bundle.version>1.0-r706899_4</commons-csv.bundle.version>
-        <commons-httpclient.bundle.version>3.1_5</commons-httpclient.bundle.version>
-        <commons-io.bundle.version>1.4_1</commons-io.bundle.version>
-        <commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
-        <commons-net.bundle.version>2.2</commons-net.bundle.version>
-        <commons-pool.bundle.version>1.5.4_2</commons-pool.bundle.version>
-        <commons-vfs.bundle.version>1.0_5</commons-vfs.bundle.version>
-        <dom4j.bundle.version>1.6.1_3</dom4j.bundle.version>
-        <dozer.bundle.version>5.3.0_1</dozer.bundle.version>
-        <drools.bundle.version>5.1.1_1</drools.bundle.version>
-        <ehcache.bundle.version>2.3.0_1</ehcache.bundle.version>
-        <fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
-        <flatpack.bundle.version>3.1.1_4</flatpack.bundle.version>
-        <freemarker.bundle.version>2.3.15_4</freemarker.bundle.version>
-        <hapi.bundle.version>0.5.1_4</hapi.bundle.version>
-        <groovy.bundle.version>1.5.6_4</groovy.bundle.version>
-        <guiceyfruit.bundle.version>2.0_1</guiceyfruit.bundle.version>
-        <hibernate-validator.bundle.version>4.1.0.Final_1</hibernate-validator.bundle.version>
-        <ibatis-sqlmap.bundle.version>2.3.4.726_3</ibatis-sqlmap.bundle.version>
-        <irclib.bundle.version>1.10_3</irclib.bundle.version>
-        <isorelax.bundle.version>20050913_3</isorelax.bundle.version>
-        <jain-sip-ri.bundle.version>1.2.154_1</jain-sip-ri.bundle.version>
-        <jasypt.bundle.version>1.6_1</jasypt.bundle.version>
-        <jaxb.api.version>2.2</jaxb.api.version>
-        <jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version> 
-        <jaxen.bundle.version>1.1.1_1</jaxen.bundle.version>
-        <jcr-api.bundle.version>1.0_3</jcr-api.bundle.version>
-        <jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
-        <jdom.bundle.version>1.1_3</jdom.bundle.version>
-        <jetty.bundle.version>6.1.25_1</jetty.bundle.version>
-        <jetty-cometd.bundle.version>6.1.22_1</jetty-cometd.bundle.version>
-        <jexcelapi.bundle.version>2.4.2_3</jexcelapi.bundle.version>
-        <jing.bundle.version>20030619_3</jing.bundle.version>
-        <jruby.bundle.version>1.1.2_3</jruby.bundle.version>
-        <joda-time.bundle.version>1.5.2_3</joda-time.bundle.version>
-        <josql.bundle.version>1.5_4</josql.bundle.version>
-        <jsch.bundle.version>0.1.44_1</jsch.bundle.version>
-        <jsendnsca-core.bundle.version>1.3.1_2</jsendnsca-core.bundle.version>
-        <jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
-        <juel.bundle.version>2.1.0_3</juel.bundle.version>
-        <junit.bundle.version>4.7_2</junit.bundle.version>
-        <lucene.bundle.version>3.0.1_2</lucene.bundle.version>
-        <mina.bundle.version>1.1.7_4</mina.bundle.version>
-        <mvel.bundle.version>2.0.8_4</mvel.bundle.version>
-        <neethi.bundle.version>2.0.4_3</neethi.bundle.version>
-        <ognl.bundle.version>2.7.3_4</ognl.bundle.version>
-        <openjpa.bundle.version>1.2.1_3</openjpa.bundle.version>
-        <opensaml.bundle.version>1.1_5</opensaml.bundle.version>
-        <oscache.bundle.version>2.4_4</oscache.bundle.version>
-        <oscore.bundle.version>2.2.4_4</oscore.bundle.version>
-        <osworkflow.bundle.version>2.7.0_4</osworkflow.bundle.version>
-        <oro.bundle.version>2.0.8_4</oro.bundle.version>
-        <propertyset.bundle.version>1.3_4</propertyset.bundle.version>
-        <protobuf-java.bundle.version>2.3.0_1</protobuf-java.bundle.version>
-        <qpid.bundle.version>0.5.0_3</qpid.bundle.version>
-        <quartz.bundle.version>1.8.3_2</quartz.bundle.version>
-        <regexp.bundle.version>1.3_1</regexp.bundle.version>
-        <rhino.bundle.version>1.7R1_3</rhino.bundle.version>
-        <rome.bundle.version>1.0_1</rome.bundle.version>
-        <saaj-impl.bundle.version>1.3.2_2</saaj-impl.bundle.version>
-        <saxon.bundle.version>9.1.0.8_1</saxon.bundle.version>
-        <scala-library.bundle.version>2.8.0_1</scala-library.bundle.version>
-        <serp.bundle.version>1.13.1_3</serp.bundle.version>
-        <shiro.bundle.version>1.1.0_1</shiro.bundle.version>
-        <smack.bundle.version>3.1.0_2</smack.bundle.version>
-        <snmp4j.bundle.version>1.8.1_4</snmp4j.bundle.version>
-        <stringtemplate.bundle.version>3.2_4</stringtemplate.bundle.version>
-        <tagsoup.bundle.version>1.2_4</tagsoup.bundle.version>
-        <velocity.bundle.version>1.6.2_4</velocity.bundle.version>
-        <werken-xpath.bundle.version>0.9.4_4</werken-xpath.bundle.version>
-        <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>
-        <xalan.bundle.version>2.7.1_3</xalan.bundle.version>
-        <xerces.bundle.version>2.9.1_4</xerces.bundle.version>
-        <xmlbeans.bundle.version>2.5.0_1</xmlbeans.bundle.version>
-        <xmlresolver.bundle.version>1.2_3</xmlresolver.bundle.version>
-        <xmlsec.bundle.version>1.4.3_3</xmlsec.bundle.version>
-        <xpp3.bundle.version>1.1.4c_4</xpp3.bundle.version>
-        <xstream.bundle.version>1.3_4</xstream.bundle.version>
-
-        <!-- ServiceMix Components and Resources -->
-        <smx3.version>3.3.1</smx3.version>
-        <servicemix-utils.version>1.4.0</servicemix-utils.version>
-        <servicemix.legal.version>1.0</servicemix.legal.version>
-        <servicemix.nmr.version>1.4.0</servicemix.nmr.version>
-        <servicemix.specs.version>1.7.0</servicemix.specs.version>
-
-        <servicemix.components.version>2011.01</servicemix.components.version>
-        <servicemix-bean.version>${servicemix.components.version}</servicemix-bean.version>
-        <servicemix-camel.version>${servicemix.components.version}</servicemix-camel.version>
-        <servicemix-cxf-bc.version>${servicemix.components.version}</servicemix-cxf-bc.version>
-        <servicemix-cxf-se.version>${servicemix.components.version}</servicemix-cxf-se.version>
-        <servicemix-drools.version>${servicemix.components.version}</servicemix-drools.version>
-        <servicemix-eip.version>${servicemix.components.version}</servicemix-eip.version>
-        <servicemix-exec.version>${servicemix.components.version}</servicemix-exec.version>
-        <servicemix-file.version>${servicemix.components.version}</servicemix-file.version>
-        <servicemix-ftp.version>${servicemix.components.version}</servicemix-ftp.version>
-        <servicemix-http.version>${servicemix.components.version}</servicemix-http.version>
-        <servicemix-jms.version>${servicemix.components.version}</servicemix-jms.version>
-        <servicemix-jsr181.version>${servicemix.components.version}</servicemix-jsr181.version>
-        <servicemix-mail.version>${servicemix.components.version}</servicemix-mail.version>
-        <servicemix-osworkflow.version>${servicemix.components.version}</servicemix-osworkflow.version>
-        <servicemix-quartz.version>${servicemix.components.version}</servicemix-quartz.version>
-        <servicemix-saxon.version>${servicemix.components.version}</servicemix-saxon.version>
-        <servicemix-script.version>${servicemix.components.version}</servicemix-script.version>
-        <servicemix-scripting.version>${servicemix.components.version}</servicemix-scripting.version>
-        <servicemix-shared.version>${servicemix.components.version}</servicemix-shared.version>
-        <servicemix-smpp.version>${servicemix.components.version}</servicemix-smpp.version>
-        <servicemix-snmp.version>${servicemix.components.version}</servicemix-snmp.version>
-        <servicemix-truezip.version>${servicemix.components.version}</servicemix-truezip.version>
-        <servicemix-validation.version>${servicemix.components.version}</servicemix-validation.version>
-        <servicemix-vfs.version>${servicemix.components.version}</servicemix-vfs.version>
-        <servicemix-wsn2005.version>${servicemix.components.version}</servicemix-wsn2005.version>
-        <servicemix-xmpp.version>${servicemix.components.version}</servicemix-xmpp.version>
-
-        <!-- PAX -->
-        <pax.url.version>1.2.1</pax.url.version>
-        <pax.web.version>0.7.4</pax.web.version>
-
-        <!-- Spring -->
-        <spring.version>3.0.5.RELEASE</spring.version>
-        <spring.osgi.version>1.2.0</spring.osgi.version>
-
-        <!-- ODE -->
-        <ode.version>1.3.5</ode.version>
-
-        <!-- Maven Plugins -->
-        <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
-        <jbi-maven-plugin.version>4.4</jbi-maven-plugin.version>
-        <maven-antrun-plugin.version>1.2</maven-antrun-plugin.version>
-        <maven-assembly-plugin.version>2.2-beta-4</maven-assembly-plugin.version>
-        <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
-
-        <!-- Other Dependencies -->
-        <axiom.version>1.2.8</axiom.version>
-        <bouncycastle.version>140</bouncycastle.version>
-        <commons-dbcp.version>1.3</commons-dbcp.version>
-        <commons-exec.version>1.0.1</commons-exec.version>
-        <commons-jexl.version>2.0.1</commons-jexl.version>
-        <commons-jxpath.version>1.3</commons-jxpath.version>
-        <commons-logging.version>1.1.1</commons-logging.version>
-        <commons-management.version>1.0</commons-management.version>
-        <commons-net.version>${commons-net.bundle.version}</commons-net.version>
-        <derby.version>10.5.3.0_1</derby.version>
-        <drools.version>5.1.1</drools.version>
-        <easymock.version>2.4</easymock.version>
-        <groovy.version>1.7.5</groovy.version>
-        <hawtbuf.version>1.2</hawtbuf.version>
-        <hawtdb.version>1.5</hawtdb.version>
-        <httpcomponents.version>4.0.1</httpcomponents.version>
-        <jackrabbit.version>1.5.3</jackrabbit.version>
-        <jackson.version>1.6.0</jackson.version>
-        <jaxp-ri.version>1.4.4</jaxp-ri.version>
-        <jaxws-api.version>2.2</jaxws-api.version>
-        <jaxrs.api.version>1.1</jaxrs.api.version>
-        <javassist.version>3.9.0.GA</javassist.version>
-        <javax.mail.version>1.4.3</javax.mail.version>
-        <jetty.version>7.2.2.v20101205</jetty.version>
-        <jettison.version>1.2</jettison.version>
-        <junit.version>4.7</junit.version>
-        <log4j.version>1.2.16</log4j.version>
-        <lingo.version>1.3</lingo.version>
-        <netty.version>3.2.3.Final_1</netty.version>
-        <openjpa.version>2.0.0</openjpa.version>
-        <opensaml.version>1.1</opensaml.version>
-        <restlet.version>1.1.10</restlet.version>
-        <scriptengines.version>1.1</scriptengines.version>
-        <tranql.version>1.6</tranql.version>
-        <woodstox.version>4.0.8</woodstox.version>
-        <woodstox.stax2-api.version>3.0.2</woodstox.stax2-api.version>
-        <wss4j.version>1.5.9</wss4j.version>
-        <xbean.version>3.7</xbean.version>
-        <xfire.version>1.0.1</xfire.version>
-        <xmlschema.version>1.4.7</xmlschema.version>
-    </properties>
-
-    <dependencyManagement>
-       <dependencies>
-       
-           <!-- Karaf -->
-           <dependency>
-               <groupId>org.apache.karaf</groupId>
-               <artifactId>apache-karaf</artifactId>
-               <version>${karaf.version}</version>
-               <type>tar.gz</type>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.karaf</groupId>
-               <artifactId>apache-karaf</artifactId>
-               <version>${karaf.version}</version>
-               <type>zip</type>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.karaf</groupId>
-               <artifactId>apache-karaf</artifactId>
-               <version>${karaf.version}</version>
-               <type>xml</type>
-               <classifier>features</classifier>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.karaf.deployer</groupId>
-               <artifactId>org.apache.karaf.deployer.war</artifactId>
-               <version>${karaf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.karaf</groupId>
-               <artifactId>org.apache.karaf.management</artifactId>
-               <version>${karaf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.karaf</groupId>
-               <artifactId>org.apache.karaf.main</artifactId>
-               <version>${karaf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.karaf.jaas</groupId>
-               <artifactId>org.apache.karaf.jaas.boot</artifactId>
-               <version>${karaf.version}</version>
-           </dependency>
-           
-           <!-- OSGi and Felix -->
-           <dependency>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>org.apache.felix.fileinstall</artifactId>
-               <version>${felix.fileinstall.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>org.apache.felix.prefs</artifactId>
-               <version>${felix.prefs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.osgi</groupId>
-               <artifactId>org.osgi.compendium</artifactId>
-               <version>${osgi.compendium.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.osgi</groupId>
-               <artifactId>org.osgi.core</artifactId>
-               <version>${osgi.core.version}</version>
-           </dependency>
-       
-           <!-- ServiceMix NMR -->
-           <dependency>
-               <groupId>org.apache.servicemix.document</groupId>
-               <artifactId>org.apache.servicemix.document</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.jbi</groupId>
-               <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>apache-servicemix-nmr</artifactId>
-               <type>tar.gz</type>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>apache-servicemix-nmr</artifactId>
-               <type>zip</type>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>apache-servicemix-nmr</artifactId>
-               <version>${servicemix.nmr.version}</version>
-               <type>xml</type>
-                  <classifier>features</classifier>
-           </dependency>
-
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>org.apache.servicemix.nmr.api</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>org.apache.servicemix.nmr.core</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>org.apache.servicemix.nmr.management</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.nmr</groupId>
-               <artifactId>org.apache.servicemix.nmr.spring</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.platform.testing</groupId>
-               <artifactId>org.apache.servicemix.platform.testing.support</artifactId>
-               <version>${servicemix.nmr.version}</version>
-           </dependency>
-           
-           <!-- ServiceMix Specs -->
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.scripting-api-1.0</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.specs</groupId>
-               <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-               <version>${servicemix.specs.version}</version>
-           </dependency>
-           
-           <!-- ServiceMix Components -->
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-bean</artifactId>
-               <version>${servicemix-bean.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-camel</artifactId>
-               <version>${servicemix-camel.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-common</artifactId>
-               <version>${servicemix-shared.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-cxf-bc</artifactId>
-               <version>${servicemix-cxf-bc.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-cxf-se</artifactId>
-               <version>${servicemix-cxf-se.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-drools</artifactId>
-               <version>${servicemix-drools.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-eip</artifactId>
-               <version>${servicemix-eip.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-exec</artifactId>
-               <version>${servicemix-exec.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-file</artifactId>
-               <version>${servicemix-file.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-ftp</artifactId>
-               <version>${servicemix-ftp.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-http</artifactId>
-               <version>${servicemix-http.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-jms</artifactId>
-               <version>${servicemix-jms.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-jsr181</artifactId>
-               <version>${servicemix-jsr181.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-mail</artifactId>
-               <version>${servicemix-mail.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-osworkflow</artifactId>
-               <version>${servicemix-osworkflow.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-quartz</artifactId>
-               <version>${servicemix-quartz.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-saxon</artifactId>
-               <version>${servicemix-saxon.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-scripting</artifactId>
-               <version>${servicemix-scripting.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-smpp</artifactId>
-               <version>${servicemix-smpp.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-snmp</artifactId>
-               <version>${servicemix-snmp.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-soap</artifactId>
-               <version>${servicemix-shared.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-soap2</artifactId>
-               <version>${servicemix-shared.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-validation</artifactId>
-               <version>${servicemix-validation.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-vfs</artifactId>
-               <version>${servicemix-vfs.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-wsn2005</artifactId>
-               <version>${servicemix-wsn2005.version}</version>
-           </dependency>
-           
-           <!-- ServiceMix Core, Utils -->
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-core</artifactId>
-               <version>${smx3.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix</groupId>
-               <artifactId>servicemix-utils</artifactId>
-               <version>${servicemix-utils.version}</version>
-           </dependency>
-           
-           <!-- ActiveMQ -->
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-blueprint</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-console</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-core</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-karaf</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-karaf</artifactId>
-               <version>${activemq.version}</version>
-               <type>xml</type>
-               <classifier>features</classifier>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-pool</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-ra</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>kahadb</artifactId>
-               <version>${activemq.version}</version>
-           </dependency>
-           
-           <!-- Aries -->
-           <dependency>
-               <groupId>org.apache.aries</groupId>
-               <artifactId>org.apache.aries.util</artifactId>
-               <version>${aries.util.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.aries.transaction</groupId>
-               <artifactId>org.apache.aries.transaction.manager</artifactId>
-               <version>${aries.transaction.version}</version>
-           </dependency>
-           
-           <!-- Camel -->
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-core</artifactId>
-               <version>${camel.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-core</artifactId>
-               <version>${camel.version}</version>
-               <type>test-jar</type>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-cxf</artifactId>
-               <version>${camel.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-http</artifactId>
-               <version>${camel.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-jetty</artifactId>
-               <version>${camel.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-spring</artifactId>
-               <version>${camel.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-test</artifactId>
-               <version>${camel.version}</version>
-           </dependency>
-           
-           <!-- CXF -->
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-bundle</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-common-utilities</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-frontend-jaxws</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-transports-http</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-testutils</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-bindings-jbi</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-transports-http-jetty</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-transports-jbi</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-ws-addr</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-ws-policy</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.cxf</groupId>
-               <artifactId>cxf-rt-ws-rm</artifactId>
-               <version>${cxf.version}</version>
-           </dependency>
-           
-           <!-- Geronimo -->
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-annotation_1.0_spec</artifactId>
-               <version>${geronimo-annotation.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-               <version>${geronimo-j2ee-connector.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-               <version>${geronimo-j2ee-management.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-               <version>${geronimo-jaxws.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-jms_1.1_spec</artifactId>
-               <version>${geronimo-jms.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-jpa_2.0_spec</artifactId>
-               <version>${geronimo-jpa.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-jta_1.1_spec</artifactId>
-               <version>${geronimo-jta.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-saaj_1.3_spec</artifactId>
-               <version>${geronimo-saaj.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-servlet_3.0_spec</artifactId>
-               <version>${geronimo-servlet.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.geronimo.specs</groupId>
-               <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-               <version>${geronimo-ws-metadata.version}</version>
-           </dependency>
-
-           <!-- ODE -->
-           <dependency>
-               <groupId>org.apache.ode</groupId>
-               <artifactId>ode-jbi-karaf</artifactId>
-               <version>${ode.version}</version>
-               <type>xml</type>
-               <classifier>features</classifier>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.ode</groupId>
-               <artifactId>ode-jbi-karaf</artifactId>
-               <version>${ode.version}</version>
-           </dependency>
-           
-           <!-- PAX URL -->
-           <dependency>
-               <groupId>org.ops4j.pax.url</groupId>
-               <artifactId>pax-url-war</artifactId>
-               <version>${pax.url.version}</version>
-           </dependency>
-           
-           <!-- PAX Web -->
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-api</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-extender-war</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-extender-whiteboard</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-jetty</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-jsp</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-runtime</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.ops4j.pax.web</groupId>
-               <artifactId>pax-web-spi</artifactId>
-               <version>${pax.web.version}</version>
-           </dependency>
-           
-           <!-- Spring -->
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-asm</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-aop</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-beans</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-context</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-context-support</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-core</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-expression</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-jms</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-test</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-tx</artifactId>
-               <version>${spring.version}</version>
-           </dependency>
-           
-           <!-- Spring OSGi -->
-           <dependency>
-               <groupId>org.springframework.osgi</groupId>
-               <artifactId>spring-osgi-core</artifactId>
-               <version>${spring.osgi.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework.osgi</groupId>
-               <artifactId>spring-osgi-extender</artifactId>
-               <version>${spring.osgi.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.springframework.osgi</groupId>
-               <artifactId>spring-osgi-io</artifactId>
-               <version>${spring.osgi.version}</version>
-           </dependency>
-          
-           <!-- ServiceMix Bundles -->
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.abdera</artifactId>
-               <version>${abdera.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.ant</artifactId>
-               <version>${ant.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
-               <version>${antlr.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.antlr-runtime</artifactId>
-               <version>${antlr-runtime.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
-               <version>${aopalliance.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.asm</artifactId>
-               <version>${asm.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
-               <version>${bcel.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-               <version>${cglib.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
-               <version>${commons-beanutils.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>commons-codec</groupId>
-               <artifactId>commons-codec</artifactId>
-               <version>${commons-codec.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
-               <version>${commons-collections.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
-               <version>${commons-lang.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-               <version>${commons-httpclient.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>commons-net</groupId>
-               <artifactId>commons-net</artifactId>
-               <version>${commons-net.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-               <version>${commons-pool.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
-               <version>${commons-vfs.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.drools</artifactId>
-               <version>${drools.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.fastinfoset</artifactId>
-               <version>${fastinfoset.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.groovy</artifactId>
-               <version>${groovy.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
-               <version>${jasypt.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-               <version>${jaxb-impl.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
-               <version>${jdom.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
-               <version>${jdt-core.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
-               <version>${jetty.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.josql</artifactId>
-               <version>${josql.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jruby</artifactId>
-               <version>${jruby.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
-               <version>${jsmpp.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.mvel</artifactId>
-               <version>${mvel.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
-               <version>${neethi.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
-               <version>${opensaml.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.oro</artifactId>
-               <version>${oro.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.oscore</artifactId>
-               <version>${oscore.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.osworkflow</artifactId>
-               <version>${osworkflow.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.propertyset</artifactId>
-               <version>${propertyset.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
-               <version>${quartz.bundle.version}</version>
-           </dependency>
-           <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-                <version>${rhino.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
-               <version>${saaj-impl.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
-               <version>${saxon.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
-               <version>${snmp4j.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.velocity</artifactId>
-               <version>${velocity.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-               <version>${wsdl4j.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
-               <version>${xalan.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
-               <version>${xerces.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-               <version>${xmlbeans.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-               <version>${xmlresolver.bundle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
-               <version>${xmlsec.bundle.version}</version>
-           </dependency>
-           
-           <!-- Other Dependencies -->
-           <dependency>
-               <groupId>bouncycastle</groupId>
-               <artifactId>bcprov-jdk14</artifactId>
-               <version>${bouncycastle.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>com.google.code.scriptengines</groupId>
-               <artifactId>scriptengines-javascript</artifactId>
-               <version>${scriptengines.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>com.google.code.scriptengines</groupId>
-               <artifactId>scriptengines-jruby</artifactId>
-               <version>${scriptengines.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>com.google.code.scriptengines</groupId>
-               <artifactId>scriptengines-groovy</artifactId>
-               <version>${scriptengines.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>com.sun.xml.parsers</groupId>
-               <artifactId>jaxp-ri</artifactId>
-               <version>${jaxp-ri.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>commons-logging</groupId>
-               <artifactId>commons-logging</artifactId>
-               <version>${commons-logging.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>javax.mail</groupId>
-               <artifactId>mail</artifactId>
-               <version>${javax.mail.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>javax.xml.ws</groupId>
-               <artifactId>jaxws-api</artifactId>
-               <version>${jaxws-api.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>${junit.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>log4j</groupId>
-               <artifactId>log4j</artifactId>
-               <version>${log4j.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.commons</groupId>
-               <artifactId>commons-jexl</artifactId>
-               <version>${commons-jexl.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.ws.commons.schema</groupId>
-               <artifactId>XmlSchema</artifactId>
-               <version>${xmlschema.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.ws.commons.axiom</groupId>
-               <artifactId>axiom-api</artifactId>
-               <version>${axiom.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.ws.commons.axiom</groupId>
-               <artifactId>axiom-impl</artifactId>
-               <version>${axiom.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.ws.security</groupId>
-               <artifactId>wss4j</artifactId>
-               <version>${wss4j.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.xbean</groupId>
-               <artifactId>xbean-blueprint</artifactId>
-               <version>${xbean.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.xbean</groupId>
-               <artifactId>xbean-classloader</artifactId>
-               <version>${xbean.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.apache.xbean</groupId>
-               <artifactId>xbean-spring</artifactId>
-               <version>${xbean.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.codehaus.jettison</groupId>
-               <artifactId>jettison</artifactId>
-               <version>${jettison.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.codehaus.woodstox</groupId>
-               <artifactId>woodstox-core-asl</artifactId>
-               <version>${woodstox.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.codehaus.woodstox</groupId>
-               <artifactId>stax2-api</artifactId>
-               <version>${woodstox.stax2-api.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.drools</groupId>
-               <artifactId>drools-compiler</artifactId>
-               <version>${drools.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.easymock</groupId>
-               <artifactId>easymockclassextension</artifactId>
-               <version>${easymock.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.fusesource.commonman</groupId>
-               <artifactId>commons-management</artifactId>
-               <version>${commons-management.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>org.logicblaze.lingo</groupId>
-               <artifactId>lingo</artifactId>
-               <version>${lingo.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>xfire</groupId>
-               <artifactId>opensaml</artifactId>
-               <version>${xfire.version}</version>
-           </dependency>
-       </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-codegen-plugin</artifactId>
-                    <version>${cxf.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <preparationGoals>clean install</preparationGoals>
-                        <goals>deploy</goals>
-                        <arguments>-Prelease,deploy</arguments>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.servicemix.tooling</groupId>
-                    <artifactId>depends-maven-plugin</artifactId>
-                    <version>${depends-maven-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.servicemix.tooling</groupId>
-                    <artifactId>jbi-maven-plugin</artifactId>
-                    <version>${jbi-maven-plugin.version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven-bundle-plugin.version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                        <maxmem>256M</maxmem>
-                        <fork>${compiler.fork}</fork>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-idea-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <downloadSources>true</downloadSources>
-                        <downloadJavadocs>true</downloadJavadocs>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${maven-assembly-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>${maven-antrun-plugin.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>ant-contrib</groupId>
-                            <artifactId>ant-contrib</artifactId>
-                            <version>1.0b3</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-optional</artifactId>
-                            <version>1.5.3-1</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>cobertura-maven-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.1.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.5</version>
-                </plugin>
-
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-legal</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.legal</groupId>
-                                    <artifactId>legal</artifactId>
-                                    <version>${servicemix.legal.version}</version>
-                                    <type>xml</type>
-                                    <outputDirectory>target/legal/</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <stripVersion>true</stripVersion>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <resourceBundles>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                            </resourceBundles>
-                            <supplementalModels>
-                                <supplementalModel>target/legal/legal.xml</supplementalModel>
-                            </supplementalModels>
-                            <properties>
-                                <addLicense>true</addLicense>
-                                <addArtifact>true</addArtifact>
-                                <projectName>Apache ServiceMix</projectName>
-                            </properties>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.0</version>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <profile>
-            <id>fastinstall</id>
-            <properties>
-                <maven.test.skip>true</maven.test.skip>
-            </properties>
-        </profile>
-        <profile>
-            <id>rat</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.rat</groupId>
-                        <artifactId>apache-rat-plugin</artifactId>
-                        <version>0.6</version>
-                        <executions>
-                            <execution>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
-                            <excludeSubProjects>false</excludeSubProjects>
-                            <excludes>
-                                <exclude>**/target/**/*</exclude>
-                                <!-- IDEA files -->
-                                <exclude>**/*.iml</exclude>
-                                <exclude>**/*.ipr</exclude>
-                                <exclude>**/*.iws</exclude>
-                                <!-- Eclipse files -->
-                                <exclude>**/.*</exclude>
-                                <exclude>**/eclipse-classes/**/*</exclude>
-                                <exclude>**/dependency-reduced-pom.xml</exclude>
-                                <exclude>assembly/src/main/distribution/text/licenses/**</exclude>
-                                <exclude>cxf/cxf-transport-nmr/src/main/build-resources/wsdl.*</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <!-- We want to deploy the artifact to a staging location for perusal -->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.3</version>
-                        <configuration>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-                    <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-                    <plugin>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-4</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>setup.eclipse</id>
-            <modules>
-                <module>assembly</module>
-            </modules>
-            <properties>
-                <eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
-            </properties>
-            <build>
-                <defaultGoal>eclipse:eclipse</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-eclipse-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>setup.eclipse.workspace</id>
-                                <phase>process-test-sources</phase>
-                                <goals>
-                                    <goal>add-maven-repo</goal>
-                                </goals>
-                                <configuration>
-                                    <workspace>${eclipse.workspace.dir}</workspace>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>deploy</id>
-            <build>
-                <defaultGoal>deploy</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.0.4</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>ibmjdk</id>
-            <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>IBM Corporation</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- Need to add a xerces dependency to cxf-codegen-plugin when using 
-                        the ibm jdk to work around error: org.apache.xerces.impl.dv.DVFactoryException: 
-                        DTD factory class org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not 
-                        extend from DTDDVFactory. Can remove this when we upgrade to a cxf.version 
-                        which includes this in the cxf-codegen-plugin pom. -->
-                    <plugin>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-codegen-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>xerces</groupId>
-                                <artifactId>xercesImpl</artifactId>
-                                <version>2.8.1</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>