From c64843596c20e81802eef543fd2c51216d9c7d96 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 3 Apr 2009 08:22:24 +0000 Subject: TUSCANY-2878 - Changes to support new JavaScript Generator extension point and new generators for tuscany specific scripts and dojo toolkit git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@761562 13f79535-47bb-0310-9956-ffa450edef68 --- .../implementation-widget-runtime-dojo/LICENSE | 205 +++++++++++++++++++++ .../implementation-widget-runtime-dojo/NOTICE | 6 + .../implementation-widget-runtime-dojo/pom.xml | 67 +++++++ ...scany.sca.core.web.ComponentJavaScriptGenerator | 19 ++ .../implementation-widget-runtime-tuscany/LICENSE | 205 +++++++++++++++++++++ .../implementation-widget-runtime-tuscany/NOTICE | 6 + .../implementation-widget-runtime-tuscany/pom.xml | 68 +++++++ .../TuscanyJavaScriptComponentGeneratorImpl.java | 203 ++++++++++++++++++++ ...scany.sca.core.web.ComponentJavaScriptGenerator | 19 ++ .../provider/WidgetComponentScriptServlet.java | 21 +-- .../provider/WidgetImplementationInvoker.java | 25 +-- .../provider/WidgetImplementationProvider.java | 12 +- .../WidgetImplementationProviderFactory.java | 14 +- 13 files changed, 835 insertions(+), 35 deletions(-) create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java create mode 100644 branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator (limited to 'branches') diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE new file mode 100644 index 0000000000..8aa906c321 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE @@ -0,0 +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. + + + diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE new file mode 100644 index 0000000000..fdfa0e9faa --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE @@ -0,0 +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/). + diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml new file mode 100644 index 0000000000..3406586522 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.5-SNAPSHOT + ../pom.xml + + + tuscany-implementation-widget-runtime-dojo + Apache Tuscany SCA Atom Feed Binding JavaScript + + + + org.apache.tuscany.sca + tuscany-implementation-widget-runtime + 1.5-SNAPSHOT + + + + junit + junit + 4.5 + test + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + ${tuscany.version} + org.apache.tuscany.sca.binding.atom-js + ${pom.name} + org.apache.tuscany.sca.binding.atom.js* + org.apache.tuscany.sca.assembly.xml;version="1.4", * + + + + + + + diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator new file mode 100644 index 0000000000..3f503c24ee --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator @@ -0,0 +1,19 @@ +# 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. + +# Implementation class for the Javascript Generator +org.apache.tuscany.sca.implementation.widget.dojo.DojoJavaScriptComponentGeneratorImpl \ No newline at end of file diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE new file mode 100644 index 0000000000..8aa906c321 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE @@ -0,0 +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. + + + diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE new file mode 100644 index 0000000000..fdfa0e9faa --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE @@ -0,0 +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/). + diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml new file mode 100644 index 0000000000..5a2e5927d1 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml @@ -0,0 +1,68 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.5-SNAPSHOT + ../pom.xml + + + tuscany-implementation-widget-runtime-tuscany + Apache Tuscany SCA Atom Feed Binding JavaScript + + + + org.apache.tuscany.sca + tuscany-implementation-widget-runtime + 1.5-SNAPSHOT + + + + junit + junit + 4.5 + test + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + ${tuscany.version} + org.apache.tuscany.sca.binding.atom-js + ${pom.name} + org.apache.tuscany.sca.binding.atom.js* + org.apache.tuscany.sca.assembly.xml;version="1.4", * + + + + + + + diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java new file mode 100644 index 0000000000..c6ecfd3620 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java @@ -0,0 +1,203 @@ +/* + * 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. + */ + +package org.apache.tuscany.sca.implementation.widget.tuscany; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.ComponentProperty; +import org.apache.tuscany.sca.assembly.ComponentReference; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator; +import org.apache.tuscany.sca.core.web.JavascriptProxyFactory; +import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint; +import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +public class TuscanyJavaScriptComponentGeneratorImpl implements ComponentJavaScriptGenerator { + private static final QName NAME = new QName("http://tuscany.apache.org/xmlns/sca/1.0", "component.script.generator.tuscany"); + + private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories; + + public TuscanyJavaScriptComponentGeneratorImpl(ExtensionPointRegistry extensionPoints) { + this.javascriptProxyFactories = extensionPoints.getExtensionPoint(JavascriptProxyFactoryExtensionPoint.class); + } + + public QName getQName() { + return NAME; + } + + public void generateJavaScriptCode(RuntimeComponent component, PrintWriter pw) throws IOException { + pw.println(); + pw.println("/* Apache Tuscany SCA Widget header */"); + pw.println(); + + Map bindingClientProcessed = new HashMap(); + + for(ComponentReference reference : component.getReferences()) { + for(Binding binding : reference.getBindings()) { + JavascriptProxyFactory jsProxyFactory = javascriptProxyFactories.getProxyFactory(binding.getClass()); + + String bindingProxyName = jsProxyFactory.getJavascriptProxyFile(); + //check if binding client code was already processed and inject to the generated script + if(bindingProxyName != null) { + Boolean processedFlag = bindingClientProcessed.get(bindingProxyName); + if( processedFlag == null || processedFlag.booleanValue() == false) { + generateJavaScriptBindingProxy(jsProxyFactory, pw); + bindingClientProcessed.put(bindingProxyName, Boolean.TRUE); + } + } + + } + } + + pw.println(); + pw.println("/* Tuscany Reference/Property injection code */"); + pw.println(); + + + //define tuscany.sca namespace + generateJavaScriptNamespace(pw); + + pw.println(); + + //process properties + generateJavaScriptPropertyFunction(component, pw); + + pw.println(); + + //process references + generateJavaScriptReferenceFunction(component, javascriptProxyFactories,pw); + + + pw.println(); + pw.println("/** End of Apache Tuscany SCA Widget */"); + pw.println(); + pw.flush(); + pw.close(); + } + + + /** + * Retrieve the binding proxy based on the bind name + * and embedded the JavaScript into this js + */ + private static void generateJavaScriptBindingProxy(JavascriptProxyFactory javascriptProxyFactory, PrintWriter pw) throws IOException { + InputStream is = javascriptProxyFactory.getJavascriptProxyFileAsStream(); + if (is != null) { + int i; + while ((i = is.read()) != -1) { + pw.write(i); + } + } + + pw.println(); + pw.println(); + } + + /** + * Generate the tuscany.sca namespace if not yet available + * @param pw + * @throws IOException + */ + private static void generateJavaScriptNamespace(PrintWriter pw) throws IOException { + pw.println("if (!tuscany) { \n" + + "var tuscany = {}; \n" + + "}"); + pw.println("if (!tuscany.sca) { \n" + + "tuscany.sca = {}; \n" + + "}"); + } + + /** + * Generate JavaScript code to inject SCA Properties + * @param pw + * @throws IOException + */ + private static void generateJavaScriptPropertyFunction(RuntimeComponent component, PrintWriter pw) throws IOException { + pw.println("tuscany.sca.propertyMap = new String();"); + for(ComponentProperty property : component.getProperties()) { + String propertyName = property.getName(); + + pw.println("tuscany.sca.propertyMap." + propertyName + " = \"" + getPropertyValue(property) + "\""); + } + + pw.println("tuscany.sca.Property = function (name) {"); + pw.println(" return tuscany.sca.propertyMap[name];"); + pw.println("}"); + } + + /** + * Convert property value to String + * @param property + * @return + */ + private static String getPropertyValue(ComponentProperty property) { + Document doc = (Document)property.getValue(); + Element rootElement = doc.getDocumentElement(); + + String value = null; + + //FIXME : Provide support for isMany and other property types + + if (rootElement.getChildNodes().getLength() > 0) { + value = rootElement.getChildNodes().item(0).getTextContent(); + } + + return value; + } + + + + /** + * Generate JavaScript code to inject SCA References + * @param pw + * @throws IOException + */ + private static void generateJavaScriptReferenceFunction (RuntimeComponent component, JavascriptProxyFactoryExtensionPoint javascriptProxyFactories, PrintWriter pw) throws IOException { + + pw.println("tuscany.sca.referenceMap = new Object();"); + for(ComponentReference reference : component.getReferences()) { + Binding binding = reference.getBindings().get(0); + + if (binding != null) { + + String referenceName = reference.getName(); + JavascriptProxyFactory jsProxyFactory = javascriptProxyFactories.getProxyFactory(binding.getClass()); + + pw.println("tuscany.sca.referenceMap." + referenceName + " = new " + jsProxyFactory.createJavascriptReference(reference) + ";"); + + } + } + + pw.println("tuscany.sca.Reference = function (name) {"); + pw.println(" return tuscany.sca.referenceMap[name];"); + pw.println("}"); + } + + +} diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator new file mode 100644 index 0000000000..b98b940b47 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator @@ -0,0 +1,19 @@ +# 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. + +# Implementation class for the Javascript Generator +org.apache.tuscany.sca.implementation.widget.tuscany.TuscanyJavaScriptComponentGeneratorImpl \ No newline at end of file diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java index 819159d553..45cb86bf4d 100644 --- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java @@ -20,17 +20,16 @@ package org.apache.tuscany.sca.implementation.widget.provider; import java.io.IOException; -import java.net.URISyntaxException; +import java.io.PrintWriter; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint; - /** * Servlet to handle requests for the widget component .js script. @@ -40,7 +39,7 @@ import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint; public class WidgetComponentScriptServlet extends HttpServlet { private static final long serialVersionUID = 2454705532282398190L; - private transient JavascriptProxyFactoryExtensionPoint javascriptProxyFactories; + private transient ComponentJavaScriptGenerator javaScriptgenerator; private transient RuntimeComponent component; @@ -48,18 +47,16 @@ public class WidgetComponentScriptServlet extends HttpServlet { * Constructor receiving the runtimeComponent reference that is going to be used to generate the widget client js * @param component */ - public WidgetComponentScriptServlet(RuntimeComponent component, JavascriptProxyFactoryExtensionPoint javascriptProxyFactories) { + public WidgetComponentScriptServlet(RuntimeComponent component, ComponentJavaScriptGenerator javaScriptgenerator) { this.component = component; - this.javascriptProxyFactories = javascriptProxyFactories; + this.javaScriptgenerator = javaScriptgenerator; } @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - try { - ServletOutputStream os = response.getOutputStream(); - WidgetComponentScriptGenerator.generateWidgetCode(component, javascriptProxyFactories, os); - }catch(URISyntaxException e) { - throw new IOException("Invalid uri creating JavaScript resource"); - } + ServletOutputStream os = response.getOutputStream(); + PrintWriter pw = new PrintWriter(os); + + javaScriptgenerator.generateJavaScriptCode(component, pw); } } diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java index 9d5fa7ae5b..b6b7ae907b 100644 --- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java @@ -19,13 +19,15 @@ package org.apache.tuscany.sca.implementation.widget.provider; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.PrintWriter; import java.net.MalformedURLException; -import java.net.URISyntaxException; import java.net.URL; -import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint; +import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.RuntimeComponent; @@ -38,14 +40,14 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; */ class WidgetImplementationInvoker implements Invoker { private RuntimeComponent component; - private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories; + private ComponentJavaScriptGenerator javaScriptGenerator; private String widgetName; private String widgetFolderURL; private String widgetLocationURL; - WidgetImplementationInvoker(RuntimeComponent component, JavascriptProxyFactoryExtensionPoint javascriptProxyFactories, String widgetName, String widgetFolderURL, String widgetLocationURL) { + WidgetImplementationInvoker(RuntimeComponent component, ComponentJavaScriptGenerator javaScriptGenerator, String widgetName, String widgetFolderURL, String widgetLocationURL) { this.component = component; - this.javascriptProxyFactories = javascriptProxyFactories; + this.javaScriptGenerator = javaScriptGenerator; this.widgetName = widgetName + ".js"; this.widgetFolderURL = widgetFolderURL; this.widgetLocationURL = widgetLocationURL; @@ -67,7 +69,13 @@ class WidgetImplementationInvoker implements Invoker { } else if (id.equals(widgetName)) { // Generate JavaScript header for use in the Widget - InputStream is = WidgetComponentScriptGenerator.generateWidgetCode(component, javascriptProxyFactories); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + PrintWriter pw = new PrintWriter(bos); + + javaScriptGenerator.generateJavaScriptCode(component, pw); + + InputStream is = new ByteArrayInputStream(bos.toByteArray()); + msg.setBody(is); } else { @@ -83,11 +91,6 @@ class WidgetImplementationInvoker implements Invoker { // Report exception as a fault msg.setFaultBody(e); - } catch (URISyntaxException e) { - - // Report exception as a fault - msg.setFaultBody(e); - } catch (IOException e) { // Report exception as a fault diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java index 8f1511f483..81341ac1d6 100644 --- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java @@ -23,7 +23,7 @@ import java.net.URI; import javax.servlet.Servlet; import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint; +import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator; import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.implementation.widget.WidgetImplementation; import org.apache.tuscany.sca.interfacedef.Operation; @@ -42,7 +42,7 @@ class WidgetImplementationProvider implements ImplementationProvider { private RuntimeComponent component; - private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories; + private ComponentJavaScriptGenerator javaScriptGenerator; private ServletHost servletHost; private String widgetLocationURL; @@ -56,11 +56,11 @@ class WidgetImplementationProvider implements ImplementationProvider { */ WidgetImplementationProvider(RuntimeComponent component, WidgetImplementation implementation, - JavascriptProxyFactoryExtensionPoint javascriptProxyFactories, + ComponentJavaScriptGenerator javaScriptGenerator, ServletHost servletHost) { this.component = component; - this.javascriptProxyFactories = javascriptProxyFactories; + this.javaScriptGenerator = javaScriptGenerator; this.servletHost = servletHost; widgetLocationURL = implementation.getLocationURL().toString(); @@ -71,7 +71,7 @@ class WidgetImplementationProvider implements ImplementationProvider { } public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(component, javascriptProxyFactories, widgetName, widgetFolderURL, widgetLocationURL); + WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(component, javaScriptGenerator, widgetName, widgetFolderURL, widgetLocationURL); return invoker; } @@ -88,7 +88,7 @@ class WidgetImplementationProvider implements ImplementationProvider { Servlet servlet = servletHost.getServletMapping(scriptURI); if (servlet == null /*|| servlet instanceof HTTPGetListenerServlet*/) { WidgetComponentScriptServlet widgetScriptServlet; - widgetScriptServlet = new WidgetComponentScriptServlet(this.component, javascriptProxyFactories); + widgetScriptServlet = new WidgetComponentScriptServlet(this.component, javaScriptGenerator); servletHost.addServletMapping(scriptURI, widgetScriptServlet); } else { System.out.println(">>>Servlet::" + servlet.getClass().toString()); diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java index 3cc1a64a68..f31e42a0ed 100644 --- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java +++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java @@ -19,7 +19,8 @@ package org.apache.tuscany.sca.implementation.widget.provider; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint; +import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator; +import org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint; import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.implementation.widget.WidgetImplementation; @@ -34,9 +35,8 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; */ public class WidgetImplementationProviderFactory implements ImplementationProviderFactory { private ServletHost servletHost; - private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories; - - + private ComponentJavaScriptGenerator javaScriptGenerator; + /** * Constructs a resource implementation. */ @@ -44,11 +44,13 @@ public class WidgetImplementationProviderFactory implements ImplementationProvid ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class); this.servletHost = servletHosts.getServletHosts().get(0); - this.javascriptProxyFactories = extensionPoints.getExtensionPoint(JavascriptProxyFactoryExtensionPoint.class); + ComponentJavaScriptGeneratorExtensionPoint javascriptGeneratorExtensionPoint = extensionPoints.getExtensionPoint(ComponentJavaScriptGeneratorExtensionPoint.class); + javaScriptGenerator = javascriptGeneratorExtensionPoint.getComponentJavaScriptGenerators().get(0); + } public ImplementationProvider createImplementationProvider(RuntimeComponent component, WidgetImplementation implementation) { - return new WidgetImplementationProvider(component, implementation, javascriptProxyFactories, servletHost); + return new WidgetImplementationProvider(component, implementation, javaScriptGenerator, servletHost); } public Class getModelType() { -- cgit v1.2.3