Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv32232
Modified Files:
ConnectionRenderer.java ResourceRenderer.java Utils.java
Log Message:
will collect the xsl-funcitnalityh in Utils
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: ConnectionRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ConnectionRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ConnectionRenderer.java 13 Jan 2009 08:24:21 -0000 1.11
+++ ConnectionRenderer.java 16 Jan 2009 08:24:47 -0000 1.12
@@ -13,10 +13,6 @@
import java.net.*;
import java.io.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
import org.mmbase.util.functions.*;
import org.mmbase.util.*;
@@ -47,7 +43,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ConnectionRenderer.java,v 1.11 2009/01/13 08:24:21 michiel
Exp $
+ * @version $Id: ConnectionRenderer.java,v 1.12 2009/01/16 08:24:47 michiel
Exp $
* @since MMBase-1.9
*/
public class ConnectionRenderer extends AbstractRenderer {
@@ -77,14 +73,12 @@
decorate = d;
}
- @Override
- public Parameter[] getParameters() {
+ @Override public Parameter[] getParameters() {
return new Parameter[] {};
}
- @Override
- public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
+ @Override public void render(Parameters blockParameters, Writer w,
RenderHints hints) throws FrameworkException {
if (w == null) throw new NullPointerException();
@@ -95,7 +89,8 @@
if (decorate) {
decorateIntro(hints, w, null);
}
- HttpURLConnection connection = (HttpURLConnection)
getUri(blockParameters, hints).toURL().openConnection();
+ URL url = getUri(blockParameters, hints).toURL();
+ HttpURLConnection connection = (HttpURLConnection)
url.openConnection();
connection.setConnectTimeout(timeOut);
connection.setReadTimeout(timeOut);
int responseCode = connection.getResponseCode();
@@ -112,12 +107,8 @@
w.write(buf, 0, c);
}
} else {
- /// convert using the xsl and spit out that.
- Source xml = new StreamSource(inputStream);
URL x =
ResourceLoader.getConfigurationRoot().getResource(xsl);
-
- Result res = new StreamResult(w);
- XSLTransformer.transform(xml, x, res, new HashMap<String,
Object>());
+ Utils.xslTransform(blockParameters, url, inputStream, w,
x);
}
Index: ResourceRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ResourceRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ResourceRenderer.java 10 Jan 2009 18:32:33 -0000 1.10
+++ ResourceRenderer.java 16 Jan 2009 08:24:47 -0000 1.11
@@ -13,10 +13,6 @@
import java.net.*;
import java.io.*;
import javax.servlet.http.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
import org.mmbase.util.functions.*;
import org.mmbase.util.*;
@@ -29,7 +25,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: ResourceRenderer.java,v 1.10 2009/01/10 18:32:33 michiel Exp $
+ * @version $Id: ResourceRenderer.java,v 1.11 2009/01/16 08:24:47 michiel Exp $
* @since MMBase-1.9
*/
public class ResourceRenderer extends AbstractRenderer {
@@ -85,11 +81,8 @@
}
} else {
/// convert using the xsl and spit out that.
- Source xml = new StreamSource(is);
URL x = ResourceLoader.getConfigurationRoot().getResource(xsl);
-
- Result res = new StreamResult(w);
- XSLTransformer.transform(xml, x, res, new HashMap<String,
Object>());
+ Utils.xslTransform(blockParameters, loader.getResource(name),
is, w, x);
}
} catch (IOException ioe) {
throw new FrameworkException(ioe);
Index: Utils.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Utils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Utils.java 15 Jan 2009 21:21:47 -0000 1.8
+++ Utils.java 16 Jan 2009 08:24:47 -0000 1.9
@@ -11,9 +11,14 @@
import java.io.*;
import java.util.*;
+import java.net.URL;
import org.w3c.dom.*;
import org.xml.sax.*;
import javax.xml.parsers.*;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.Result;
import org.mmbase.util.*;
import org.mmbase.util.functions.*;
import org.mmbase.util.logging.Logger;
@@ -23,7 +28,7 @@
* Static utilitiy methods which are related to (combine functionality of)
other classes in the packages.
*
* @author Michiel Meeuwissen
- * @version $Id: Utils.java,v 1.8 2009/01/15 21:21:47 michiel Exp $
+ * @version $Id: Utils.java,v 1.9 2009/01/16 08:24:47 michiel Exp $
* @since MMBase-1.9
*/
public abstract class Utils {
@@ -68,4 +73,35 @@
}
+ /**
+ * @since MMBase-1.9.1
+ */
+ public static void xslTransform(Parameters blockParameters, URL in,
InputStream inputStream, Writer w, URL xsl) throws
javax.xml.transform.TransformerException {
+ /// convert using the xsl and spit out that.
+ Source xml = new StreamSource(inputStream);
+ Result res = new StreamResult(w);
+ Map<String, Object> params = new HashMap<String,
Object>(blockParameters.toMap());
+
+ /*
+ String context =
((javax.servlet.http.HttpServletRequest)pageContext.getRequest()).getContextPath();
+ params.put("formatter_requestcontext", context);
+ //params.put("formatter_imgdb",
org.mmbase.module.builders.AbstractImages.getImageServletPath(context));
+ // use node function
+ LocaleTag localeTag = findParentTag(LocaleTag.class, null, false);
+ Locale locale;
+ if (localeTag != null) {
+ locale = localeTag.getLocale();
+ if (locale == null) {
+ locale = Locale.getDefault(); // should perhaps somehow find the
MMBase default language setting.
+ }
+ } else {
+ locale = Locale.getDefault(); // should perhaps somehow find the
MMBase default language setting.
+ }
+ params.put("formatter_language", locale.getLanguage());
+ params.put("formatter_counter", counter.toString());
+ */
+
+ XSLTransformer.transform(xml, xsl, res, params);
+ }
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
