You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/02/20 09:38:29 UTC
svn commit: r912088 -
/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
Author: lresende
Date: Sat Feb 20 08:38:29 2010
New Revision: 912088
URL: http://svn.apache.org/viewvc?rev=912088&view=rev
Log:
Adding try/catch to display warning when dojo or tuscany dojo extensions are already registered
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
Modified: tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java?rev=912088&r1=912087&r2=912088&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java Sat Feb 20 08:38:29 2010
@@ -20,6 +20,7 @@
package org.apache.tuscany.sca.web.javascript.dojo;
import java.net.URI;
+import java.util.logging.Logger;
import javax.servlet.Servlet;
@@ -27,8 +28,11 @@
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.host.http.ServletHostHelper;
+import org.apache.tuscany.sca.host.http.ServletMappingException;
public class DojoModuleActivator implements ModuleActivator {
+ private final static Logger logger = Logger.getLogger(DojoModuleActivator.class.getName());
+
private static final String dojoBaseUri = URI.create("/dojo").toString();
private static final String dojoUri = URI.create("/dojo/*").toString();
@@ -51,20 +55,28 @@
servlet = servletHost.getServletMapping(dojoBaseUri);
if(servlet == null) {
- DojoResourceServlet baseResourceServlet = new DojoResourceServlet();
- servletHost.addServletMapping(dojoBaseUri, baseResourceServlet);
-
- DojoResourceServlet resourceServlet = new DojoResourceServlet();
- servletHost.addServletMapping(dojoUri, resourceServlet);
+ 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) {
- DojoResourceServlet baseResourceServlet = new DojoResourceServlet();
- servletHost.addServletMapping(tuscanyBaseUri, baseResourceServlet);
-
- DojoResourceServlet resourceServlet = new DojoResourceServlet();
- servletHost.addServletMapping(tuscanyUri, resourceServlet);
+ 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);
+ }
}
}