servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r648221 [1/2] - in /servicemix/smx4/features/trunk: ./ activemq/ activemq/activemq-osgi/ assembly/ assembly/src/main/appended-resources/ assembly/src/main/appended-resources/META-INF/ assembly/src/main/distribution/text/licenses/ camel/ cam...
Date Tue, 15 Apr 2008 12:18:17 GMT
Author: gnodet
Date: Tue Apr 15 05:18:11 2008
New Revision: 648221

URL: http://svn.apache.org/viewvc?rev=648221&view=rev
Log:
Use 'Apache ServiceMix' as the name, fix some junit tests, fix legal stuff

Added:
    servicemix/smx4/features/trunk/assembly/src/main/appended-resources/
    servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/
    servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm
    servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt
Modified:
    servicemix/smx4/features/trunk/README.txt
    servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
    servicemix/smx4/features/trunk/activemq/pom.xml
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml
    servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
    servicemix/smx4/features/trunk/camel/bundles/pom.xml
    servicemix/smx4/features/trunk/camel/pom.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/addressing/WSAddressingTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/policy/WSPolicyTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/rm/WSRMTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/security/WSSecurityTest.java
    servicemix/smx4/features/trunk/cxf/   (props changed)
    servicemix/smx4/features/trunk/cxf/bundles/   (props changed)
    servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml
    servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
    servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
    servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml
    servicemix/smx4/features/trunk/cxf/pom.xml
    servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/pom.xml
    servicemix/smx4/features/trunk/management/acegi/pom.xml
    servicemix/smx4/features/trunk/management/core/pom.xml
    servicemix/smx4/features/trunk/management/pom.xml
    servicemix/smx4/features/trunk/pom.xml
    servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml
    servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml
    servicemix/smx4/features/trunk/transaction/bundles/pom.xml
    servicemix/smx4/features/trunk/transaction/pom.xml
    servicemix/smx4/features/trunk/transaction/transaction/pom.xml
    servicemix/smx4/features/trunk/war/bundles/jasper/pom.xml
    servicemix/smx4/features/trunk/war/bundles/pom.xml
    servicemix/smx4/features/trunk/war/deployer/pom.xml
    servicemix/smx4/features/trunk/war/pom.xml

Modified: servicemix/smx4/features/trunk/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/README.txt?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/README.txt (original)
+++ servicemix/smx4/features/trunk/README.txt Tue Apr 15 05:18:11 2008
@@ -17,7 +17,15 @@
 
 Welcome to Apache ServiceMix 4 
 ==============================
-Apache ServiceMix 4 is an integration platform.
+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
 ===============

Modified: servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.activemq</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Features :: ActiveMQ</name>
+    <name>Apache ServiceMix Features :: ActiveMQ</name>
     
     <properties>
     	<commons-pool.version>1.3</commons-pool.version>

Modified: servicemix/smx4/features/trunk/activemq/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/pom.xml Tue Apr 15 05:18:11 2008
@@ -31,7 +31,7 @@
     <artifactId>activemq</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Features :: ActiveMQ</name>
+    <name>Apache ServiceMix Features :: ActiveMQ</name>
 
     <modules>
         <module>activemq-osgi</module>

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Apr 15 05:18:11 2008
@@ -31,7 +31,7 @@
     <artifactId>apache-servicemix</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Features :: Assembly</name>
+    <name>Apache ServiceMix Features :: Assembly</name>
 
     <dependencies>
         <dependency>
@@ -39,6 +39,12 @@
             <artifactId>apache-servicemix-kernel</artifactId>
             <version>${servicemix.kernel.version}</version>
             <type>zip</type>
+<exclusions>
+	<exclusion>
+		<groupId>junit</groupId>
+		<artifactId>junit</artifactId>
+	</exclusion>
+</exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.kernel</groupId>
@@ -106,6 +112,20 @@
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.commands</artifactId>
             <version>${servicemix.nmr.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-jdk14</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
@@ -228,6 +248,16 @@
             <version>${geronimo.j2ee.management.version}</version>
         </dependency>
         <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-ws-metadata_2.0_spec</artifactId>
+            <version>${geronimo.wsmetadata.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.activemq</groupId>
             <artifactId>org.apache.servicemix.activemq</artifactId>
             <version>${version}</version>
@@ -308,6 +338,12 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.xml</groupId>
+					<artifactId>jaxb-api</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
@@ -379,6 +415,56 @@
             <artifactId>jetty-util</artifactId>
             <version>${jetty.version}</version>
         </dependency>
+		<!-- Dependencies not included directly, but repackaged in bundles.
+     	     Listed for legal reasons (and LICENSE file generation) -->
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>jaxb-api</artifactId>
+				<version>${jaxb.api.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.activation</groupId>
+						<artifactId>activation</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.xml.bind</groupId>
+				<artifactId>jaxb-impl</artifactId>
+				<version>${jaxb.impl.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.activation</groupId>
+						<artifactId>activation</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+	            <groupId>javax.xml.ws</groupId>
+				<artifactId>jaxws-api</artifactId>
+				<version>${jaxws.api.version}</version>
+			</dependency>
+			<dependency>
+	            <groupId>com.sun.xml.messaging.saaj</groupId>
+				<artifactId>saaj-impl</artifactId>
+				<version>1.3</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.xml.soap</groupId>
+						<artifactId>saaj-api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+	            <groupId>asm</groupId>
+	            <artifactId>asm-all</artifactId>
+				<version>${asm.version}</version>
+			</dependency>
+			<dependency>
+	            <groupId>wsdl4j</groupId>
+	            <artifactId>wsdl4j</artifactId>
+				<version>1.6.1</version>
+			</dependency>
     </dependencies>
     <build>
         <resources>

Added: servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm?rev=648221&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm Tue Apr 15 05:18:11 2008
@@ -0,0 +1,39 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT 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

Added: servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE?rev=648221&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE Tue Apr 15 05:18:11 2008
@@ -0,0 +1,26 @@
+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.

Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt?rev=648221&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt Tue Apr 15 05:18:11 2008
@@ -0,0 +1,30 @@
+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.
+

Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt?rev=648221&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt Tue Apr 15 05:18:11 2008
@@ -0,0 +1,12 @@
+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.

Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt?rev=648221&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt Tue Apr 15 05:18:11 2008
@@ -0,0 +1,385 @@
+
+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.

Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt?rev=648221&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt Tue Apr 15 05:18:11 2008
@@ -0,0 +1,213 @@
+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.

Modified: servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/camel/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/pom.xml Tue Apr 15 05:18:11 2008
@@ -30,7 +30,7 @@
     <artifactId>bundles</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix OSGI Common Bundles</name>
+    <name>Apache ServiceMix OSGI Common Bundles</name>
 
     <modules>
         <module>jaxb-api</module>

Modified: servicemix/smx4/features/trunk/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/pom.xml Tue Apr 15 05:18:11 2008
@@ -31,7 +31,7 @@
     <artifactId>camel</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Features :: Camel</name>
+    <name>Apache ServiceMix Features :: Camel</name>
 
     <modules>
         <module>bundles</module>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.camel.component</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Camel Component</name>
+    <name>Apache ServiceMix Camel Component</name>
 
     <dependencies>
         <dependency>
@@ -139,12 +139,30 @@
       <artifactId>cxf-rt-management</artifactId>
       <version>${cxf.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-testutils</artifactId>
-      <version>${cxf.version}</version>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-testutils</artifactId>
+          <version>${cxf.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-rt-ws-addr</artifactId>
+          <version>${cxf.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-rt-ws-security</artifactId>
+          <version>${cxf.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-rt-ws-policy</artifactId>
+          <version>${cxf.version}</version>
+          <scope>test</scope>
+        </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-tools-common</artifactId>
@@ -156,11 +174,19 @@
         </exclusion>
       </exclusions>
     </dependency>
+        <!--
         <dependency>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-bundle</artifactId>
           <version>${cxf.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jaxen</groupId>
+                    <artifactId>jaxen</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        -->
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java Tue Apr 15 05:18:11 2008
@@ -21,6 +21,7 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultExchange;
+import org.apache.servicemix.nmr.api.Message;
 import org.apache.servicemix.nmr.api.Pattern;
 
 
@@ -127,17 +128,20 @@
 
     @Override
     protected ServiceMixMessage createInMessage() {
-        return new ServiceMixMessage();
+        Message msg = exchange.getIn(true);
+        return msg != null ? new ServiceMixMessage(msg) : null;
     }
 
     @Override
     protected ServiceMixMessage createOutMessage() {
-        return new ServiceMixMessage();
+        Message msg = exchange.getOut(true);
+        return msg != null ? new ServiceMixMessage(msg) : null;
     }
     
     @Override
     protected org.apache.camel.Message createFaultMessage() {
-        return new ServiceMixMessage();
+        Message msg = exchange.getFault(true); 
+        return msg != null ? new ServiceMixMessage(msg) : null;
     }
 
 }

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java Tue Apr 15 05:18:11 2008
@@ -47,10 +47,6 @@
     	this.message = message;
     }
     
-    public ServiceMixMessage() {
-    	
-    }
-
     public String getMessageId() {
         return messageId;  //To change body of implemented methods use File | Settings | File Templates.
     }

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java Tue Apr 15 05:18:11 2008
@@ -59,32 +59,32 @@
     private String serviceEndpointURI = "cxf://" + SERVICE_ADDRESS + "?" + SERVICE_CLASS 
     	+ "&" + WSDL_LOCATION + "&" + SERVICE_NAME + "&dataFormat=POJO";
     
-    private ServerImpl server;
     private CamelContext camelContext;
     private ServiceMixComponent smxComponent;
     private NMR nmr;
+    private javax.xml.ws.Endpoint endpoint;
     
     
     @Override
     protected void setUp() throws Exception {
         super.setUp();        
-                
-        startService();
-    }
-    
-    protected void startService() {
     	Object implementor = new GreeterImpl();
-        
-    	javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
-        
-  
+    	endpoint = javax.xml.ws.Endpoint.publish(SERVICE_ADDRESS, implementor);
     }
     
     @Override
     protected void tearDown() throws Exception {
-        if (server != null) {
-            server.stop();
+        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() {
@@ -111,7 +111,6 @@
     }
     
     public void testException() throws Exception {  
-       
     	URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(wsdl);
         SOAPService service1 = new SOAPService(wsdl, new QName(
@@ -144,7 +143,6 @@
             assertNotNull(brlf.getFaultInfo());
             assertEquals("BadRecordLitFault", brlf.getFaultInfo());
         }
-                      
     }
     
     
@@ -161,7 +159,6 @@
     
     public void testGetTransportFactoryFromBus() throws Exception {
     	Bus bus = BusFactory.getDefaultBus();
-    	
     	assertNotNull(bus.getExtension(ConduitInitiatorManager.class)
         	.getConduitInitiator(CamelTransportFactory.TRANSPORT_ID));
     }

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java Tue Apr 15 05:18:11 2008
@@ -23,12 +23,10 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class SmxToCxfSpringTest extends SmxToCxfTest {
-	protected AbstractXmlApplicationContext applicationContext;
-    
+
     @Override
     protected void setUp() throws Exception {
-        applicationContext = createApplicationContext();
-        super.setUp();        
+        super.setUp();
         assertNotNull("Should have created a valid spring context", applicationContext);
 
         
@@ -36,9 +34,6 @@
 
     @Override
     protected void tearDown() throws Exception {        
-        if (applicationContext != null) {
-            applicationContext.destroy();
-        }
         super.tearDown();
     }
     

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java Tue Apr 15 05:18:11 2008
@@ -66,8 +66,6 @@
 
         server = (ServerImpl)svrBean.create();
         server.start();
-        
-  
     }
     
     @Override
@@ -75,6 +73,7 @@
         if (server != null) {
             server.stop();
         }
+        super.tearDown();
     }
   
     protected RouteBuilder createRouteBuilder() {
@@ -98,8 +97,6 @@
         HelloService client = (HelloService) proxyFactory.create();
         String result = client.echo("hello world");
         assertEquals("we should get the right answer from router", "hello world echo", result);
-        
-                
     }
     
         

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/addressing/WSAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/addressing/WSAddressingTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/addressing/WSAddressingTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/addressing/WSAddressingTest.java Tue Apr 15 05:18:11 2008
@@ -174,6 +174,8 @@
         headerVerifier = null;
         verified = null;
         messageIDs.clear();
+        super.tearDown();
+        Thread.sleep(5000);
     }
   
     protected RouteBuilder createRouteBuilder() {

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/policy/WSPolicyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/policy/WSPolicyTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/policy/WSPolicyTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/policy/WSPolicyTest.java Tue Apr 15 05:18:11 2008
@@ -66,7 +66,6 @@
     	applicationContext = createApplicationContext();
         super.setUp();        
         startService();
-
     }
     
 
@@ -85,6 +84,7 @@
         if (server != null) {
             server.stop();
         }
+        super.tearDown();
     }
   
     protected RouteBuilder createRouteBuilder() {

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/rm/WSRMTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/rm/WSRMTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/rm/WSRMTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/rm/WSRMTest.java Tue Apr 15 05:18:11 2008
@@ -84,6 +84,7 @@
         if (server != null) {
             server.stop();
         }
+        super.tearDown();
     }
   
     protected RouteBuilder createRouteBuilder() {

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/security/WSSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/security/WSSecurityTest.java?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/security/WSSecurityTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/security/WSSecurityTest.java Tue Apr 15 05:18:11 2008
@@ -91,6 +91,7 @@
         if (server != null) {
             server.stop();
         }
+        super.tearDown();
     }
   
     protected RouteBuilder createRouteBuilder() {

Propchange: servicemix/smx4/features/trunk/cxf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 15 05:18:11 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Propchange: servicemix/smx4/features/trunk/cxf/bundles/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 15 05:18:11 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Modified: servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: cxf</name>
+    <name>Apache ServiceMix OSGI Common Bundles: cxf</name>
     <description>
         This bundle simply wraps cxf ${pkgVersion}.
     </description>
@@ -81,23 +81,34 @@
 
         <!-- Dependency on other bundles -->
         <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xmlunit</groupId>
-                    <artifactId>xmlunit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ws.commons</groupId>
-                    <artifactId>ws-commons-java5</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/cxf/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/pom.xml Tue Apr 15 05:18:11 2008
@@ -30,7 +30,7 @@
     <artifactId>bundles</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix OSGI Common Bundles</name>
+    <name>Apache ServiceMix OSGI Common Bundles</name>
 
     <modules>
         <module>cxf</module>

Modified: servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
     <version>4.0-m1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>

Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.cxf.binding.nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix CXF Binding for NMR</name>
+    <name>Apache ServiceMix CXF Binding for NMR</name>
 
     <dependencies>
         <dependency>
@@ -41,9 +41,9 @@
             <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <version>${cxf.version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix CXF Transport for NMR</name>
+    <name>Apache ServiceMix CXF Transport for NMR</name>
 
     <dependencies>
         <dependency>
@@ -41,9 +41,9 @@
             <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <version>${cxf.version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix CXF Transport for OSGi</name>
+    <name>Apache ServiceMix CXF Transport for OSGi</name>
 
     <dependencies>
         <dependency>
@@ -42,9 +42,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <version>${cxf.version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

Modified: servicemix/smx4/features/trunk/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>cxf</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix CXF Support</name>
+    <name>Apache ServiceMix CXF Support</name>
 
     <modules>
         <module>bundles</module>

Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>camel-nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Example :: Camel NMR</name>
+    <name>Apache ServiceMix Example :: Camel NMR</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>camel-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Example :: Camel OSGi</name>
+    <name>Apache ServiceMix Example :: Camel OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>cxf-camel-nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Example :: CXF-Camel NMR</name>
+    <name>Apache ServiceMix Example :: CXF-Camel NMR</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>cxf-nmr</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Example :: CXF NMR</name>
+    <name>Apache ServiceMix Example :: CXF NMR</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>cxf-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Example :: CXF OSGi</name>
+    <name>Apache ServiceMix Example :: CXF OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=648221&r1=648220&r2=648221&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/pom.xml Tue Apr 15 05:18:11 2008
@@ -32,7 +32,7 @@
     <artifactId>examples</artifactId>
     <packaging>pom</packaging>
     <version>4.0-m1-SNAPSHOT</version>
-    <name>ServiceMix Examples</name>
+    <name>Apache ServiceMix Examples</name>
 
     <modules>
         <module>camel-nmr</module>



Mime
View raw message