30 files changed, 253 insertions, 262 deletions
diff --git a/sca-java-1.x/trunk/modules/assembly-xsd/LICENSE b/sca-java-1.x/trunk/modules/assembly-xsd/LICENSE
index 646cd58e09..ab5e82e6c7 100644
--- a/sca-java-1.x/trunk/modules/assembly-xsd/LICENSE
+++ b/sca-java-1.x/trunk/modules/assembly-xsd/LICENSE
@@ -202,50 +202,75 @@
    limitations under the License.
 
 
+================================================================================
 
-===============================================================================
+APACHE TUSCANY SCA SUBCOMPONENTS:
 
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
 
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+================================================================================
 
-===============================================================================
+This module assembly-xsd includes XSD files under the following copyrights and license:
 
-This module includes XSD files under the following SCA Collaboration license:
+Copyright Notices
 
-License for the Service Component Architecture JavaDoc, Interface Definition files and XSD files.
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
 
-Permission to copy, make derivative works of, and distribute the Service Component Architecture 
-JavaDoc, Interface Definition Files and XSD files in any medium without fee or royalty as part 
-of a compliant implementation of the Service Component Architecture Specification is hereby granted.  
-The Service Components Architecture Specification may be found at the following location:
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
 
-	http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf
+License
 
-THE SERVICE COMPONENT ARCHITECTURE SPECIFICATION AND THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES 
-ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
-SPECIFICATION OR THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
-SERVICE COMPONENT ARCHITECTURE SPECIFICATION OR THE JAVADOC, INTERFACE DEFINTION FILES OR XSD FILES.
+Permission to copy, display and distribute the Service Component Architecture Specification and/or
+portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+that you include the following on ALL copies of the Service Component Architecture Specification, or
+portions thereof, that you make:
 
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
-publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
-written prior permission. Title to copyright in the Service Component Architecture Specification and the 
-JavaDoc, Interface Definition Files and XSD Files will at all times remain with the Authors.
+1. A link or URL to the Service Component Architecture Specification at this location:
+� http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+
+2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+
+BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+necessary to implement the Service Component Architecture Specification.
+
+THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+written prior permission. Title to copyright in the Service Component Architecture Specification
+will at all times remain with the Authors.
 
 No other rights are granted by implication, estoppel or otherwise.
 
-===============================================================================
+================================================================================
+
+This module assembly-xsd includes files under the following copyright and license:
 
-This module includes XSD files under the following W3C(r) Software License:
+Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, 
+European Research Consortium for Informatics and Mathematics, Keio University). 
+All Rights Reserved. This work is distributed under the W3C(r) Software License [1] 
+in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-W3C(r) SOFTWARE NOTICE AND LICENSE
+    [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+W3C� SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other related items) 
@@ -279,3 +304,5 @@ The name and trademarks of copyright holders may NOT be used in advertising or p
 pertaining to the software without specific, written prior permission. Title to copyright 
 in this software and any associated documentation will at all times remain with copyright 
 holders.
+
+================================================================================
diff --git a/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE b/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE
index 49ff935a41..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE
+++ b/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE
@@ -4,20 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
-This product also includes software under the W3C(r) Software License
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(r) Software License [1] 
-in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/sca-java-1.x/trunk/modules/binding-gdata/LICENSE b/sca-java-1.x/trunk/modules/binding-gdata/LICENSE
index d645695673..8aa906c321 100644
--- a/sca-java-1.x/trunk/modules/binding-gdata/LICENSE
+++ b/sca-java-1.x/trunk/modules/binding-gdata/LICENSE
@@ -200,3 +200,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+
diff --git a/sca-java-1.x/trunk/modules/binding-gdata/NOTICE b/sca-java-1.x/trunk/modules/binding-gdata/NOTICE
index 595b3a0258..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/binding-gdata/NOTICE
+++ b/sca-java-1.x/trunk/modules/binding-gdata/NOTICE
@@ -4,5 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-
-
diff --git a/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..ff88653d04 100644
--- a/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE
@@ -202,4 +202,46 @@
    limitations under the License.
 
 
-
+================================================================================
+
+APACHE TUSCANY SCA SUBCOMPONENTS:
+
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
+
+================================================================================
+
+This module binding-jsonrpc-runtime includes the file jsonrpc.js under the
+following copyright and license:
+
+/*
+ * JSON-RPC JavaScript client
+ *
+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
+ *
+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+ *
+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+ * Modifications for Apache Tuscany:
+ * - JSONRpcClient_createMethod changed so callback is last arg
+ */
+
+================================================================================
diff --git a/sca-java-1.x/trunk/modules/contribution-groovy/NOTICE b/sca-java-1.x/trunk/modules/contribution-groovy/NOTICE
index 22e007c984..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/contribution-groovy/NOTICE
+++ b/sca-java-1.x/trunk/modules/contribution-groovy/NOTICE
@@ -4,5 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product uses Relax WS (http://code.google.com/p/relax-ws/) with the following copyright:
- * Copyright 2008 Jason Sando
diff --git a/sca-java-1.x/trunk/modules/databinding-json/LICENSE b/sca-java-1.x/trunk/modules/databinding-json/LICENSE
index d645695673..8aa906c321 100644
--- a/sca-java-1.x/trunk/modules/databinding-json/LICENSE
+++ b/sca-java-1.x/trunk/modules/databinding-json/LICENSE
@@ -200,3 +200,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+
diff --git a/sca-java-1.x/trunk/modules/databinding-saxon/LICENSE b/sca-java-1.x/trunk/modules/databinding-saxon/LICENSE
index d645695673..8aa906c321 100644
--- a/sca-java-1.x/trunk/modules/databinding-saxon/LICENSE
+++ b/sca-java-1.x/trunk/modules/databinding-saxon/LICENSE
@@ -200,3 +200,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+
diff --git a/sca-java-1.x/trunk/modules/databinding-xmlbeans/LICENSE b/sca-java-1.x/trunk/modules/databinding-xmlbeans/LICENSE
index d645695673..8aa906c321 100755
--- a/sca-java-1.x/trunk/modules/databinding-xmlbeans/LICENSE
+++ b/sca-java-1.x/trunk/modules/databinding-xmlbeans/LICENSE
@@ -200,3 +200,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+
diff --git a/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.
-
-******************************************************************
-*/
 
 
diff --git a/sca-java-1.x/trunk/modules/extensibility-osgi/NOTICE b/sca-java-1.x/trunk/modules/extensibility-osgi/NOTICE
index a67cd7c175..9ddba06a32 100644
--- a/sca-java-1.x/trunk/modules/extensibility-osgi/NOTICE
+++ b/sca-java-1.x/trunk/modules/extensibility-osgi/NOTICE
@@ -1,3 +1,4 @@
+${pom.name}
 Copyright (c) 2005 - 2010 The Apache Software Foundation
 
 This product includes software developed by
diff --git a/sca-java-1.x/trunk/modules/extensibility/NOTICE b/sca-java-1.x/trunk/modules/extensibility/NOTICE
index 6d6a276d96..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/extensibility/NOTICE
+++ b/sca-java-1.x/trunk/modules/extensibility/NOTICE
@@ -1,3 +1,4 @@
+${pom.name}
 Copyright (c) 2005 - 2010 The Apache Software Foundation
 
 This product includes software developed by
diff --git a/sca-java-1.x/trunk/modules/host-webapp/LICENSE b/sca-java-1.x/trunk/modules/host-webapp/LICENSE
index 1ae723e052..d1e4c3124b 100644
--- a/sca-java-1.x/trunk/modules/host-webapp/LICENSE
+++ b/sca-java-1.x/trunk/modules/host-webapp/LICENSE
@@ -201,18 +201,30 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================
 
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
+================================================================================
 
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+APACHE TUSCANY SCA SUBCOMPONENTS:
 
-===============================================================================
-The module host-webapp includes files under the following license:
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
+
+================================================================================
+
+This module host-webapp includes files under the following copyrights and license:
+
+Copyright Notices
+
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
+
+License
 
 Permission to copy, display and distribute the Service Component Architecture Specification and/or
 portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
@@ -220,7 +232,7 @@ that you include the following on ALL copies of the Service Component Architectu
 portions thereof, that you make:
 
 1. A link or URL to the Service Component Architecture Specification at this location:
-  http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+� http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
 
 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
 
@@ -228,14 +240,22 @@ BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Re
 SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
 royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
 necessary to implement the Service Component Architecture Specification.
+
 THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
 AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
 REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
 INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
 PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+
 THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
 OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
 DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+
 The name and trademarks of the Authors may NOT be used in any manner, including advertising or
 publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+written prior permission. Title to copyright in the Service Component Architecture Specification
+will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
 
+================================================================================
diff --git a/sca-java-1.x/trunk/modules/host-webapp/NOTICE b/sca-java-1.x/trunk/modules/host-webapp/NOTICE
index 954815cf00..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/host-webapp/NOTICE
+++ b/sca-java-1.x/trunk/modules/host-webapp/NOTICE
@@ -4,9 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product also includes software under the Service Component Architecture specification license
-(see the LICENSE file contained in this distribution) with the following copyright
-
-(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
-Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
-AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
diff --git a/sca-java-1.x/trunk/modules/implementation-bpel-ode/LICENSE b/sca-java-1.x/trunk/modules/implementation-bpel-ode/LICENSE
index baba9ca048..6e529a25c4 100644
--- a/sca-java-1.x/trunk/modules/implementation-bpel-ode/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-bpel-ode/LICENSE
@@ -201,51 +201,5 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-=================================================================================================================
-
-This module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- 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 Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
+
+
diff --git a/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE b/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE
index 9bc1ce916d..9ddba06a32 100644
--- a/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE
+++ b/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE
@@ -4,14 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-Unless otherwise indicated, all distribution made available by the Apache Software Foundation
-is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
-A copy of the AL is provided with this distribution as the LICENSE file present in the
-root directory, and is also available at http://www.apache.org/licenses/.
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-Copyright (c) 2006, Sun Microsystems, Inc.
-All rights reserved.
diff --git a/sca-java-1.x/trunk/modules/implementation-bpel/LICENSE b/sca-java-1.x/trunk/modules/implementation-bpel/LICENSE
index baba9ca048..6e529a25c4 100644
--- a/sca-java-1.x/trunk/modules/implementation-bpel/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-bpel/LICENSE
@@ -201,51 +201,5 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-=================================================================================================================
-
-This module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- 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 Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
+
+
diff --git a/sca-java-1.x/trunk/modules/implementation-bpel/NOTICE b/sca-java-1.x/trunk/modules/implementation-bpel/NOTICE
index 9bc1ce916d..9ddba06a32 100644
--- a/sca-java-1.x/trunk/modules/implementation-bpel/NOTICE
+++ b/sca-java-1.x/trunk/modules/implementation-bpel/NOTICE
@@ -4,14 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-Unless otherwise indicated, all distribution made available by the Apache Software Foundation
-is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
-A copy of the AL is provided with this distribution as the LICENSE file present in the
-root directory, and is also available at http://www.apache.org/licenses/.
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-Copyright (c) 2006, Sun Microsystems, Inc.
-All rights reserved.
diff --git a/sca-java-1.x/trunk/modules/implementation-osgi/LICENSE b/sca-java-1.x/trunk/modules/implementation-osgi/LICENSE
index 6b0b1270ff..8aa906c321 100644
--- a/sca-java-1.x/trunk/modules/implementation-osgi/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-osgi/LICENSE
@@ -201,3 +201,5 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+
diff --git a/sca-java-1.x/trunk/modules/implementation-script/LICENSE b/sca-java-1.x/trunk/modules/implementation-script/LICENSE
index 4b5ab74408..567dfc5096 100644
--- a/sca-java-1.x/trunk/modules/implementation-script/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-script/LICENSE
@@ -201,19 +201,19 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================================================
 
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
+================================================================================
 
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+APACHE TUSCANY SCA SUBCOMPONENTS:
 
-=================================================================================================================
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
 
-This module implementation-script temporarily includes one file under the following BSD license:
+================================================================================
+
+This module implementation-script temporarily includes one file under the
+following BSD license:
 
  Copyright (c) 2006, Sun Microsystems, Inc.
  All rights reserved.
@@ -248,4 +248,4 @@ This module implementation-script temporarily includes one file under the follow
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
  DAMAGE. 
 
-=================================================================================================================
+================================================================================
diff --git a/sca-java-1.x/trunk/modules/implementation-web-runtime/LICENSE b/sca-java-1.x/trunk/modules/implementation-web-runtime/LICENSE
index 6b0b1270ff..6e42c7155c 100644
--- a/sca-java-1.x/trunk/modules/implementation-web-runtime/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-web-runtime/LICENSE
@@ -201,3 +201,47 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+================================================================================
+
+APACHE TUSCANY SCA SUBCOMPONENTS:
+
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
+
+================================================================================
+
+This module implementation-web-runtime includes the file jsonrpc.js under the
+following copyright and license:
+
+/*
+ * JSON-RPC JavaScript client
+ *
+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
+ *
+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+ *
+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+ * Modifications for Apache Tuscany:
+ * - JSONRpcClient_createMethod changed so callback is last arg
+ */
+
+================================================================================
diff --git a/sca-java-1.x/trunk/modules/implementation-web-runtime/NOTICE b/sca-java-1.x/trunk/modules/implementation-web-runtime/NOTICE
index b8f34569f0..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/implementation-web-runtime/NOTICE
+++ b/sca-java-1.x/trunk/modules/implementation-web-runtime/NOTICE
@@ -4,6 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-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
diff --git a/sca-java-1.x/trunk/modules/implementation-xquery/LICENSE b/sca-java-1.x/trunk/modules/implementation-xquery/LICENSE
index d645695673..8aa906c321 100644
--- a/sca-java-1.x/trunk/modules/implementation-xquery/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-xquery/LICENSE
@@ -200,3 +200,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+
diff --git a/sca-java-1.x/trunk/modules/osgi-runtime/LICENSE b/sca-java-1.x/trunk/modules/osgi-runtime/LICENSE
index 43e91eb0b0..6e529a25c4 100644
--- a/sca-java-1.x/trunk/modules/osgi-runtime/LICENSE
+++ b/sca-java-1.x/trunk/modules/osgi-runtime/LICENSE
@@ -201,3 +201,5 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+
diff --git a/sca-java-1.x/trunk/modules/policy/NOTICE b/sca-java-1.x/trunk/modules/policy/NOTICE
index 6d6a276d96..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/policy/NOTICE
+++ b/sca-java-1.x/trunk/modules/policy/NOTICE
@@ -1,3 +1,4 @@
+${pom.name}
 Copyright (c) 2005 - 2010 The Apache Software Foundation
 
 This product includes software developed by
diff --git a/sca-java-1.x/trunk/modules/sca-api-extension/LICENSE b/sca-java-1.x/trunk/modules/sca-api-extension/LICENSE
index d645695673..8aa906c321 100644
--- a/sca-java-1.x/trunk/modules/sca-api-extension/LICENSE
+++ b/sca-java-1.x/trunk/modules/sca-api-extension/LICENSE
@@ -200,3 +200,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+
diff --git a/sca-java-1.x/trunk/modules/sca-api/LICENSE b/sca-java-1.x/trunk/modules/sca-api/LICENSE
index 617c69079b..af46767486 100644
--- a/sca-java-1.x/trunk/modules/sca-api/LICENSE
+++ b/sca-java-1.x/trunk/modules/sca-api/LICENSE
@@ -201,18 +201,30 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================
 
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
+================================================================================
 
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+APACHE TUSCANY SCA SUBCOMPONENTS:
 
-===============================================================================
-The module sca-api includes a number of files under the following license:
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
+
+================================================================================
+
+This module sca-api includes files under the following copyrights and license:
+
+Copyright Notices
+
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
+
+License
 
 Permission to copy, display and distribute the Service Component Architecture Specification and/or
 portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
@@ -220,7 +232,7 @@ that you include the following on ALL copies of the Service Component Architectu
 portions thereof, that you make:
 
 1. A link or URL to the Service Component Architecture Specification at this location:
-  http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+� http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
 
 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
 
@@ -228,16 +240,22 @@ BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Re
 SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
 royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
 necessary to implement the Service Component Architecture Specification.
+
 THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
 AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
 REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
 INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
 PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+
 THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
 OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
 DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+
 The name and trademarks of the Authors may NOT be used in any manner, including advertising or
 publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+written prior permission. Title to copyright in the Service Component Architecture Specification
+will at all times remain with the Authors.
 
+No other rights are granted by implication, estoppel or otherwise.
 
-
+================================================================================
diff --git a/sca-java-1.x/trunk/modules/sca-api/NOTICE b/sca-java-1.x/trunk/modules/sca-api/NOTICE
index 501d3ea15b..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/sca-api/NOTICE
+++ b/sca-java-1.x/trunk/modules/sca-api/NOTICE
@@ -4,10 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product also includes software under the Service Component Architecture specification license
-(see the LICENSE file contained in this distribution) with the following copyright
-
-(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
-37 Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
-38 Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
-
diff --git a/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE b/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE
index 422e5f7033..8b6be3373a 100644
--- a/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE
+++ b/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE
@@ -202,9 +202,19 @@
    limitations under the License.
 
 
-==========================================================================
+================================================================================
+
+APACHE TUSCANY SCA SUBCOMPONENTS:
+
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
+
+================================================================================
 
-dojotoolkit V1.3.0:
+This module web-javascript-dojo includes a redistribution of
+ dojotoolkit V1.3.0
+under the following copyright and license:
 
 The "New" BSD License:
 **********************
diff --git a/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE b/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE
index 55cb8b86a8..ad2ba40961 100644
--- a/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE
+++ b/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE
@@ -4,8 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes dojotoolkit files (http://dojotoolkit.org/) under the
-"New" BSD License (see the LICENSE file contained in this distribution) under the 
-following copyright
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-