[Smartfrog-checkins] core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates DelegateServletContext.java,1.1,1.2 JettyServletDelegate.java,1.1,1.2

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22623/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates

Modified Files:
	DelegateServletContext.java JettyServletDelegate.java 
Log Message:
changes to get tests to work; mostly
 -fixed handlers to bind to a servlet context
 -deleted unused classes to stop
 -updated the examples.

Index: JettyServletDelegate.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/JettyServletDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JettyServletDelegate.java	16 Aug 2005 20:25:35 -0000	1.1
--- JettyServletDelegate.java	19 Aug 2005 15:42:39 -0000	1.2
***************
*** 137,141 ****
              throw new SmartFrogLivenessException("Servlet " +
                      name +
!                     " is not running");
          }
      }
--- 137,141 ----
              throw new SmartFrogLivenessException("Servlet " +
                      name +
!                     " is not running under"+getAbsolutePath());
          }
      }

Index: DelegateServletContext.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/jetty/src/org/smartfrog/services/jetty/contexts/delegates/DelegateServletContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DelegateServletContext.java	16 Aug 2005 20:25:35 -0000	1.1
--- DelegateServletContext.java	19 Aug 2005 15:42:39 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  
  import org.mortbay.http.HttpContext;
+ import org.mortbay.http.HttpHandler;
  import org.mortbay.http.handler.ResourceHandler;
  import org.mortbay.jetty.servlet.ServletHttpContext;
***************
*** 153,155 ****
--- 154,192 ----
          return servletDelegate;
      }
+ 
+ 
+     /**
+      * add a handler to the server
+      *
+      * @param handler handler
+      * @throws SmartFrogException
+      * @throws RemoteException
+      */
+     public void addHandler(HttpHandler handler) throws SmartFrogException,
+             RemoteException {
+         ServletHttpContext context = getServletContext();
+         context.addHandler(handler);
+     }
+ 
+     /**
+      * remove a handler. The handler should be stopped first, though we do try
+      * and do it ourselves
+      * @param handler
+      * @throws SmartFrogException
+      * @throws RemoteException
+      */
+     public void removeHandler(HttpHandler handler) throws SmartFrogException, RemoteException {
+         ServletHttpContext context = getServletContext();
+         try {
+             if(handler.isStarted()) {
+                 handler.stop();
+             }
+         } catch (InterruptedException e) {
+             //ignore
+         }
+         context.removeHandler(handler);
+ 
+     }
+ 
+ 
  }