You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2017/02/08 20:27:59 UTC
[20/25] servicemix-features git commit: Old modules removed
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt b/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt
deleted file mode 100644
index c9990a7..0000000
--- a/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/licenses/epl-1.0.txt
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/licenses/epl-1.0.txt b/assemblies/shared/src/main/resources/licenses/epl-1.0.txt
deleted file mode 100644
index fddc311..0000000
--- a/assemblies/shared/src/main/resources/licenses/epl-1.0.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Los
ses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b)
above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt b/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt
deleted file mode 100644
index 0bf5791..0000000
--- a/assemblies/shared/src/main/resources/licenses/slf4j-mit.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- Copyright (c) 2004-2011 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/branding/pom.xml
----------------------------------------------------------------------
diff --git a/branding/pom.xml b/branding/pom.xml
deleted file mode 100644
index 972f5c3..0000000
--- a/branding/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>org.apache.servicemix.features.branding</artifactId>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Features :: Branding Support</name>
- <description>Branding for Apache ServiceMix features</description>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Description>${project.description}</Bundle-Description>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- <Export-Package>
- org.apache.karaf.branding
- </Export-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/branding/src/main/resources/org/apache/karaf/branding/branding.properties
----------------------------------------------------------------------
diff --git a/branding/src/main/resources/org/apache/karaf/branding/branding.properties b/branding/src/main/resources/org/apache/karaf/branding/branding.properties
deleted file mode 100644
index 8e3332c..0000000
--- a/branding/src/main/resources/org/apache/karaf/branding/branding.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-welcome = \
-\u001B[36m ____ _ __ __ _ \u001B[0m\n\
-\u001B[36m/ ___| ___ _ ____ _(_) ___ ___| \\/ (_)_ __\u001B[0m\n\
-\u001B[36m\\___ \\ / _ \\ '__\\ \\ / / |/ __/ _ \\ |\\/| | \\ \\/ /\u001B[0m\n\
-\u001B[36m ___) | __/ | \\ V /| | (_| __/ | | | |> < \u001B[0m\n\
-\u001B[36m|____/ \\___|_| \\_/ |_|\\___\\___|_| |_|_/_/\\_\\\u001B[0m\n\
-\n\
-\u001B[1m Apache ServiceMix\u001B[0m (${pom.version})\n\
-\n\
-Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\n\
- and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\n\
-Hit '<ctrl-d>' or 'osgi:shutdown' to shutdown ServiceMix.\n
-
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/pom.xml
----------------------------------------------------------------------
diff --git a/camel/pom.xml b/camel/pom.xml
deleted file mode 100644
index d526870..0000000
--- a/camel/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.camel</groupId>
- <artifactId>camel</artifactId>
- <packaging>pom</packaging>
- <name>Apache ServiceMix :: Features :: Camel Support</name>
-
- <modules>
- <module>servicemix-camel</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/pom.xml
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/pom.xml b/camel/servicemix-camel/pom.xml
deleted file mode 100644
index 041314d..0000000
--- a/camel/servicemix-camel/pom.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.camel</groupId>
- <artifactId>camel</artifactId>
- <version>4.6.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.servicemix.camel.component</artifactId>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Features :: Camel Support :: Component</name>
- <description>Apache Camel component tight integrated in the NMR</description>
-
- <dependencies>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-local</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-testutils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-testutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>opensaml</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Import-Package>*</Import-Package>
- <Export-Package>org.apache.servicemix.camel.nmr*</Export-Package>
- <Bundle-Description>${project.description}</Bundle-Description>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <systemProperties>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.datatype.DatatypeFactory</name>
- <value>com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.stream.XMLInputFactory</name>
- <value>com.ctc.wstx.stax.WstxInputFactory</value>
- </property>
- <property>
- <name>javax.xml.stream.XMLOutputFactory</name>
- <value>com.ctc.wstx.stax.WstxOutputFactory</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TimeoutTest*.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.version}</version>
- <executions>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <testSourceRoot>${basedir}/target/generated/test/java</testSourceRoot>
- <wsdlOptions>
- <wsdlOption>
- <wsdl>${basedir}/src/test/resources/person.wsdl</wsdl>
- <extraargs>
- <extraarg>-verbose</extraarg>
- </extraargs>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- exclude generated class from cxf-codegen-plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>org/apache/servicemix/samples/wsdl_first/*.class</exclude>
- </excludes>
- </instrumentation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>jar-test-classes</id>
- <phase>package</phase>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
deleted file mode 100644
index 09d68d9..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import javax.activation.DataHandler;
-import javax.security.auth.Subject;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
-import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.impl.DefaultMessage;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The binding object will help us to deal with copying between the NMR exchange and camel exchange
- */
-public class ServiceMixBinding {
-
- private final transient Logger LOG = LoggerFactory.getLogger(ServiceMixBinding.class);
-
- public static final String NMR_MESSAGE = "nmrMessage";
- public static final String NMR_EXCHANGE = "nmrExchange";
- public static final String NMR_OPERATION = "nmrOperation";
-
- public void copyCamelMessageToNmrMessage(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
- if (nmrMessage != null && camelMessage != null) {
- nmrMessage.setBody(camelMessage.getBody());
- nmrMessage.getHeaders().clear();
- addNmrHeaders(nmrMessage, camelMessage);
- nmrMessage.getAttachments().clear();
- nmrMessage.getAttachments().putAll(camelMessage.getAttachments());
- //addSecuritySubject(nmrMessage, camelMessage);
-
- // propagate the security subject
- if (camelMessage.getHeader(Exchange.AUTHENTICATION, Subject.class) != null) {
- nmrMessage.setSecuritySubject(camelMessage.getHeader(Exchange.AUTHENTICATION, Subject.class));
- }
- }
- }
-
- public void copyNmrMessageToCamelMessage(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
- camelMessage.setBody(nmrMessage.getBody());
- camelMessage.setHeader(NMR_MESSAGE, nmrMessage);
- camelMessage.getHeaders().putAll(nmrMessage.getHeaders());
- addCamelAttachments(nmrMessage, camelMessage);
-
- // copy the security subject
- if (nmrMessage.getSecuritySubject() != null) {
- camelMessage.setHeader(Exchange.AUTHENTICATION, nmrMessage.getSecuritySubject());
- }
- }
-
- public org.apache.servicemix.nmr.api.Exchange populateNmrExchangeFromCamelExchange(Exchange camelExchange, Channel client) {
- org.apache.servicemix.nmr.api.Exchange e = client.createExchange(
- Pattern.fromWsdlUri(camelExchange.getPattern().getWsdlUri()));
- e.getProperties().putAll(camelExchange.getProperties());
- org.apache.servicemix.nmr.api.Message inMessage = e.getIn();
- copyCamelMessageToNmrMessage(inMessage, camelExchange.getIn());
- return e;
-
- }
-
-
- public Exchange populateCamelExchangeFromNmrExchange(CamelContext context, org.apache.servicemix.nmr.api.Exchange nmrExchange) {
- Exchange answer = new DefaultExchange(context);
- answer.setPattern(ExchangePattern.fromWsdlUri(nmrExchange.getPattern().getWsdlUri()));
-
- // copy the nmrExchange's properties
- answer.getProperties().putAll(nmrExchange.getProperties());
-
- org.apache.servicemix.nmr.api.Message inMessage = nmrExchange.getIn();
- if (inMessage != null) {
- Message message = new DefaultMessage();
- copyNmrMessageToCamelMessage(inMessage, message);
- answer.setIn(message);
- }
-
- answer.setProperty(NMR_EXCHANGE, nmrExchange);
- if (nmrExchange != null && nmrExchange.getOperation() != null) {
- answer.setProperty(NMR_OPERATION, nmrExchange.getOperation().toString());
- }
-
- return answer;
- }
-
-
-
- protected void addNmrHeaders(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
- // get headers from the Camel in message
- Set<Map.Entry<String, Object>> entries = camelMessage.getHeaders().entrySet();
- for (Map.Entry<String, Object> entry : entries) {
- // skip the camel header's normalized Message
- if (entry.getKey().equals(NMR_MESSAGE)) {
- continue;
- }
- //check if value is Serializable, and if value is Map or collection,
- //just exclude it since the entry of it may not be Serializable as well
- if (entry.getValue() instanceof Serializable
- && !(entry.getValue() instanceof Map)
- && !(entry.getValue() instanceof Collection)) {
- nmrMessage.setHeader(entry.getKey(), entry.getValue());
- }
- }
-
- }
-
- protected void addCamelAttachments(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
- Set<String> names = nmrMessage.getAttachments().keySet();
- for (String name : names) {
- if (nmrMessage.getAttachment(name) instanceof DataHandler) {
- DataHandler dataHandler = (DataHandler) nmrMessage.getAttachment(name);
- camelMessage.addAttachment(name, dataHandler);
- } else {
- LOG.warn("NMR attachement of " + name + " is not a instance of DataHandler, cannot copy it into Camel message.");
- }
- }
-
- }
-
- /**
- * Extract the underlying NMR {@link org.apache.servicemix.nmr.api.Message} for a Camel message
- *
- * @param message the Camel Message
- * @return the corresponding NMR message
- */
- public org.apache.servicemix.nmr.api.Message getNmrMessage(Message message) {
- if (message.getHeader(NMR_MESSAGE) != null) {
- return message.getHeader(NMR_MESSAGE, org.apache.servicemix.nmr.api.Message.class);
- }
- return null;
- }
-
- /**
- * Extract the NMR Exchange from the Camel Exchange
- *
- * @param camel the Camel Exchange
- * @return the NMR Exchange
- */
- public org.apache.servicemix.nmr.api.Exchange extractNmrExchange(Exchange camel) {
- return (org.apache.servicemix.nmr.api.Exchange) camel.getProperties().remove(NMR_EXCHANGE);
- }
-}
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
deleted file mode 100644
index 95cb52a..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-import org.apache.servicemix.nmr.api.NMR;
-
-/**
- * A camel component to bridge ServiceMix NMR with Camel.
- */
-public class ServiceMixComponent extends DefaultComponent {
-
- private static NMR nmr;
- private ServiceMixBinding binding;
-
- public ServiceMixComponent() {
- }
-
- public ServiceMixBinding getBinding() {
- if (binding == null) {
- binding = new ServiceMixBinding();
- }
- return binding;
- }
-
- public void setBinding(ServiceMixBinding binding) {
- this.binding = binding;
- }
-
- public NMR getNmr() {
- if (nmr == null) {
- nmr = getCamelContext().getRegistry().lookup(NMR.class.getName(), NMR.class);
- }
- return nmr;
- }
-
- public void setNmr(NMR nmr) {
- this.nmr = nmr;
- }
-
- protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
- return new ServiceMixEndpoint(this, uri, remaining);
- }
-
- public void registerEndpoint(org.apache.servicemix.nmr.api.Endpoint endpoint, Map<String, ?> properties) {
- getNmr().getEndpointRegistry().register(endpoint, properties);
- }
-
- public void unregisterEndpoint(org.apache.servicemix.nmr.api.Endpoint endpoint, Map<String, ?> properties) {
- getNmr().getEndpointRegistry().unregister(endpoint, properties);
- }
-}
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
deleted file mode 100644
index 5622ca1..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.Map;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.impl.DefaultConsumer;
-import org.apache.camel.spi.Synchronization;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.Status;
-import org.apache.servicemix.nmr.api.service.ServiceHelper;
-
-/**
- * A {@link Consumer} that receives NMR {@link org.apache.servicemix.nmr.api.Exchange}s and invokes the Camel route
- */
-public class ServiceMixConsumer extends DefaultConsumer implements org.apache.servicemix.nmr.api.Endpoint, Synchronization {
-
- private Channel channel;
-
- public ServiceMixConsumer(ServiceMixEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
- }
-
- public ServiceMixEndpoint getEndpoint() {
- return (ServiceMixEndpoint) super.getEndpoint();
- }
-
- protected void doStart() throws Exception {
- super.doStart();
- getEndpoint().getComponent().registerEndpoint(this, createEndpointMap());
- }
-
- protected void doStop() throws Exception {
- getEndpoint().getComponent().unregisterEndpoint(this, createEndpointMap());
- super.doStop();
- }
-
- private Map<String,?> createEndpointMap() {
- Map<String, Object> result = ServiceHelper.createMap(Endpoint.NAME,
- getEndpoint().getEndpointName());
- result.put(Endpoint.CHANNEL_SYNC_DELIVERY, getEndpoint().isSynchronous());
- result.put(Endpoint.RUN_AS_SUBJECT, getEndpoint().isRunAsSubject());
- String interfaceName = getEndpoint().getInterfaceName();
- if (interfaceName != null && interfaceName.length() > 0) {
- result.put(Endpoint.INTERFACE_NAME, interfaceName);
- }
- String serviceName = getEndpoint().getServiceName();
- if (serviceName != null && serviceName.length() > 0) {
- result.put(Endpoint.SERVICE_NAME, serviceName);
- }
- return result;
- }
-
- public void setChannel(Channel channel) {
- this.channel = channel;
- }
-
- /**
- * Process an NMR {@link org.apache.servicemix.nmr.api.Exchange} by creating and sending a Camel {@link org.apache.servicemix.nmr.api.Exchange}
- * through the defined route
- */
- public void process(Exchange exchange) {
- if (exchange.getStatus() == Status.Active) {
- try {
- org.apache.camel.Exchange camelExchange = getEndpoint().createExchange(exchange);
- camelExchange.addOnCompletion(this);
- if (getEndpoint().isSynchronous()) {
- getProcessor().process(camelExchange);
- // no need to send the response back here, this is handled by the onComplete/onFailure method
- } else {
- getAsyncProcessor().process(camelExchange, new AsyncCallback() {
- public void done(boolean doneSync) {
- // this is handled by the onComplete/onFailure method
- }
- });
- }
- } catch (Exception e) {
- exchange.setError(e);
- exchange.setStatus(Status.Error);
- channel.send(exchange);
- }
- }
- }
-
- /**
- * Handle the Camel {@link org.apache.camel.Exchange) response by updating the matching NMR {@link org.apache.servicemix.nmr.api.Exchange}
- * and finishing the NMR MEP
- */
- private void handleCamelResponse(Exchange exchange, org.apache.camel.Exchange camelExchange) {
- // just copy the camelExchange back to the nmr exchange
- exchange.getProperties().putAll(camelExchange.getProperties());
- if (camelExchange.getException() != null) {
- exchange.setError(camelExchange.getException());
- exchange.setStatus(Status.Error);
- } else if (camelExchange.hasOut() && !camelExchange.getOut().isFault()) {
- getEndpoint().getComponent().getBinding().
- copyCamelMessageToNmrMessage(exchange.getOut(), camelExchange.getOut());
- } else if (camelExchange.hasOut() && camelExchange.getOut().isFault()) {
- getEndpoint().getComponent().getBinding().
- copyCamelMessageToNmrMessage(exchange.getFault(), camelExchange.getOut());
- } else {
- exchange.setStatus(Status.Done);
- }
- channel.send(exchange);
- }
-
- /*
- * Handle a successfully completed Camel Exchange
- */
- public void onComplete(org.apache.camel.Exchange exchange) {
- Exchange nmr = getEndpoint().getComponent().getBinding().extractNmrExchange(exchange);
- handleCamelResponse(nmr, exchange);
- }
-
- /*
- * Handle a Caml exchange failure
- */
- public void onFailure(org.apache.camel.Exchange exchange) {
- Exchange nmr = getEndpoint().getComponent().getBinding().extractNmrExchange(exchange);
- handleCamelResponse(nmr, exchange);
- }
-}
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
deleted file mode 100644
index 57a667f..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import java.util.Map;
-
-import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Producer;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.impl.SynchronousDelegateProducer;
-
-/**
- * A Camel {@link Endpoint} to interact with the ServiceMix NMR from within a Camel route
- *
- * @org.apache.xbean.XBean element="smxEndpoint"
- */
-public class ServiceMixEndpoint extends DefaultEndpoint {
-
- private static final String SYNCHRONOUS = "synchronous";
- public static final String RUN_AS_SUBJECT = "runAsSubject";
- private static final String TIMEOUT = "timeout";
- private static final String THROW_EXCEPTION_ON_FAILURE = "throwExceptionOnFailure";
- private static final String INTERFACE_NAME = "interfaceName";
- private static final String SERVICE_NAME = "serviceName";
- private static final Long DEFAULT_TIMEOUT = new Long(0);
-
- private String endpointName;
- private String interfaceName;
- private String serviceName;
- private boolean synchronous;
- private boolean runAsSubject;
- private boolean throwExceptionOnFailure = true;
- private Long timeOut = DEFAULT_TIMEOUT;
-
- public ServiceMixEndpoint(ServiceMixComponent component, String uri, String endpointName) {
- super(uri, component);
- this.endpointName = endpointName;
- }
-
- @Override
- public void configureProperties(Map<String, Object> options) {
- synchronous = Boolean.valueOf((String) options.remove(SYNCHRONOUS));
- runAsSubject = Boolean.valueOf((String) options.remove(RUN_AS_SUBJECT));
- interfaceName = (String)options.remove(INTERFACE_NAME);
- serviceName = (String)options.remove(SERVICE_NAME);
- setThrowExceptionOnFailure(Boolean.valueOf((String) options.remove(THROW_EXCEPTION_ON_FAILURE)));
- timeOut = parseLongOption(options, TIMEOUT);
- }
-
- private Long parseLongOption(Map<String, Object> options, String timeout) {
- String value = (String) options.remove(TIMEOUT);
- if (value != null) {
- return Long.parseLong(value);
- }
- return 0l;
- }
-
- public ServiceMixComponent getComponent() {
- return (ServiceMixComponent)super.getComponent();
- }
-
- public boolean isSingleton() {
- return true;
- }
-
- public boolean isSynchronous() {
- return synchronous;
- }
-
- public boolean isRunAsSubject() {
- return runAsSubject;
- }
-
- public Long getTimeOut() {
- return timeOut;
- }
-
-
- public Producer createProducer() throws Exception {
- if (isSynchronous()) {
- return new SynchronousDelegateProducer(new ServiceMixProducer(this, getComponent().getNmr()));
- } else {
- return new ServiceMixProducer(this, getComponent().getNmr());
- }
- }
-
- public Consumer createConsumer(Processor processor) throws Exception {
- return new ServiceMixConsumer(this, processor);
- }
-
- public Exchange createExchange(org.apache.servicemix.nmr.api.Exchange nmrExchange) {
- return getComponent().getBinding().populateCamelExchangeFromNmrExchange(getCamelContext(),
- nmrExchange);
- }
-
- public void setEndpointName(String endpointName) {
- this.endpointName = endpointName;
- }
-
- public String getEndpointName() {
- return endpointName;
- }
-
- public boolean isThrowExceptionOnFailure() {
- return throwExceptionOnFailure;
- }
-
- public void setThrowExceptionOnFailure(boolean throwExceptionOnFailure) {
- this.throwExceptionOnFailure = throwExceptionOnFailure;
- }
-
- public String getInterfaceName() {
- return interfaceName;
- }
-
- public void setInterfaceName(String interfaceName) {
- this.interfaceName = interfaceName;
- }
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-}
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
deleted file mode 100644
index f24f093..0000000
--- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.camel.nmr;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
-import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.Exchange;
-import org.apache.servicemix.nmr.api.*;
-import org.apache.servicemix.nmr.api.service.ServiceHelper;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * A {@link org.apache.camel.Producer} that handles incoming Camel exchanges by sending/receiving an NMR {@link org.apache.camel.Exchange}
- */
-public class ServiceMixProducer extends DefaultProducer implements Endpoint, AsyncProcessor {
-
- private static final String TARGET_ENDPOINT_NAME = "TARGET_ENDPOINT_NAME";
-
- private final Map<String, Continuation> continuations = new ConcurrentHashMap<String, Continuation>();
- private final NMR nmr;
-
- private Channel channel;
-
- public ServiceMixProducer(ServiceMixEndpoint endpoint, NMR nmr) {
- super(endpoint);
- this.nmr = nmr;
- }
-
- /*
- * Synchronously process the Camel exchange (using sendSync to send and receive the NMR Exchange)
- */
- public void process(Exchange exchange) throws Exception {
- NMR nmr = getEndpoint().getComponent().getNmr();
-
- org.apache.servicemix.nmr.api.Exchange e =
- getEndpoint().getComponent().getBinding().populateNmrExchangeFromCamelExchange(exchange, channel);
-
- try {
- e.setTarget(nmr.getEndpointRegistry().lookup(
- ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
- getEndpoint().getEndpointName())));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- channel.sendSync(e, getEndpoint().getTimeOut());
-
- handleResponse(exchange, channel, e);
- }
-
- /*
- * Asynchronously process the Camel exchange (using send to send the NMR Exchange)
- * (NMR responses will be handled by the {@link #process(org.apache.servicemix.nmr.api.Exchange)} method
- */
- public boolean process(Exchange exchange, AsyncCallback asyncCallback) {
- NMR nmr = getEndpoint().getComponent().getNmr();
-
- org.apache.servicemix.nmr.api.Exchange e
- = getEndpoint().getComponent().getBinding().populateNmrExchangeFromCamelExchange(exchange, channel);
-
- try {
- e.setTarget(nmr.getEndpointRegistry().lookup(
- ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
- getEndpoint().getEndpointName())));
-
- if (isSendSyncRequired()) {
- process(exchange);
- asyncCallback.done(true);
- return true;
- } else {
- continuations.put(e.getId(), new Continuation(exchange, asyncCallback));
- channel.send(e);
- return false;
- }
- } catch (Exception ex) {
- log.warn("Error occured while sending NMR exchange", ex);
-
- continuations.remove(e.getId());
-
- exchange.setException(ex);
- asyncCallback.done(true);
- return true;
- }
- }
-
- /**
- * Handle incoming NMR exchanges (responses to the exchanges sent in {@link #process(org.apache.camel.Exchange, org.apache.camel.AsyncCallback)}
- */
- public void process(org.apache.servicemix.nmr.api.Exchange exchange) {
- Continuation continuation = continuations.remove(exchange.getId());
-
- if (continuation == null) {
- log.error("Unknown exchange received: " + exchange);
- } else {
- handleResponse(continuation.exchange, channel, exchange);
- continuation.callback.done(false);
- }
- }
-
- /*
- * Handle the NMR Exchange by:
- * - updating the corresponding Camel Exchange
- * - finishing the NMR Exchange MEP
- */
- private void handleResponse(Exchange exchange, Channel client, org.apache.servicemix.nmr.api.Exchange e) {
-
- if (e.getError() != null && getEndpoint().isThrowExceptionOnFailure()) {
- handleErrorResponse(exchange, client, e);
- } else {
- handleSuccessResponse(exchange, client, e);
- }
- }
-
- private void handleSuccessResponse(Exchange exchange, Channel client, org.apache.servicemix.nmr.api.Exchange e) {
- if (e.getPattern() != Pattern.InOnly) {
- exchange.getProperties().putAll(e.getProperties());
- if (e.getFault().getBody() != null) {
- exchange.getOut().setFault(true);
- getEndpoint().getComponent().getBinding().copyNmrMessageToCamelMessage(e.getFault(), exchange.getOut());
- } else {
- getEndpoint().getComponent().getBinding().copyNmrMessageToCamelMessage(e.getOut(), exchange.getOut());
- }
- e.setStatus(Status.Done);
- channel.send(e);
- }
- }
-
- private void handleErrorResponse(Exchange camel, Channel client, org.apache.servicemix.nmr.api.Exchange nmr) {
- camel.setException(nmr.getError());
- }
-
- @Override
- protected void doStart() throws Exception {
- nmr.getEndpointRegistry().register(this, createEndpointMap());
- super.doStart();
- }
-
- @Override
- protected void doStop() throws Exception {
- super.doStop();
- nmr.getEndpointRegistry().unregister(this, createEndpointMap());
- }
-
- /**
- * Access the matching {@link org.apache.servicemix.camel.nmr.ServiceMixEndpoint}
- */
- public ServiceMixEndpoint getEndpoint() {
- return (ServiceMixEndpoint) super.getEndpoint();
- }
-
- public void setChannel(Channel channel) {
- this.channel = channel;
- }
-
- /*
- * Creates the default endpoint map, containing the endpoint name as well as a property referring to the
- * target endpoint name
- */
- private Map<String,Object> createEndpointMap() {
- return ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
- ServiceMixProducer.class.getName() + "-" + getEndpoint().getEndpointName(),
- TARGET_ENDPOINT_NAME,
- getEndpoint().getEndpointName());
-
- }
-
- /*
- * Access an unmodifiable copy of the pending continuations map
- */
- protected Map<String, Continuation> getContinuations() {
- return Collections.unmodifiableMap(continuations);
- }
-
- /*
- * Encapsulates all the information required to continue a Camel {@link Exchange}
- */
- private final class Continuation {
-
- private final Exchange exchange;
- private final AsyncCallback callback;
-
- private Continuation(Exchange exchange, AsyncCallback callback) {
- super();
- this.exchange = exchange;
- this.callback = callback;
- }
- }
-
- /*
- * Check if sendSync is required for interacting with the NMR.
- * Currently, sendSync is required only if a timeout has been configured on the endpoint.
- */
- private boolean isSendSyncRequired() {
- return getEndpoint().getTimeOut() > 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr b/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
deleted file mode 100644
index 17e2f92..0000000
--- a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.servicemix.camel.nmr.ServiceMixComponent
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx b/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
deleted file mode 100644
index 17e2f92..0000000
--- a/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.servicemix.camel.nmr.ServiceMixComponent
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml b/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml
deleted file mode 100644
index ed80a29..0000000
--- a/camel/servicemix-camel/src/main/resources/OSGI-INF/blueprint/camel-nmr.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
- <bean id="nmr" class="org.apache.servicemix.camel.nmr.ServiceMixComponent">
- <property name="nmr">
- <reference interface="org.apache.servicemix.nmr.api.NMR" />
- </property>
- </bean>
-
-</blueprint>
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
----------------------------------------------------------------------
diff --git a/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml b/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
deleted file mode 100644
index 439aae8..0000000
--- a/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xmlns:camel-osgi="http://activemq.apache.org/camel/schema/osgi"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/camel/schema/spring/camel-spring.xsd
- http://camel.apache.org/schema/osgi http://camel.apache.org/schema/osgi/camel-osgi.xsd">
-
- <bean id="nmr" class="org.apache.servicemix.camel.nmr.ServiceMixComponent">
- <property name="nmr">
- <osgi:reference interface="org.apache.servicemix.nmr.api.NMR" />
- </property>
- </bean>
-
-</beans>