From 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 7 Oct 2013 22:23:21 +0000 Subject: Official Tuscany 2.0.1 Release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68 --- .../web/javascript/dojo/DojoResourceServlet.java | 101 --------------- .../dojo/DojoWidgetJavascriptProvider.java | 141 --------------------- ...vascript.WidgetImplementationJavascriptProvider | 19 --- .../src/main/resources/tuscany/AtomService.js | 141 --------------------- .../src/main/resources/tuscany/RestService.js | 141 --------------------- 5 files changed, 543 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0.1-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.1-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.1-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.1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/RestService.js (limited to 'sca-java-2.x/tags/2.0.1-RC1/modules/web-javascript-dojo/src/main') diff --git a/sca-java-2.x/tags/2.0.1-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.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java deleted file mode 100644 index 9c3b38b5a4..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java +++ /dev/null @@ -1,101 +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.HTTPUtils; - - -/** - * 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(HTTPUtils.getContextRoot(request), HTTPConstants.CHARACTER_ENCODING_UTF8); - String path = URLDecoder.decode(request.getRequestURI(), HTTPConstants.CHARACTER_ENCODING_UTF8); - - if( path.startsWith(contextRoot + "/dojo") || - path.startsWith(contextRoot + "/dojox") || - path.startsWith(contextRoot + "/dijit")) { - //is they are dojo modules - - if( (! path.contains("tuscany/AtomService.js")) && - (! path.contains("tuscany/RestService.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.1-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.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java deleted file mode 100644 index b90545d65d..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java +++ /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. - */ - -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 dojoxBaseUri = URI.create("/dojox").toString(); - private static final String dojoxUri = URI.create("/dojox/*").toString(); - - private static final String dijitBaseUri = URI.create("/dijit").toString(); - private static final String dijitUri = URI.create("/dijit/*").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(dojoxBaseUri); - if(servlet == null) { - try { - DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dojoxBaseUri, baseResourceServlet); - - DojoResourceServlet resourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dojoxUri, resourceServlet); - } catch (ServletMappingException me ) { - logger.warning("Dojox already registered at :" + dojoxBaseUri); - } - } - - servlet = servletHost.getServletMapping(dijitBaseUri); - if(servlet == null) { - try { - DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dijitBaseUri, baseResourceServlet); - - DojoResourceServlet resourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dijitUri, resourceServlet); - } catch (ServletMappingException me ) { - logger.warning("Dijit already registered at :" + dijitBaseUri); - } - } - - 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(dojoxBaseUri); - servletHost.removeServletMapping(dojoxUri); - - servletHost.removeServletMapping(tuscanyBaseUri); - servletHost.removeServletMapping(tuscanyUri); - } - - servletHost = null; - - } -} diff --git a/sca-java-2.x/tags/2.0.1-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.1-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.1-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.1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js b/sca-java-2.x/tags/2.0.1-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.1-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.1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/RestService.js b/sca-java-2.x/tags/2.0.1-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.1-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