From 3b7a9c51b93925c567b6b84450410b2737cc565e Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:41:20 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245037 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/web-javascript-dojo/LICENSE | 238 --------------------- .../web-javascript-dojo/META-INF/MANIFEST.MF | 26 --- .../modules/web-javascript-dojo/NOTICE | 11 - .../modules/web-javascript-dojo/build-dojo.xml | 64 ------ .../modules/web-javascript-dojo/pom.xml | 120 ----------- .../web/javascript/dojo/DojoResourceServlet.java | 95 -------- .../dojo/DojoWidgetJavascriptProvider.java | 106 --------- ...vascript.WidgetImplementationJavascriptProvider | 19 -- .../src/main/resources/tuscany/AtomService.js | 141 ------------ .../src/main/resources/tuscany/RestService.js | 141 ------------ 10 files changed, 961 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/LICENSE delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/META-INF/MANIFEST.MF delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/NOTICE delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/build-dojo.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/RestService.js (limited to 'sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/LICENSE b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/LICENSE deleted file mode 100644 index 422e5f7033..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/LICENSE +++ /dev/null @@ -1,238 +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. - - -========================================================================== - -dojotoolkit V1.3.0: - -The "New" BSD License: -********************** - -Copyright (c) 2005, The Dojo Foundation -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Dojo Foundation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -================================================================================ diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/META-INF/MANIFEST.MF deleted file mode 100644 index 11eca78a2c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/META-INF/MANIFEST.MF +++ /dev/null @@ -1,26 +0,0 @@ -Manifest-Version: 1.0 -SCA-Version: 1.1 -Bundle-Name: Apache Tuscany SCA Web JavaScript (DOJO) -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.servlet, - javax.servlet.http, - 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.common.http;version="2.0.0", - org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.extensibility;version="2.0.0", - org.apache.tuscany.sca.host.http;version="2.0.0", - org.apache.tuscany.sca.implementation.widget.javascript;version="2.0.0", - 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.dojo -Bundle-DocURL: http://www.apache.org/ -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/NOTICE b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/NOTICE deleted file mode 100644 index 55cb8b86a8..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/NOTICE +++ /dev/null @@ -1,11 +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/). - -This product includes dojotoolkit files (http://dojotoolkit.org/) under the -"New" BSD License (see the LICENSE file contained in this distribution) under the -following copyright - Copyright (c) 2005, The Dojo Foundation. All rights reserved. - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/build-dojo.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/build-dojo.xml deleted file mode 100644 index 3a0c0fd87f..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/build-dojo.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/pom.xml deleted file mode 100644 index 7839bfe337..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-Beta1 - ../pom.xml - - - tuscany-web-javascript-dojo - Apache Tuscany SCA Web JavaScript for DOJO - - - - org.apache.tuscany.sca - tuscany-core - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-implementation-widget - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-common-http - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-host-http - 2.0-Beta1 - - - - org.dojotoolkit - dojo - 1.3.0 - zip - - - - javax.servlet - servlet-api - 2.5 - provided - - - - junit - junit - 4.8.1 - test - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-dojo-files - generate-resources - - run - - - - - - - - - - - - clean-dojo-files - clean - - run - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java deleted file mode 100644 index dad72be5f2..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java +++ /dev/null @@ -1,95 +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.dojo; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLDecoder; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.tuscany.sca.common.http.HTTPConstants; -import org.apache.tuscany.sca.common.http.HTTPContentTypeMapper; -import org.apache.tuscany.sca.common.http.HTTPUtil; - - -/** - * A Resource servlet used to serve dojo files - * - * @version $Rev$ $Date$ - */ -public class DojoResourceServlet extends HttpServlet { - private static final long serialVersionUID = -4743631858548812340L; - - public DojoResourceServlet() { - - } - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - String contextRoot = URLDecoder.decode(HTTPUtil.getContextRoot(request), HTTPConstants.CHARACTER_ENCODING_UTF8); - String path = URLDecoder.decode(request.getRequestURI(), HTTPConstants.CHARACTER_ENCODING_UTF8); - - if( path.startsWith(contextRoot + "/dojo") ) { - if( ! path.contains("tuscany/AtomService.js")) { - //this is a workaround where we need to have dojo files in its own folder - //to avoid clean target to clean other non dojo resources - path = path.substring(contextRoot.length()); - path = "/dojo" + path; - } - } else if (path.startsWith(contextRoot)) { - path = path.substring(contextRoot.length() + 1); - } else if( path.startsWith("/")) { - path = path.substring(1); - } - - if(response.getContentType() == null || response.getContentType().length() == 0){ - // Calculate content-type based on extension - String contentType = HTTPContentTypeMapper.getContentType(path); - if(contentType != null && contentType.length() >0) { - response.setContentType(contentType); - } - } - - response.setCharacterEncoding(HTTPConstants.CHARACTER_ENCODING_UTF8); - - // Write the response from the service implementation to the response - // output stream - InputStream is = this.getClass().getClassLoader().getResourceAsStream(path); - if (is == null) { - is = this.getClass().getResourceAsStream(path); - } - if(is != null) { - OutputStream os = response.getOutputStream(); - byte[] buffer = new byte[2048]; - for (;;) { - int n = is.read(buffer); - if (n <= 0) - break; - os.write(buffer, 0, n); - } - os.flush(); - os.close(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java deleted file mode 100644 index e69c2488ec..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java +++ /dev/null @@ -1,106 +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.dojo; - -import java.net.URI; -import java.util.logging.Logger; - -import javax.servlet.Servlet; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostHelper; -import org.apache.tuscany.sca.host.http.ServletMappingException; -import org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider; - -public class DojoWidgetJavascriptProvider implements WidgetImplementationJavascriptProvider { - private final static Logger logger = Logger.getLogger(DojoWidgetJavascriptProvider.class.getName()); - - private static final String dojoBaseUri = URI.create("/dojo").toString(); - private static final String dojoUri = URI.create("/dojo/*").toString(); - - private static final String tuscanyBaseUri = URI.create("/tuscany").toString(); - private static final String tuscanyUri = URI.create("/tuscany/*").toString(); - - private static int counter = 0; - - private ServletHost servletHost; - - public DojoWidgetJavascriptProvider(ExtensionPointRegistry registry) { - this.servletHost = ServletHostHelper.getServletHost(registry); - } - - public void start() { - - if (servletHost == null) { - throw new IllegalStateException("Can't find ServletHost reference !"); - } - - Servlet servlet = null; - - servlet = servletHost.getServletMapping(dojoBaseUri); - if(servlet == null) { - try { - DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dojoBaseUri, baseResourceServlet); - - DojoResourceServlet resourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dojoUri, resourceServlet); - } catch (ServletMappingException me ) { - logger.warning("Dojo already registered at :" + dojoBaseUri); - } - } - - servlet = servletHost.getServletMapping(tuscanyBaseUri); - if(servlet == null) { - try { - DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(tuscanyBaseUri, baseResourceServlet); - - DojoResourceServlet resourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(tuscanyUri, resourceServlet); - } catch (ServletMappingException me ) { - logger.warning("Tuscany dojo extensions already registered at :" + tuscanyBaseUri); - } - } - - counter += 1; - logger.info("Registered Dojo and Tuscany Dojo extensions (counter=" + counter + ")"); - } - - public void stop() { - if(counter > 0) { - counter = counter -= 1; - logger.info("Unregistering Dojo and Tuscany Dojo extensions (counter=" + counter + ")"); - } - - Servlet servlet = servletHost.getServletMapping(dojoBaseUri); - if(servlet != null && counter == 0) { - servletHost.removeServletMapping(dojoBaseUri); - servletHost.removeServletMapping(dojoUri); - - servletHost.removeServletMapping(tuscanyBaseUri); - servletHost.removeServletMapping(tuscanyUri); - } - - servletHost = null; - - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider deleted file mode 100644 index 70d29a5d86..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider +++ /dev/null @@ -1,19 +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. -# -# Implementation class for the ModuleActivator -org.apache.tuscany.sca.web.javascript.dojo.DojoWidgetJavascriptProvider;priority=9999 diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js deleted file mode 100644 index 7b8943ba3b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js +++ /dev/null @@ -1,141 +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. - */ -dojo.provide("tuscany.AtomService"); -dojo.declare("tuscany.AtomService", null, { - url:null, - contentType: "application/atom+xml" /*application/atom+json*/, - contentHandler: "xml" /*json*/, - - constructor: function(args){ - //summary: - //url : Take a string as a url that points to the atom feed - //contentType : Take the contentType to use when retrieving the atom feed - - if(args){ - var argUrl; - var argContentType; - - if( dojo.isArray(args) ) { - argUrl = args[0]; - argContentType = args[1]; - } else { - argUrl = args; - } - - //if the arg is a string, we assume it is a url to the atom feed - if( (dojo.isString(argUrl)) || (argUrl instanceof dojo._Url)){ - if (argUrl instanceof dojo._Url){ - this.url = argUrl + ""; - }else{ - this.url = argUrl; - } - } - - if(argContentType) { - if(dojo.isString(argContentType)) { - if (argContentType == "application/atom+xml") { - this.contentType = argContentType; - this.contentHandler = "xml"; - } else if (argContentType == "application/atom+json") { - this.contentType = argContentType; - this.contentHandler = "json"; - } - } - } - } - }, - - get: function(id /*string*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url + "/" + id, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType} - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrGet(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - return deferred; - }, - - - post: function( entry /*entry object*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType, - "Content-Type": this.contentType}, - postData: entry - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrPost(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - return deferred; - }, - - put: function(id /*string*/, entry /*entry object*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url + "/" + id, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType, - "Content-Type": this.contentType}, - postData: entry - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrPut(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - return deferred; - }, - - del: function(id /*string*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url + "/" + id, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType} - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrDelete(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - - return deferred; - } -}); diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/RestService.js b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/RestService.js deleted file mode 100644 index 132b930d78..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/RestService.js +++ /dev/null @@ -1,141 +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. - */ -dojo.provide("tuscany.RestService"); -dojo.declare("tuscany.RestService", null, { - url:null, - contentType: "application/xml" /*application/json*/, - contentHandler: "xml" /*json*/, - - constructor: function(args){ - //summary: - //url : Take a string as a url that points to the rest endpoint - //contentType : Take the contentType to use when retrieving the rest endpoint - - if(args){ - var argUrl; - var argContentType; - - if( dojo.isArray(args) ) { - argUrl = args[0]; - argContentType = args[1]; - } else { - argUrl = args; - } - - //if the arg is a string, we assume it is a url to the atom feed - if( (dojo.isString(argUrl)) || (argUrl instanceof dojo._Url)){ - if (argUrl instanceof dojo._Url){ - this.url = argUrl + ""; - }else{ - this.url = argUrl; - } - } - - if(argContentType) { - if(dojo.isString(argContentType)) { - if (argContentType == "application/xml") { - this.contentType = argContentType; - this.contentHandler = "xml"; - } else if (argContentType == "application/json") { - this.contentType = argContentType; - this.contentHandler = "json"; - } - } - } - } - }, - - get: function(id /*string*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url + "/" + id, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType} - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrGet(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - return deferred; - }, - - - post: function( entry /*entry object*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType, - "Content-Type": this.contentType}, - postData: entry - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrPost(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - return deferred; - }, - - put: function(id /*string*/, entry /*entry object*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url + "/" + id, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType, - "Content-Type": this.contentType}, - postData: entry - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrPut(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - return deferred; - }, - - del: function(id /*string*/) { - //The parameters to pass to xhrGet, the url, how to handle it, and the callbacks. - var xhrArgs = { - url: this.url + "/" + id, - handleAs: this.contentHandler, - headers: {"Accept": this.contentType} - }; - - //Call the asynchronous xhrGet - var deferred = dojo.xhrDelete(xhrArgs); - - deferred.addErrback(function(error){ - alert("An unexpected error occurred: " + error); - }); - - - return deferred; - } -}); -- cgit v1.2.3