Author: michiel
Date: 2010-04-13 15:31:46 +0200 (Tue, 13 Apr 2010)
New Revision: 41886
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/CloudTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/NodeHandler.java
mmbase/trunk/applications/taglib/src/test/webapp/WEB-INF/web.xml
Log:
removed dependecies on core
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-04-13 13:20:30 UTC (rev 41885)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/AbstractNodeListTag.java
2010-04-13 13:31:46 UTC (rev 41886)
@@ -204,7 +204,7 @@
if (inTransaction && usetransaction.getString(this).equals("true")
&& nq.getSteps().size() >= 3) {
Node startNode = Queries.getStartNode(nq, cloud);
- return new
org.mmbase.bridge.implementation.BasicNodeList(Queries.getRelatedNodesInTransaction(startNode,
nq), nq.getNodeManager());
+ return new
org.mmbase.bridge.implementation.SimpleNodeList(Queries.getRelatedNodesInTransaction(startNode,
nq), nq.getNodeManager());
} else {
return
cloud.getNodeManager(nq.getNodeManager().getName()).getList(nq);
}
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudTag.java
2010-04-13 13:20:30 UTC (rev 41885)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudTag.java
2010-04-13 13:31:46 UTC (rev 41886)
@@ -516,10 +516,10 @@
pageContext.setAttribute(KEY, cloud, SCOPE);
org.mmbase.bridge.util.CloudThreadLocal.bind(cloud);
- if (cloud.getCloudContext() instanceof LocalContext) {
- cloud.setProperty(Cloud.PROP_REQUEST, request);
- cloud.setProperty(Cloud.PROP_RESPONSE, response);
- }
+ // if (cloud.getCloudContext() instanceof LocalContext) {
+ cloud.setProperty(Cloud.PROP_REQUEST, request);
+ cloud.setProperty(Cloud.PROP_RESPONSE, response);
+ //}
cloud.setProperty(LocaleTag.TZ_KEY, getTimeZone());
if (jspVar != null) {
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java
2010-04-13 13:20:30 UTC (rev 41885)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java
2010-04-13 13:31:46 UTC (rev 41886)
@@ -28,7 +28,7 @@
import org.mmbase.util.xml.DocumentReader;
import org.mmbase.util.functions.*;
-import org.mmbase.core.util.Fields;
+import org.mmbase.bridge.Fields;
import org.mmbase.bridge.jsp.taglib.typehandler.TypeHandler;
@@ -486,7 +486,7 @@
show = "" + field.getType();
break;
case TYPE_TYPEDESCRIPTION:
- show =
org.mmbase.core.util.Fields.getTypeDescription(field.getType());
+ show = Fields.getTypeDescription(field.getType());
break;
case TYPE_GUITYPE:
show = field.getGUIType();
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/NodeHandler.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/NodeHandler.java
2010-04-13 13:20:30 UTC (rev 41885)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/typehandler/NodeHandler.java
2010-04-13 13:31:46 UTC (rev 41886)
@@ -98,7 +98,7 @@
// args for gui function
- Parameters args = new
Parameters(org.mmbase.module.core.MMObjectBuilder.GUI_PARAMETERS);
+ Parameters args = node.getFunction("guil").createParameters();
args.set("field", "");
args.set("locale", tag.getLocale());
args.set("response", tag.getPageContext().getResponse());
Modified: mmbase/trunk/applications/taglib/src/test/webapp/WEB-INF/web.xml
===================================================================
--- mmbase/trunk/applications/taglib/src/test/webapp/WEB-INF/web.xml
2010-04-13 13:20:30 UTC (rev 41885)
+++ mmbase/trunk/applications/taglib/src/test/webapp/WEB-INF/web.xml
2010-04-13 13:31:46 UTC (rev 41886)
@@ -38,8 +38,8 @@
</listener>
<welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
<welcome-file>index.jspx</welcome-file>
- <welcome-file>index.jsp</welcome-file>
<welcome-file>default.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
