[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util NodeComparator.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util
In directory
james.mmbase.org:/tmp/cvs-serv13247/cmsc/utilities/src/java/com/finalist/cmsc/util
Modified Files:
NodeComparator.java
Log Message:
CMSC-1281 Assets: Relate URLs to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util
See also: http://www.mmbase.org/jira/browse/CMSC-1281
Index: NodeComparator.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/NodeComparator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NodeComparator.java 17 Dec 2008 10:07:01 - 1.3
+++ NodeComparator.java 26 Feb 2009 06:45:39 - 1.4
@@ -48,7 +48,7 @@
* The two message nodes will be compared using the compare function of
* the values of their fields.
* Only Comparable values can be used (String, Numbers, Date), as well as
- * Boolean values.
+ * Boolean values. Default null is less than any values.
* In other cases it's assumed that the values cannot be ordered.
*
* Note: this class assumes that values in fields are of similar types
@@ -70,7 +70,7 @@
f2 = o2.getObjectValue(field);
if (f1 instanceof Comparable) {
try {
- result=((Comparable)f1).compareTo(f2);
+ result = (f2==null)? 1:((Comparable)f1).compareTo(f2);
} catch (ClassCastException e) {
// types do not compare -
// possibly the in-memory value type differs from the
@@ -79,10 +79,12 @@
// Solving this could bring this compare to a crawl, so we
// don't. Just edit stuff the right way.
}
- } else if (!f1.equals(f2)) {
+ } else if (f1 != null && !f1.equals(f2)) {
if (f1 instanceof Boolean) {
result=((Boolean)f1).booleanValue() ? 1 : -1;
}
+ } else if (f1 == null ){
+ result=-1;
}
fieldnr++;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Mail 27936
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.spicydrool.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://spicydrool.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 5, B742. 470 Clements Road. London. SE11 7DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Customer Receipt/Purchase Confirmation
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.piousawake.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://piousawake.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 5, B088. 309 Clements Road. London. SE84 4DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] February % off
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.slickaware.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://slickaware.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 1, B802. 879 Clements Road. London. SE93 6DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community report_overview.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv20056 Modified Files: Tag: b1_5 report_overview.jsp Log Message: CMSC-1265 Community: improve import and export options of community users improve code See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community See also: http://www.mmbase.org/jira/browse/CMSC-1265 Index: report_overview.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/report_overview.jsp,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -b -r1.4.2.2 -r1.4.2.3 --- report_overview.jsp 24 Feb 2009 02:50:24 - 1.4.2.2 +++ report_overview.jsp 26 Feb 2009 02:17:34 - 1.4.2.3 @@ -2,6 +2,7 @@ %><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + @@ -20,6 +21,7 @@ + @@ -70,4 +72,6 @@ + + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community report_overview.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv19975 Modified Files: report_overview.jsp Log Message: CMSC-1265 Community: improve import and export options of community users improve code See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community See also: http://www.mmbase.org/jira/browse/CMSC-1265 Index: report_overview.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/report_overview.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- report_overview.jsp 24 Feb 2009 02:50:53 - 1.6 +++ report_overview.jsp 26 Feb 2009 02:16:50 - 1.7 @@ -2,6 +2,7 @@ %><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + @@ -20,6 +21,7 @@ + @@ -70,4 +72,6 @@ + + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules modulesmenu.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules In directory james.mmbase.org:/tmp/cvs-serv18957 Modified Files: Tag: b1_5 modulesmenu.jsp Log Message: CMSC-1265 - Community: improve import and export options of community users See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules See also: http://www.mmbase.org/jira/browse/CMSC-1265 Index: modulesmenu.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -b -r1.25 -r1.25.2.1 --- modulesmenu.jsp 18 Sep 2008 11:22:29 - 1.25 +++ modulesmenu.jsp 26 Feb 2009 01:58:07 - 1.25.2.1 @@ -50,7 +50,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules modulesmenu.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules In directory james.mmbase.org:/tmp/cvs-serv18912 Modified Files: modulesmenu.jsp Log Message: CMSC-1265 - Community: improve import and export options of community users See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules See also: http://www.mmbase.org/jira/browse/CMSC-1265 Index: modulesmenu.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -b -r1.25 -r1.26 --- modulesmenu.jsp 18 Sep 2008 11:22:29 - 1.25 +++ modulesmenu.jsp 26 Feb 2009 01:55:57 - 1.26 @@ -50,7 +50,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Hi
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.witmeek.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://witmeek.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 5, B586. 807 Clements Road. London. SE30 8DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Re: answer 2
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.spicewhiz.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://spicewhiz.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 3, B303. 684 Clements Road. London. SE71 7DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Re: answer 2
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.zealultra.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://zealultra.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 4, B375. 503 Clements Road. London. SE60 5DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts TreeAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv5683/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
Tag: b1_4
TreeAction.java
Log Message:
CMSC-1307 - SelectorPage.do stacktraces on non-existing pages; fixed by adding
a check.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-1307
Index: TreeAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/TreeAction.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- TreeAction.java 26 Nov 2007 11:43:41 - 1.4
+++ TreeAction.java 25 Feb 2009 13:43:26 - 1.4.2.1
@@ -10,14 +10,14 @@
package com.finalist.cmsc.struts;
import java.io.PrintWriter;
-import java.util.Iterator;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sf.mmapps.commons.util.HttpUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.*;
import org.mmbase.bridge.Cloud;
@@ -36,7 +36,7 @@
TreeInfo info = getTreeInfo(cloud);
String action = request.getParameter("action");
- if (!StringUtil.isEmpty(action)) {
+ if (StringUtils.isNotEmpty(action)) {
response.setContentType("text/xml");
if ("expand".equals(action)) {
String persistentid = request.getParameter("persistentid");
@@ -67,22 +67,22 @@
PrintWriter out = HttpUtil.getWriterForXml(response);
out.write("");
-for (Iterator iter = children.iterator(); iter.hasNext();)
{
- String element = iter.next();
+for (String element : children) {
out.write("" + element + "");
}
out.write("");
}
return null;
}
- else {
+
String channel = getChannelId(request, cloud);
- if (!StringUtil.isEmpty(channel) && !"notfound".equals(channel)) {
+ if (StringUtils.isNotEmpty(channel) && !"notfound".equals(channel)
+&& cloud.hasNode(channel)) {
+
Node channelNode = cloud.getNode(channel);
List openChannels = getOpenChannels(channelNode);
if (openChannels != null) {
- for (Iterator iter = openChannels.iterator();
iter.hasNext();) {
- Node node = iter.next();
+for (Node node : openChannels) {
info.expand(node.getNumber());
}
addToRequest(request, "channel", channelNode);
@@ -98,7 +98,6 @@
ActionForward ret = mapping.findForward(SUCCESS);
return ret;
}
- }
protected String getChannelId(HttpServletRequest request, Cloud cloud) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts TreeAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv5668/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
TreeAction.java
Log Message:
CMSC-1307 - SelectorPage.do stacktraces on non-existing pages; fixed by adding
a check.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-1307
Index: TreeAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/TreeAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TreeAction.java 25 Jul 2008 15:54:05 - 1.7
+++ TreeAction.java 25 Feb 2009 13:43:18 - 1.8
@@ -73,9 +73,11 @@
}
return null;
}
- else {
+
String channel = getChannelId(request, cloud);
- if (StringUtils.isNotEmpty(channel) && !"notfound".equals(channel)) {
+ if (StringUtils.isNotEmpty(channel) && !"notfound".equals(channel)
+&& cloud.hasNode(channel)) {
+
Node channelNode = cloud.getNode(channel);
List openChannels = getOpenChannels(channelNode);
if (openChannels != null) {
@@ -95,7 +97,6 @@
ActionForward ret = mapping.findForward(SUCCESS);
return ret;
}
- }
protected String getChannelId(HttpServletRequest request, Cloud cloud) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts TreeAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv5650/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
Tag: b1_5
TreeAction.java
Log Message:
CMSC-1307 - SelectorPage.do stacktraces on non-existing pages; fixed by adding
a check.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-1307
Index: TreeAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/TreeAction.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- TreeAction.java 25 Jul 2008 15:54:05 - 1.7
+++ TreeAction.java 25 Feb 2009 13:43:12 - 1.7.2.1
@@ -73,9 +73,11 @@
}
return null;
}
- else {
+
String channel = getChannelId(request, cloud);
- if (StringUtils.isNotEmpty(channel) && !"notfound".equals(channel)) {
+ if (StringUtils.isNotEmpty(channel) && !"notfound".equals(channel)
+&& cloud.hasNode(channel)) {
+
Node channelNode = cloud.getNode(channel);
List openChannels = getOpenChannels(channelNode);
if (openChannels != null) {
@@ -95,7 +97,6 @@
ActionForward ret = mapping.findForward(SUCCESS);
return ret;
}
- }
protected String getChannelId(HttpServletRequest request, Cloud cloud) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Re: answer 8
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.weefresh.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://weefresh.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 4, B279. 656 Clements Road. London. SE15 6DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Message number 77902
We ship Worldwide! To all countries! To all destinations! To unsubscribe from this mailing list, please log in to www.beatswit.com, click on "My Account", click "Update" to edit your registration details and uncheck the "Receive Newsletter?" check box. Or unsubscribe at http://beatswit.com/faq.php Privacy Statement | Terms & Conditions | Contact KEYWORD Ltd. Tower Bridge Business Complex. Unit 3, B645. 504 Clements Road. London. SE27 6DG © 2006-2008 KEYWORD, Ltd. All Rights Reserved ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.5_to_1.6.txt
Update of /var/cvs/contributions/CMSContainer/migration
In directory james.mmbase.org:/tmp/cvs-serv2566/migration
Modified Files:
migration_1.5_to_1.6.txt
Log Message:
CMSC-1265 - Add dependencies to project.xml for Community Module
See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: migration_1.5_to_1.6.txt
===
RCS file:
/var/cvs/contributions/CMSContainer/migration/migration_1.5_to_1.6.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- migration_1.5_to_1.6.txt19 Feb 2009 15:16:38 - 1.18
+++ migration_1.5_to_1.6.txt25 Feb 2009 10:44:26 - 1.19
@@ -177,3 +177,30 @@
*
*
+
+Name: Add dependency for Community module (if used!)
+Goal: prevent class-load error
+Type: add dependency to maven-base/project.xml
+--- Start dependency ---
+
+supercsv
+SuperCSV
+1.52
+jar
+
+ ${war.bundle}
+
+
+
+spiffyframework
+spiffy-with_source-all
+0.05
+jar
+
+ ${war.bundle}
+
+
+--- End script ---
+*
+*
+*
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.5.2_to_1.5.3.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv2551/migration Added Files: Tag: b1_5 migration_1.5.2_to_1.5.3.txt Log Message: CMSC-1265 - Add dependencies to project.xml for Community Module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-1265 migration_1.5.2_to_1.5.3.txt is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
