From 75d0f6c142c6b8bfd6f6de8d4919ea4b70921542 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 2 Nov 2010 21:27:11 +0000 Subject: Merge r1030212 TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030233 13f79535-47bb-0310-9956-ffa450edef68 --- sca-java-1.x/trunk/modules/databinding/LICENSE | 39 -------------------------- 1 file changed, 39 deletions(-) (limited to 'sca-java-1.x/trunk/modules/databinding') diff --git a/sca-java-1.x/trunk/modules/databinding/LICENSE b/sca-java-1.x/trunk/modules/databinding/LICENSE index 616bec99ed..8aa906c321 100644 --- a/sca-java-1.x/trunk/modules/databinding/LICENSE +++ b/sca-java-1.x/trunk/modules/databinding/LICENSE @@ -201,44 +201,5 @@ See the License for the specific language governing permissions and limitations under the License. ------------------------------------------------------------------ -The test cases use xmlunit with the following license: ------------------------------------------------------------------ - -/* -****************************************************************** -Copyright (c) 2001-2007, Jeff Martin, Tim Bacon -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 xmlunit.sourceforge.net 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. - -****************************************************************** -*/ -- cgit v1.2.3