[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Oct 10 21:55:43 EDT 2006
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jTypes
In directory dev.open-bio.org:/tmp/cvs-serv25465/Java/src/main/org/biomoby/client/ui/graphical/servlet/jTypes

Modified Files:
	Types.java 
Log Message:

moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jTypes Types.java,1.6,1.7
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jTypes/Types.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jTypes/Types.java	2006/05/24 18:48:31	1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jTypes/Types.java	2006/10/11 01:55:43	1.7
@@ -5,8 +5,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -32,46 +30,7 @@
      * @see javax.servlet.GenericServlet#init()
      */
     public final void init() throws ServletException {
-        // super.init();
-    	// try to load environment variables set in context.xml
-    	try {
-			Context c = new InitialContext();
-
-			try {
-				String MOBY_CENTRAL_CONFIG = null;
-				MOBY_CENTRAL_CONFIG = (String) c.lookup("java:comp/env/MOBY_CENTRAL_CONFIG");
-				if (MOBY_CENTRAL_CONFIG != null && !MOBY_CENTRAL_CONFIG.equals("")) {
-					// set MOBY_CENTRAL_CONFIG
-					log.info("init(setting MOBY_CENTRAL_CONFIG)");
-					System.setProperty("MOBY_CENTRAL_CONFIG", MOBY_CENTRAL_CONFIG);
-				}
-
-			} catch (Exception ex) {
-			}
-			try {
-				String MOBY_SERVER = null;
-				MOBY_SERVER = (String) c.lookup("java:comp/env/MOBY_SERVER");
-				if (MOBY_SERVER != null && !MOBY_SERVER.equals("")) {
-					// set MOBY_SERVER
-					log.info("init(setting MOBY_SERVER)");
-					System.setProperty("MOBY_SERVER", MOBY_SERVER);
-				}
-			} catch (Exception ex) {
-			}
-
-			try {
-				String MOBY_URI = null;
-				MOBY_URI = (String) c.lookup("java:comp/env/MOBY_URI");
-				if (MOBY_URI != null && !MOBY_URI.equals("")) {
-					// set MOBY_URI
-					log.info("init(setting MOBY_URI)");
-					System.setProperty("MOBY_URI", MOBY_URI);
-				}
-			} catch (Exception ex) {
-			}
-
-		} catch (Exception e) {
-		}
+   
     }
 
     /* (non-Javadoc)
@@ -87,7 +46,7 @@
         Pattern p ;
         Matcher m ;
         if (path == null) {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Please specify which definitions you are looking for (Objects, Services, or Namespaces).");
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Please specify which definitions you are looking for (i.e., Objects, Services, or Namespaces).");
             return;
         }
         p = Pattern.compile("/Services\\S*");