From 4585b42320e7e79bec583b937ca88bc1577e635c Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:41:39 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245039 13f79535-47bb-0310-9956-ffa450edef68 --- .../web/javascript/dojo/DojoResourceServlet.java | 95 ------------------ .../dojo/DojoWidgetJavascriptProvider.java | 106 --------------------- 2 files changed, 201 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC2/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-RC2/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java (limited to 'sca-java-2.x/tags/2.0-Beta1-RC2/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC2/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-RC2/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-RC2/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-RC2/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-RC2/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-RC2/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; - - } -} -- cgit v1.2.3