From c0bef68247bd8a6d0bbbe7c9f07cc927ca2861d2 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:41:56 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245041 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0-Beta1-RC3/modules/web-javascript/LICENSE | 205 ------------------ .../modules/web-javascript/META-INF/MANIFEST.MF | 19 -- .../2.0-Beta1-RC3/modules/web-javascript/NOTICE | 6 - .../2.0-Beta1-RC3/modules/web-javascript/pom.xml | 46 ---- .../javascript/ComponentJavaScriptGenerator.java | 60 ------ ...ComponentJavaScriptGeneratorExtensionPoint.java | 57 ----- ...ComponentJavaScriptGeneratorExtensionPoint.java | 158 -------------- ...efaultJavascriptProxyFactoryExtensionPoint.java | 231 --------------------- .../sca/web/javascript/JavascriptProxyFactory.java | 79 ------- .../JavascriptProxyFactoryExtensionPoint.java | 57 ----- ...ript.ComponentJavaScriptGeneratorExtensionPoint | 18 -- ...javascript.JavascriptProxyFactoryExtensionPoint | 18 -- .../web-javascript-validation-messages.properties | 21 -- 13 files changed, 975 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/LICENSE delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/META-INF/MANIFEST.MF delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/NOTICE delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties (limited to 'sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/LICENSE b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - 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/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/META-INF/MANIFEST.MF deleted file mode 100644 index 1bb885ab2c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -SCA-Version: 1.1 -Bundle-Name: Apache Tuscany SCA Web JavaScript -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA Web JavaScript -Import-Package: javax.xml.namespace, - org.apache.tuscany.sca.assembly;version="2.0.0", - org.apache.tuscany.sca.assembly.xml;version="2.0.0", - org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.extensibility, - org.apache.tuscany.sca.monitor;version="2.0.0", - org.apache.tuscany.sca.runtime;version="2.0.0" -Bundle-SymbolicName: org.apache.tuscany.sca.core.web.javascript -Bundle-DocURL: http://www.apache.org/ -Export-Package: org.apache.tuscany.sca.web.javascript;version="2.0.0" - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/NOTICE b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/NOTICE deleted file mode 100644 index ad2ba40961..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2010 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/pom.xml deleted file mode 100644 index 6b9447759b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-Beta1 - ../pom.xml - - - tuscany-web-javascript - Apache Tuscany SCA Web JavaScript - - - - org.apache.tuscany.sca - tuscany-core - 2.0-Beta1 - - - - junit - junit - 4.8.1 - test - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java deleted file mode 100644 index d0576b4468..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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.web.javascript; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.runtime.RuntimeComponent; - - -/** - * Widget component script generator interface - * This generates the necessary JavaScript client code into a single JavaScript per component - * - * @version $Rev$ $Date$ - * @tuscany.spi.extension.asclient - */ -public interface ComponentJavaScriptGenerator { - - /** - * Return the QName that identify the Component script generator - * This is used to identify different generators supporting different JavaScript frameworks - * - * @return The QName - */ - QName getQName(); - - /** - * Generate the Java Script code for a given component - * - generate/append client proxyies as needed - * - generate tuscany namespace as needed - * - generate properties for JavaScript injection - * - generate references for JavaScript injection - * - * @param component The SCA Component to be used - * @param pw A Print Writer where the script should be written to - * @throws IOException - */ - void generateJavaScriptCode(RuntimeComponent component, PrintWriter pw) throws IOException; - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java deleted file mode 100644 index ed42ce0e47..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.web.javascript; - -import java.util.List; - -import javax.xml.namespace.QName; - -/** - * Widget component script generator extension pointinterface - * - * @version $Rev$ $Date$ - * @tuscany.spi.extension.asclient - */ -public interface ComponentJavaScriptGeneratorExtensionPoint { - - /** - * Add a component script generator - * @param componentScriptGenerator - */ - void addComponentJavaScriptGenerator(ComponentJavaScriptGenerator componentScriptGenerator); - - /** - * Remove a component script generator - * @param componentScriptGenerator - */ - void removeComponentJavaScriptGenerator(ComponentJavaScriptGenerator componentScriptGenerator); - - /** - * Get a component scrpt generator instance based on QName - * @param bindingName - * @return - */ - ComponentJavaScriptGenerator getComponentJavaScriptGenerator(QName bindingName); - - /** - * Get a list of component script generator instances - */ - List getComponentJavaScriptGenerators(); -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java deleted file mode 100644 index 55326b539e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * 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.web.javascript; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; - - -/** - * Default extension point for widget component script generator - * - * @version $Rev$ $Date$ - */ -public class DefaultComponentJavaScriptGeneratorExtensionPoint implements ComponentJavaScriptGeneratorExtensionPoint { - private final List generators = new ArrayList(); - private final Map generatorsByQName = new HashMap(); - - private ExtensionPointRegistry extensionPoints; - private Monitor monitor = null; - - private boolean loaded = false; - - public DefaultComponentJavaScriptGeneratorExtensionPoint(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); - if (monitorFactory != null) { - this.monitor = monitorFactory.createMonitor(); - } - } - - /** - * Report a exception. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Exception ex) { - /* - if (monitor != null) { - Problem problem = - monitor.createProblem(this.getClass().getName(), - Messages.RESOURCE_BUNDLE, - Severity.ERROR, - model, - message, - ex); - monitor.problem(problem); - } - */ - } - - public void addComponentJavaScriptGenerator(ComponentJavaScriptGenerator componentScriptGenerator) { - if (componentScriptGenerator.getQName() != null) { - generatorsByQName.put(componentScriptGenerator.getQName(), componentScriptGenerator); - } - - generators.add(componentScriptGenerator); - } - - public void removeComponentJavaScriptGenerator(ComponentJavaScriptGenerator componentScriptGenerator) { - if (componentScriptGenerator.getQName() != null) { - generatorsByQName.remove(componentScriptGenerator.getQName()); - } - - generators.remove(componentScriptGenerator); - } - - - public ComponentJavaScriptGenerator getComponentJavaScriptGenerator(QName bindingName) { - loadFactories(); - return generatorsByQName.get(bindingName); - } - - public List getComponentJavaScriptGenerators() { - loadFactories(); - return this.generators; - } - - /** - * Private Utility methods - */ - - - /** - * Lazily load artifact processors registered in the extension point. - */ - @SuppressWarnings("unchecked") - private synchronized void loadFactories() { - if (loaded) { - return; - } - - // Get the proxy factories declarations - Collection factoryDeclarations = null; - try { - factoryDeclarations = extensionPoints.getServiceDiscovery().getServiceDeclarations(ComponentJavaScriptGenerator.class); - } catch (IOException e) { - IllegalStateException ie = new IllegalStateException(e); - error("IllegalStateException", factoryDeclarations, ie); - throw ie; - } - - for (ServiceDeclaration processorDeclaration : factoryDeclarations) { - // Create a factory, and register it - ComponentJavaScriptGenerator generator = null; - try { - Class generatorClass = processorDeclaration.loadClass(); - - Constructor constructor = generatorClass.getConstructor(ExtensionPointRegistry.class); - generator = constructor.newInstance(extensionPoints); - - } catch (Exception e) { - IllegalStateException ie = new IllegalStateException(e); - error("IllegalStateException", generator, ie); - throw ie; - } - - addComponentJavaScriptGenerator(generator); - } - - loaded = true; - } - - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java deleted file mode 100644 index 402eb53bb0..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * 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.web.javascript; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; - -/** - * Default extension point for javascript proxy factories - * - * @version $Rev$ $Date$ - */ -public class DefaultJavascriptProxyFactoryExtensionPoint implements JavascriptProxyFactoryExtensionPoint { - private final Map factoriesByQName = new HashMap(); - private final Map, JavascriptProxyFactory> factoriesByType = new HashMap, JavascriptProxyFactory>(); - - private Monitor monitor = null; - private ExtensionPointRegistry registry; - private boolean loaded = false; - - public DefaultJavascriptProxyFactoryExtensionPoint(ExtensionPointRegistry extensionPoints) { - this.registry = extensionPoints; - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); - if (monitorFactory != null) { - this.monitor = monitorFactory.createMonitor(); - } - } - - /** - * Report a exception. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Exception ex) { - /* - if (monitor != null) { - Problem problem = - monitor.createProblem(this.getClass().getName(), - Messages.RESOURCE_BUNDLE, - Severity.WARNING, - model, - message, - (Object[])messageParameters); - monitor.problem(problem); - } - */ - } - - public void addProxyFactory(JavascriptProxyFactory javascriptProxyfactory) { - if (javascriptProxyfactory.getModelType() != null) { - factoriesByType.put(javascriptProxyfactory.getModelType(), javascriptProxyfactory); - } - if (javascriptProxyfactory.getQName() != null) { - factoriesByQName.put(javascriptProxyfactory.getQName(), javascriptProxyfactory); - } - } - - public void removeProxyFactory(JavascriptProxyFactory javascriptProxyfactory) { - if (javascriptProxyfactory.getModelType() != null) { - factoriesByType.remove(javascriptProxyfactory.getModelType()); - } - if (javascriptProxyfactory.getQName() != null) { - factoriesByQName.remove(javascriptProxyfactory.getQName()); - } - } - - public JavascriptProxyFactory getProxyFactory(QName bindingName) { - loadFactories(); - return factoriesByQName.get(bindingName); - } - - public JavascriptProxyFactory getProxyFactory(Class bindingType) { - loadFactories(); - Class[] classes = bindingType.getInterfaces(); - for (Class c : classes) { - JavascriptProxyFactory proxyFactory = factoriesByType.get(c); - if (proxyFactory != null) { - return proxyFactory; - } - } - - //here we didn't find the proxy factory for the biding - JavascriptProxyFactory factory = null; - if (bindingType.isInterface()) { - // Dynamically load a factory class declared under META-INF/services - try { - Class factoryClass = registry.getServiceDiscovery().getServiceDeclaration(bindingType).getClass(); - if (factoryClass != null) { - - try { - // Default empty constructor - Constructor constructor = factoryClass.getConstructor(); - factory = (JavascriptProxyFactory) constructor.newInstance(); - } catch (NoSuchMethodException e) { - - // Constructor taking the model factory extension point - Constructor constructor = factoryClass.getConstructor(FactoryExtensionPoint.class); - factory = (JavascriptProxyFactory) constructor.newInstance(this); - } - - // Cache the loaded factory - addProxyFactory(factory); - } - } catch (Exception e) { - throw new IllegalArgumentException(e); - } - } else { - - // Call the newInstance static method on the factory abstract class - try { - factory = (JavascriptProxyFactory) ServiceDiscovery.getInstance().getServiceDeclaration(bindingType); - } catch (Exception e) { - throw new IllegalArgumentException(e); - } - - // Cache the factory - addProxyFactory(factory); - } - - return factory; - } - - /** - * Private Utility methods - */ - - /** - * Returns a QName object from a QName expressed as {ns}name - * or ns#name. - * - * @param qname - * @return - */ - private static QName getQName(String qname) { - if (qname == null) { - return null; - } - qname = qname.trim(); - if (qname.startsWith("{")) { - int h = qname.indexOf('}'); - if (h != -1) { - return new QName(qname.substring(1, h), qname.substring(h + 1)); - } - } else { - int h = qname.indexOf('#'); - if (h != -1) { - return new QName(qname.substring(0, h), qname.substring(h + 1)); - } - } - throw new IllegalArgumentException("Invalid qname: "+qname); - } - - /** - * Lazily load artifact processors registered in the extension point. - */ - private synchronized void loadFactories() { - if (loaded) { - return; - } - - // Get the proxy factories declarations - Collection factoryDeclarations = null; - try { - factoryDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(JavascriptProxyFactory.class); - } catch (IOException e) { - IllegalStateException ie = new IllegalStateException(e); - error("IllegalStateException", factoryDeclarations, ie); - throw ie; - } - - for (ServiceDeclaration processorDeclaration : factoryDeclarations) { - Map attributes = processorDeclaration.getAttributes(); - - // Load a StAX artifact processor - - // Get the model QName - QName artifactType = getQName(attributes.get("qname")); - - // Get the model class name - String modelTypeName = attributes.get("model"); - - // Create a factory, and register it - JavascriptProxyFactory proxyFactory = null; - try { - proxyFactory = (JavascriptProxyFactory) processorDeclaration.loadClass().newInstance(); - } catch (Exception e) { - IllegalStateException ie = new IllegalStateException(e); - error("IllegalStateException", proxyFactory, ie); - throw ie; - } - - addProxyFactory(proxyFactory); - } - - loaded = true; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java deleted file mode 100644 index fda093d9aa..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.web.javascript; - -import java.io.IOException; -import java.io.InputStream; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.ComponentReference; - -/** - * Javascript Proxy Factory used to allow Web related bindings to generate - * client js proxyies - * - * @version $Rev$ $Date$ - * @tuscany.spi.extension.asclient - */ -public interface JavascriptProxyFactory { - - /** - * The binding model type associated with this factory - * @return the binding model type - */ - Class getModelType(); - - /** - * The binding qname associated with this factory - * @return the binding qname - */ - QName getQName(); - - /** - * Get the Javascript proxy client file name - * @return the javascript file name - */ - String getJavascriptProxyFile(); - - /** - * Get the Javascript proxy client contents as a stream - * @return - */ - InputStream getJavascriptProxyFileAsStream() throws IOException; - - /** - * Create any necessary JavaScript imports/headers necessary for the extension to work - * This is useful in case of Dojo that need to generate the requires statements to load the dependencies - * - * @param componentReference - * @return - * @throws IOException - */ - String createJavascriptHeader(ComponentReference componentReference) throws IOException; - - /** - * Create a JavaScript Proxy for a given reference - * @param componentReference The reference - * @return the javascript proxy code - * @throws IOException - */ - String createJavascriptReference(ComponentReference componentReference) throws IOException; -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java deleted file mode 100644 index 5856c15a9b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.web.javascript; - -import javax.xml.namespace.QName; - -/** - * - * @tuscany.spi.extension.asclient - * - */ -public interface JavascriptProxyFactoryExtensionPoint { - /** - * Add Javascript proxy factory - * - * @param javascriptProxyfactory The Javascript proxy factory - */ - void addProxyFactory(JavascriptProxyFactory javascriptProxyfactory); - - /** - * Remove Javascript proxy factory - * - * @param javascriptProxyfactory The Javascript proxy fatory - */ - void removeProxyFactory(JavascriptProxyFactory javascriptProxyfactory); - - /** - * Returns the Javascript proxy factory associated with the given QName - * @param bindingName - * @return - */ - JavascriptProxyFactory getProxyFactory(QName bindingName); - - /** - * Returns the Javascript proxy factory associated with the given Type - * @param bindingType - * @return - */ - JavascriptProxyFactory getProxyFactory(Class bindingType); -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint deleted file mode 100644 index 6a28e3481d..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -org.apache.tuscany.sca.web.javascript.DefaultComponentJavaScriptGeneratorExtensionPoint diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint deleted file mode 100644 index 95a7cecd2b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -org.apache.tuscany.sca.web.javascript.DefaultJavascriptProxyFactoryExtensionPoint diff --git a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties b/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties deleted file mode 100644 index dbc7317653..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC3/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties +++ /dev/null @@ -1,21 +0,0 @@ -# -# -# 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. -# -# -IllegalArgumentException = Invalid qname: {0} -- cgit v1.2.3