Author: michiel
Date: 2010-02-09 15:05:06 +0100 (Tue, 09 Feb 2010)
New Revision: 40933
Modified:
mmbase/trunk/applications/taglib/pom.xml
mmbase/trunk/applications/taglib/src/main/config/components/taglib.xml
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/AbstractNodeListTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/DataTypeHandler.java
Log:
some improvement on this 'handler' stuff (it was sill experimental)
Modified: mmbase/trunk/applications/taglib/pom.xml
===================================================================
--- mmbase/trunk/applications/taglib/pom.xml 2010-02-09 14:04:24 UTC (rev
40932)
+++ mmbase/trunk/applications/taglib/pom.xml 2010-02-09 14:05:06 UTC (rev
40933)
@@ -121,7 +121,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.0.0.pre5</version>
<configuration>
<!--
<jettyEnvXml>${basedir}/jetty-env.xml</jettyEnvXml>
@@ -150,6 +149,22 @@
</dependency>
</dependencies>
</plugin>
+
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <configuration>
+ <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>taglibdocjar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: mmbase/trunk/applications/taglib/src/main/config/components/taglib.xml
===================================================================
--- mmbase/trunk/applications/taglib/src/main/config/components/taglib.xml
2010-02-09 14:04:24 UTC (rev 40932)
+++ mmbase/trunk/applications/taglib/src/main/config/components/taglib.xml
2010-02-09 14:05:06 UTC (rev 40933)
@@ -158,12 +158,10 @@
<body>
<class name="org.mmbase.framework.ConnectionRenderer">
<param
name="url">http://scm.mmbase.org/view/*checkout*/mmbase/trunk/applications/taglib/src/main/xml/mmbase-taglib.xml</param>
- <!--
<param
name="xslt">http://scm.mmbase.org/view/*checkout*/mmbase/trunk/applications/share/xslt/xml2block.xslt</param>
-
- -->
-
+ <!--
<param
name="xslt">file:///home/michiel/mmbase/trunk/applications/share/xslt/xml2block.xslt</param>
+ -->
</class>
</body>
</block>
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/AbstractNodeListTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/AbstractNodeListTag.java
2010-02-09 14:04:24 UTC (rev 40932)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/AbstractNodeListTag.java
2010-02-09 14:05:06 UTC (rev 40933)
@@ -32,7 +32,7 @@
* @version $Id$
*/
-abstract public class AbstractNodeListTag extends AbstractNodeProviderTag
implements BodyTag, ListProvider {
+abstract public class AbstractNodeListTag extends AbstractNodeProviderTag
implements ListProvider {
private static final Logger log =
Logging.getLoggerInstance(AbstractNodeListTag.class);
@@ -159,8 +159,8 @@
protected static class NodesAndTrim {
- boolean needsTrim;
- BridgeList<Node> nodeList;
+ boolean needsTrim = true;
+ BridgeList<Node> nodeList = null;
}
protected final NodesAndTrim getNodesAndTrim(Query query) throws
JspTagException {
@@ -172,6 +172,20 @@
*/
protected NodeList getNodeList(Query query) throws JspTagException {
Cloud cloud = query.getCloud();
+
+
+ if (query instanceof AbstractQueryWrapper) {
+ // This is to help RMMCI. ,it should not actually be needed.
+ /*
+ java.lang.ClassCastException:
org.mmbase.bridge.util.NodeQueryWrapper cannot be cast to
org.mmbase.bridge.remote.MappedObject
+ at
org.mmbase.bridge.remote.proxy.RemoteNodeManager_Proxy.getList(RemoteNodeManager_Proxy.java:180)
+ at
org.mmbase.bridge.jsp.taglib.AbstractNodeListTag.getNodeList(AbstractNodeListTag.java:195)
+
+ */
+ query = ((AbstractQueryWrapper) query).getQuery();
+ }
+
+
// In case this query was created in a transaction, don't bother, and
still work.
boolean inTransaction;
if (cloud instanceof Transaction) {
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/DataTypeHandler.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/DataTypeHandler.java
2010-02-09 14:04:24 UTC (rev 40932)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/DataTypeHandler.java
2010-02-09 14:05:06 UTC (rev 40933)
@@ -135,6 +135,14 @@
return (C)
tag.getPageContext().getAttribute(name.getName());
}
+ public boolean isPost() {
+ try {
+ return
"POST".equals(((javax.servlet.http.HttpServletRequest)
tag.getContextTag().getPageContext().getRequest()).getMethod());
+ } catch (JspTagException te) {
+ throw new RuntimeException(te);
+ }
+ }
+
};
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
