Update references to "includes" to say "includes/uses" and change 2009 to 2010

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@936080 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 13 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE
index cabd225df1..fe2afdae7c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE
@@ -1,7 +1,7 @@
 Apache Tuscany

-Copyright (c) 2005 - 2009 The Apache Software Foundation

+Copyright (c) 2005 - 2010 The Apache Software Foundation

 

-This product includes software developed at

+This product includes/uses software developed at

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

 
 This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
@@ -9,8 +9,7 @@ This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
 This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
  Copyright (c) 2003-2004 Jan-Klaas Kollhof
  Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-

-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)

+This product includes/uses Axion : the Open Source Java Database (http://axion.tigris.org/)

  Copyright (c) 2002-2003 Axion Development Team. All rights reserved.

 

 This product includes/uses XmlSchema developed at 

@@ -29,7 +28,7 @@ License: Public Domain
 This product includes/uses javacc (https://javacc.dev.java.net/)

  Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.

 

-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)

+This product includes/uses software from the GlassFish project (https://glassfish.dev.java.net/)

     Copyright (c) 2006, Sun Microsystems, Inc.

     

 This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)

@@ -49,11 +48,11 @@ This product includes/uses Jaxen (http://jaxen.codehaus.org/)
 This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:

  Copyright (c) 2002, A. Abram White. All rights reserved.

 

-This product also includes software under the BSD license

+This product also includes/uses software under the BSD license

 with the following copyright:

  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.

 

-The Program includes all or portions of the following software: "The 

+The Program includes/uses all or portions of the following software: "The 

 Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under

 an MPL v1.0 license. Please refer to the homepage URL at 

 http://www.saxonica.com/.

@@ -61,18 +60,18 @@ http://www.saxonica.com/.
 This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:

  Copyright (c) 2002, A. Abram White. All rights reserved.

 

-This product also includes "OSGi Materials."

+This product also includes/uses "OSGi Materials."

  Copyright (c) 2000, 2006

  OSGi Alliance Bishop Ranch 6

  2400 Camino Ramon, Suite 375

  San Ramon, CA 94583 USA

  All Rights Reserved. 

 

-This product includes software under the Service Component Architecture JavaDoc, 

+This product includes/uses software under the Service Component Architecture JavaDoc, 

 Interface Definition files and XSD files license.

   (c) Copyright SCA Collaboration 2006, 2007

 

-This product includes software under the Service Data Objects JavaDoc and 

+This product includes/uses software under the Service Data Objects JavaDoc and 

 Interface Definition file license

 

 (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 

@@ -80,6 +79,5 @@ Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
 Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 

 2005, 2006. All rights reserved.

 

-This product includes software under the OASIS license

-Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.

-

+This product includes/uses software under the OASIS license

+Copyright (C) OASIS(R) 2005, 2010. All Rights Reserved.