[MMBASE CVS] src/org/mmbase/framework ComponentRepository.java Framework.java FrameworkFilter.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv31948

Modified Files:
        ComponentRepository.java Framework.java FrameworkFilter.java 
Log Message:
did'nt compile


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: ComponentRepository.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ComponentRepository.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ComponentRepository.java    5 Dec 2007 16:31:51 -0000       1.26
+++ ComponentRepository.java    25 Jan 2008 10:13:01 -0000      1.27
@@ -23,7 +23,7 @@
  * This (singleton) class maintains all compoments which are registered in the 
current MMBase.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ComponentRepository.java,v 1.26 2007/12/05 16:31:51 michiel 
Exp $
+ * @version $Id: ComponentRepository.java,v 1.27 2008/01/25 10:13:01 michiel 
Exp $
  * @since MMBase-1.9
  */
 public class ComponentRepository {
@@ -174,7 +174,8 @@
     /**
      * Given  an XML, creates and configures one component.
      */
-    protected Component getComponent(String name, Document doc) throws 
org.xml.sax.SAXException, ClassNotFoundException, NoSuchMethodException, 
InstantiationException, IllegalAccessException, 
java.lang.reflect.InvocationTargetException {
+    protected Component getComponent(String name, Document doc)
+        throws org.xml.sax.SAXException, ClassNotFoundException, 
NoSuchMethodException, InstantiationException, IllegalAccessException, 
java.lang.reflect.InvocationTargetException {
 
         Component component = (Component) 
Instantiator.getInstanceWithSubElement(doc.getDocumentElement(), name);
         if (component == null) {


Index: Framework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Framework.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Framework.java      26 Dec 2007 17:07:19 -0000      1.42
+++ Framework.java      25 Jan 2008 10:13:01 -0000      1.43
@@ -27,7 +27,7 @@
  *
  * @author Johannes Verelst
  * @author Pierre van Rooden
- * @version $Id: Framework.java,v 1.42 2007/12/26 17:07:19 michiel Exp $
+ * @version $Id: Framework.java,v 1.43 2008/01/25 10:13:01 michiel Exp $
  * @since MMBase-1.9
  */
 public abstract class Framework {
@@ -235,7 +235,7 @@
     public abstract StringBuilder getUrl(String path,
                          Map<String, Object> parameters,
                          Parameters frameworkParameters,
-                         boolean escapeAmps);
+                         boolean escapeAmps) throws FrameworkException;
 
 
     /**
@@ -254,7 +254,7 @@
      */
     public abstract StringBuilder getInternalUrl(String path,
                                                  Map<String, Object> params,
-                                                 Parameters 
frameworkParameters);
+                                                 Parameters 
frameworkParameters) throws FrameworkException;
 
 
 }


Index: FrameworkFilter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/FrameworkFilter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- FrameworkFilter.java        25 Jan 2008 09:32:23 -0000      1.19
+++ FrameworkFilter.java        25 Jan 2008 10:13:01 -0000      1.20
@@ -36,7 +36,7 @@
  * 'excludes' parameter in web.xml.
  *
  * @author Andr&eacute; van Toly
- * @version $Id: FrameworkFilter.java,v 1.19 2008/01/25 09:32:23 michiel Exp $
+ * @version $Id: FrameworkFilter.java,v 1.20 2008/01/25 10:13:01 michiel Exp $
  */
 
 public class FrameworkFilter implements Filter, MMBaseStarter  {
@@ -173,6 +173,7 @@
             if (params.containsParameter(Parameter.RESPONSE)) {
                 params.set(Parameter.RESPONSE, res);
             }
+            try {
             String forwardUrl = fw.getInternalUrl(path, req.getParameterMap(), 
params).toString();
 
             if (log.isDebugEnabled()) {
@@ -191,6 +192,9 @@
                 if (log.isDebugEnabled()) log.debug("No matching technical 
URL, just forwarding: " + path);
                 chain.doFilter(request, response);
             }
+            } catch (FrameworkException fe) {
+                throw new ServletException(fe);
+            }
         } else {
             if (log.isDebugEnabled()) log.debug("Request not an instance of 
HttpServletRequest, therefore no url forwarding");
             chain.doFilter(request, response);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs