From 6393bfe8f17d21b355518c24cdc152233254bdfd Mon Sep 17 00:00:00 2001 From: lresende Date: Sat, 4 Apr 2009 00:11:14 +0000 Subject: Refactoring javascript extension points packages to follow the same naming pattern used by it's modules. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@761842 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/core/web/dojo/DojoModuleActivator.java | 80 ---------------------- .../sca/core/web/dojo/DojoResourceServlet.java | 73 -------------------- .../web/javascript/dojo/DojoModuleActivator.java | 80 ++++++++++++++++++++++ .../web/javascript/dojo/DojoResourceServlet.java | 73 ++++++++++++++++++++ .../org.apache.tuscany.sca.core.ModuleActivator | 2 +- 5 files changed, 154 insertions(+), 154 deletions(-) delete mode 100644 branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java delete mode 100644 branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java create mode 100644 branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java create mode 100644 branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java (limited to 'branches/sca-java-1.x/modules/web-javascript-dojo/src/main') diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java deleted file mode 100644 index 40cb459a03..0000000000 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java +++ /dev/null @@ -1,80 +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.core.web.dojo; - -import java.net.URI; - -import javax.servlet.Servlet; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; - -public class DojoModuleActivator implements ModuleActivator { - 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 ServletHost servletHost; - - public void start(ExtensionPointRegistry registry) { - ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class); - this.servletHost = servletHosts.getServletHosts().get(0); - - Servlet servlet = null; - - servlet = servletHost.getServletMapping(dojoBaseUri); - if(servlet == null) { - DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dojoBaseUri, baseResourceServlet); - - DojoResourceServlet resourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(dojoUri, resourceServlet); - } - - servlet = servletHost.getServletMapping(tuscanyBaseUri); - if(servlet == null) { - DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(tuscanyBaseUri, baseResourceServlet); - - DojoResourceServlet resourceServlet = new DojoResourceServlet(); - servletHost.addServletMapping(tuscanyUri, resourceServlet); - } - - } - - public void stop(ExtensionPointRegistry registry) { - Servlet servlet = servletHost.getServletMapping(dojoBaseUri); - if(servlet == null) { - servletHost.removeServletMapping(dojoBaseUri); - servletHost.removeServletMapping(dojoUri); - - servletHost.removeServletMapping(tuscanyBaseUri); - servletHost.removeServletMapping(tuscanyUri); - } - - servletHost = null; - - } - -} diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java deleted file mode 100644 index ce037283f6..0000000000 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java +++ /dev/null @@ -1,73 +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.core.web.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; - - -/** - * 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 path = URLDecoder.decode(request.getRequestURI(), "UTF-8"); - - if( path.startsWith("/dojo")) { - //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 = "dojo" + path; - } else if( path.startsWith("/")) { - path = path.substring(1); - } - - // Write the response from the service implementation to the response - // output stream - InputStream is = this.getClass().getClassLoader().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/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java new file mode 100644 index 0000000000..5337b870d8 --- /dev/null +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java @@ -0,0 +1,80 @@ +/* + * 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 javax.servlet.Servlet; + +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.ModuleActivator; +import org.apache.tuscany.sca.host.http.ServletHost; +import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; + +public class DojoModuleActivator implements ModuleActivator { + 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 ServletHost servletHost; + + public void start(ExtensionPointRegistry registry) { + ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class); + this.servletHost = servletHosts.getServletHosts().get(0); + + Servlet servlet = null; + + servlet = servletHost.getServletMapping(dojoBaseUri); + if(servlet == null) { + DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); + servletHost.addServletMapping(dojoBaseUri, baseResourceServlet); + + DojoResourceServlet resourceServlet = new DojoResourceServlet(); + servletHost.addServletMapping(dojoUri, resourceServlet); + } + + servlet = servletHost.getServletMapping(tuscanyBaseUri); + if(servlet == null) { + DojoResourceServlet baseResourceServlet = new DojoResourceServlet(); + servletHost.addServletMapping(tuscanyBaseUri, baseResourceServlet); + + DojoResourceServlet resourceServlet = new DojoResourceServlet(); + servletHost.addServletMapping(tuscanyUri, resourceServlet); + } + + } + + public void stop(ExtensionPointRegistry registry) { + Servlet servlet = servletHost.getServletMapping(dojoBaseUri); + if(servlet == null) { + servletHost.removeServletMapping(dojoBaseUri); + servletHost.removeServletMapping(dojoUri); + + servletHost.removeServletMapping(tuscanyBaseUri); + servletHost.removeServletMapping(tuscanyUri); + } + + servletHost = null; + + } + +} diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java new file mode 100644 index 0000000000..86d04a05b5 --- /dev/null +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java @@ -0,0 +1,73 @@ +/* + * 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; + + +/** + * 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 path = URLDecoder.decode(request.getRequestURI(), "UTF-8"); + + if( path.startsWith("/dojo")) { + //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 = "dojo" + path; + } else if( path.startsWith("/")) { + path = path.substring(1); + } + + // Write the response from the service implementation to the response + // output stream + InputStream is = this.getClass().getClassLoader().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/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator index cddc129c57..b703bc5b3a 100644 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. # Implementation class for the ModuleActivator -org.apache.tuscany.sca.core.web.dojo.DojoModuleActivator +org.apache.tuscany.sca.web.javascript.dojo.DojoModuleActivator -- cgit v1.2.3