You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/04/03 10:22:25 UTC
svn commit: r761562 - in /tuscany/branches/sca-java-1.x/modules:
implementation-widget-runtime-dojo/ implementation-widget-runtime-dojo/src/
implementation-widget-runtime-dojo/src/main/
implementation-widget-runtime-dojo/src/main/resources/ implementat...
Author: lresende
Date: Fri Apr 3 08:22:24 2009
New Revision: 761562
URL: http://svn.apache.org/viewvc?rev=761562&view=rev
Log:
TUSCANY-2878 - Changes to support new JavaScript Generator extension point and new generators for tuscany specific scripts and dojo toolkit
Added:
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java (with props)
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE Fri Apr 3 08:22:24 2009
@@ -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.
+
+
+
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/LICENSE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE Fri Apr 3 08:22:24 2009
@@ -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/).
+
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml Fri Apr 3 08:22:24 2009
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
+ <name>Apache Tuscany SCA Atom Feed Binding JavaScript</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget-runtime</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <configuration>
+ <instructions>
+ <Bundle-Version>${tuscany.version}</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom-js</Bundle-SymbolicName>
+ <Bundle-Description>${pom.name}</Bundle-Description>
+ <Export-Package>org.apache.tuscany.sca.binding.atom.js*</Export-Package>
+ <Import-Package>org.apache.tuscany.sca.assembly.xml;version="1.4", *</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator Fri Apr 3 08:22:24 2009
@@ -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
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE Fri Apr 3 08:22:24 2009
@@ -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.
+
+
+
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/LICENSE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE Fri Apr 3 08:22:24 2009
@@ -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/).
+
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml Fri Apr 3 08:22:24 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
+ <name>Apache Tuscany SCA Atom Feed Binding JavaScript</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget-runtime</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <configuration>
+ <instructions>
+ <Bundle-Version>${tuscany.version}</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom-js</Bundle-SymbolicName>
+ <Bundle-Description>${pom.name}</Bundle-Description>
+ <Export-Package>org.apache.tuscany.sca.binding.atom.js*</Export-Package>
+ <Import-Package>org.apache.tuscany.sca.assembly.xml;version="1.4", *</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java Fri Apr 3 08:22:24 2009
@@ -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<String, Boolean> bindingClientProcessed = new HashMap<String, Boolean>();
+
+ 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("}");
+ }
+
+
+}
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator?rev=761562&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator (added)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator Fri Apr 3 08:22:24 2009
@@ -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
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java?rev=761562&r1=761561&r2=761562&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java Fri Apr 3 08:22:24 2009
@@ -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 @@
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 @@
* 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);
}
}
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java?rev=761562&r1=761561&r2=761562&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java Fri Apr 3 08:22:24 2009
@@ -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 @@
*/
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 @@
} 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 @@
// 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
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java?rev=761562&r1=761561&r2=761562&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java Fri Apr 3 08:22:24 2009
@@ -23,7 +23,7 @@
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 @@
private RuntimeComponent component;
- private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories;
+ private ComponentJavaScriptGenerator javaScriptGenerator;
private ServletHost servletHost;
private String widgetLocationURL;
@@ -56,11 +56,11 @@
*/
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 @@
}
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 @@
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());
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java?rev=761562&r1=761561&r2=761562&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java Fri Apr 3 08:22:24 2009
@@ -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 @@
*/
public class WidgetImplementationProviderFactory implements ImplementationProviderFactory<WidgetImplementation> {
private ServletHost servletHost;
- private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories;
-
-
+ private ComponentJavaScriptGenerator javaScriptGenerator;
+
/**
* Constructs a resource implementation.
*/
@@ -44,11 +44,13 @@
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<WidgetImplementation> getModelType() {