Renaming core-web-xxx modules to web-javascript-xxx modules

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

26 files changed, 220 insertions, 220 deletions

diff --git a/branches/sca-java-1.x/modules/binding-atom-js-dojo/pom.xml b/branches/sca-java-1.x/modules/binding-atom-js-dojo/pom.xml
index ae48d0e82d..0b990a3f18 100644
--- a/branches/sca-java-1.x/modules/binding-atom-js-dojo/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-atom-js-dojo/pom.xml
@@ -38,7 +38,7 @@
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-web</artifactId>
+            <artifactId>tuscany-web-javascript</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>    
 
diff --git a/branches/sca-java-1.x/modules/binding-atom-js/pom.xml b/branches/sca-java-1.x/modules/binding-atom-js/pom.xml
index b15fd157c1..c71ac60d15 100644
--- a/branches/sca-java-1.x/modules/binding-atom-js/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-atom-js/pom.xml
@@ -38,7 +38,7 @@
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-web</artifactId>
+            <artifactId>tuscany-web-javascript</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>    
 
diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/pom.xml b/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/pom.xml
index 751b6e06e6..4502b5cb3e 100644
--- a/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/pom.xml
@@ -38,7 +38,7 @@
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-web</artifactId>
+            <artifactId>tuscany-web-javascript</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>    
     
diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-js/pom.xml b/branches/sca-java-1.x/modules/binding-jsonrpc-js/pom.xml
index 20ecfed943..843484e776 100644
--- a/branches/sca-java-1.x/modules/binding-jsonrpc-js/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-jsonrpc-js/pom.xml
@@ -38,7 +38,7 @@
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-web</artifactId>
+            <artifactId>tuscany-web-javascript</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>    
     
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml b/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml
index dd2d082277..7d2b3c1f3d 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml
@@ -38,7 +38,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-web</artifactId>
+            <artifactId>tuscany-web-javascript</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>           
 
diff --git a/branches/sca-java-1.x/modules/pom.xml b/branches/sca-java-1.x/modules/pom.xml
index b86fed023d..2374e6e538 100644
--- a/branches/sca-java-1.x/modules/pom.xml
+++ b/branches/sca-java-1.x/modules/pom.xml
@@ -97,8 +97,6 @@
                 <module>core-databinding</module>
                 <module>core-spi</module>
                 <module>core-spring</module>
-                <module>core-web</module>
-                <module>core-web-dojo</module>
                 <module>data-api</module>
                 <module>databinding</module>
                 <module>databinding-axiom</module>
@@ -192,6 +190,8 @@
                 <!--module>runtime-war</module-->
                 <module>sca-api</module>
                 <module>sca-api-extension</module>
+                <module>web-javascript</module>
+                <module>web-javascript-dojo</module>                
                 <module>workspace</module>
                 <module>workspace-impl</module>
                 <module>workspace-xml</module>
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/LICENSE b/branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/LICENSE
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/NOTICE b/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/NOTICE
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
index 60f0657d68..60f0657d68 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/pom.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml
index dab6371721..5009bcb22c 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/pom.xml
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-core-web-dojo</artifactId>
+    <artifactId>tuscany-web-javascript-dojo</artifactId>
     <name>Apache Tuscany SCA Core Web</name>
 
     <dependencies>
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java
index 40cb459a03..40cb459a03 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java
index ce037283f6..ce037283f6 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index cddc129c57..cddc129c57 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.x/modules/core-web-dojo/src/main/resources/tuscany/AtomService.js b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
index 5374be80d1..5374be80d1 100644
--- a/branches/sca-java-1.x/modules/core-web-dojo/src/main/resources/tuscany/AtomService.js
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
diff --git a/branches/sca-java-1.x/modules/core-web/LICENSE b/branches/sca-java-1.x/modules/web-javascript/LICENSE
index 6e529a25c4..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/core-web/LICENSE
+++ b/branches/sca-java-1.x/modules/web-javascript/LICENSE
@@ -1,205 +1,205 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) 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. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   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.

-

-

-

+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) 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. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+
diff --git a/branches/sca-java-1.x/modules/core-web/NOTICE b/branches/sca-java-1.x/modules/web-javascript/NOTICE
index 1325efd8bf..fdfa0e9faa 100644
--- a/branches/sca-java-1.x/modules/core-web/NOTICE
+++ b/branches/sca-java-1.x/modules/web-javascript/NOTICE
@@ -1,6 +1,6 @@
-${pom.name}

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

-

-This product includes software developed by

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

-

+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-java-1.x/modules/core-web/pom.xml b/branches/sca-java-1.x/modules/web-javascript/pom.xml
index 0e755dc28a..42da492d2f 100644
--- a/branches/sca-java-1.x/modules/core-web/pom.xml
+++ b/branches/sca-java-1.x/modules/web-javascript/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-core-web</artifactId>
+    <artifactId>tuscany-web-javascript</artifactId>
     <name>Apache Tuscany SCA Core Web</name>
 
     <dependencies>
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGenerator.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGenerator.java
index 2f9ba42bc4..2f9ba42bc4 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGenerator.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGenerator.java
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGeneratorExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGeneratorExtensionPoint.java
index c2cba59362..c2cba59362 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGeneratorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGeneratorExtensionPoint.java
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/DefaultComponentJavaScriptGeneratorExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultComponentJavaScriptGeneratorExtensionPoint.java
index 121baba47b..121baba47b 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/DefaultComponentJavaScriptGeneratorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultComponentJavaScriptGeneratorExtensionPoint.java
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/DefaultJavascriptProxyFactoryExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultJavascriptProxyFactoryExtensionPoint.java
index 1c6097834f..1c6097834f 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/DefaultJavascriptProxyFactoryExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultJavascriptProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactory.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactory.java
index daac7925bd..daac7925bd 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactory.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactory.java
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactoryExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactoryExtensionPoint.java
index c396a02b30..c396a02b30 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactoryExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint
index cfe4491670..cfe4491670 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint
index 81328476cc..81328476cc 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint
diff --git a/branches/sca-java-1.x/modules/core-web/src/main/resources/core-web-validation-messages.properties b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/core-web-validation-messages.properties
index dbc7317653..dbc7317653 100644
--- a/branches/sca-java-1.x/modules/core-web/src/main/resources/core-web-validation-messages.properties
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/core-web-validation-messages.properties