Author: nico
Date: 2009-06-03 14:09:00 +0200 (Wed, 03 Jun 2009)
New Revision: 35613
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/pom.xml
CMSContainer/trunk/CMSContainer/cmsc/utilities/pom.xml
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TypeUtil.java
CMSContainer/trunk/CMSContainer_Templates/single/pom.xml
Log:
CMSC-1330 Upgrade CMSc to use MMBase 1.9
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java
2009-06-03 11:58:18 UTC (rev 35612)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java
2009-06-03 12:09:00 UTC (rev 35613)
@@ -27,6 +27,9 @@
private static final String SOURCE = "SOURCE";
private static final String DESTINATION = "DESTINATION";
+ private static final String ALLOWREL = "allowrel";
+ private static final String TYPEDEF = "typedef";
+
public static final String NUMBER_FIELD = "number";
public static final String TITLE_FIELD = "title";
public static final String CREATIONDATE_FIELD = "creationdate";
@@ -67,15 +70,35 @@
result.add(nm);
}
}
+ sortContentTypes(result);
+ return result;
+ }
+
+
+ private static void sortContentTypes(List<NodeManager> result) {
Collections.sort(result, new Comparator<NodeManager>() {
public int compare(NodeManager o1, NodeManager o2) {
return o1.getGUIName().compareTo(o2.getGUIName());
}
});
+ }
- return result;
+
+ public static List<NodeManager> getAllowedContentTypes(Cloud cloud, String
nodeNumber) {
+ List<NodeManager> types = new ArrayList<NodeManager>();
+
+ NodeList allowedTypes =
cloud.getNode(nodeNumber).getRelatedNodes(TYPEDEF, ALLOWREL, DESTINATION);
+ for (Iterator<Node> iterator = allowedTypes.iterator();
iterator.hasNext();) {
+ Node node = iterator.next();
+ if (node.isNodeManager()) {
+ types.add(node.toNodeManager());
+ }
+ }
+ sortContentTypes(types);
+ return types;
}
+
public static boolean isContentElementField(Field field) {
Cloud cloud = field.getNodeManager().getCloud();
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2009-06-03 11:58:18 UTC (rev 35612)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2009-06-03 12:09:00 UTC (rev 35613)
@@ -50,9 +50,7 @@
public class ContentSearchAction extends PagerAction {
private static final String TYPES_LIST = "typesList";
- private static final String DESTINATION = "destination";
- private static final String ALLOWREL = "allowrel";
- private static final String TYPEDEF = "typedef";
+
public static final String GETURL = "geturl";
public static final String PERSONAL = "personal";
public static final String MODE = "mode";
@@ -105,7 +103,7 @@
if(StringUtils.isEmpty(portletId)){
types = ContentElementUtil.getContentTypes(cloud);
} else {
- types = cloud.getNode(portletId).getRelatedNodes(TYPEDEF, ALLOWREL,
DESTINATION);
+ types = ContentElementUtil.getAllowedContentTypes(cloud, portletId);
if(types.size() == 0){
types = ContentElementUtil.getContentTypes(cloud);
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-06-03 11:58:18 UTC (rev 35612)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-06-03 12:09:00 UTC (rev 35613)
@@ -1,7 +1,6 @@
package com.finalist.cmsc.repository.forms;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -11,8 +10,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.LabelValueBean;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.*;
import org.mmbase.storage.search.SortOrder;
import com.finalist.cmsc.repository.ContentElementUtil;
@@ -23,11 +21,8 @@
private static final String SEARCHOPTIONS = "searchoptions";
private static final String TYPES_LIST = "typesList";
private static final String PORTLET_ID = "portletId";
- private static final String DESTINATION = "destination";
- private static final String ALLOWREL = "allowrel";
- private static final String TYPEDEF = "typedef";
-...@override
+ @Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -59,9 +54,9 @@
if(StringUtils.isEmpty(portletId)){
types = ContentElementUtil.getContentTypes(cloud);
} else {
- types = cloud.getNode(portletId).getRelatedNodes(TYPEDEF, ALLOWREL,
DESTINATION);
+ types = ContentElementUtil.getAllowedContentTypes(cloud, portletId);
if(types.size() == 0){
- types = ContentElementUtil.getContentTypes(cloud);
+ types = ContentElementUtil.getContentTypes(cloud);
}
}
List<String> hiddenTypes = ContentElementUtil.getHiddenTypes();
Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/pom.xml 2009-06-03
11:58:18 UTC (rev 35612)
+++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/pom.xml 2009-06-03
12:09:00 UTC (rev 35613)
@@ -42,6 +42,13 @@
<classifier>classes</classifier>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ </dependency>
+
</dependencies>
<build>
<testSourceDirectory>src/tests</testSourceDirectory>
Modified: CMSContainer/trunk/CMSContainer/cmsc/utilities/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer/cmsc/utilities/pom.xml 2009-06-03
11:58:18 UTC (rev 35612)
+++ CMSContainer/trunk/CMSContainer/cmsc/utilities/pom.xml 2009-06-03
12:09:00 UTC (rev 35613)
@@ -13,6 +13,13 @@
<packaging>war</packaging>
<name>CMS Container utilities</name>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<testSourceDirectory>src/tests</testSourceDirectory>
<plugins>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TypeUtil.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TypeUtil.java
2009-06-03 11:58:18 UTC (rev 35612)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TypeUtil.java
2009-06-03 12:09:00 UTC (rev 35613)
@@ -12,6 +12,7 @@
import java.util.*;
import org.mmbase.cache.Cache;
+import org.mmbase.cache.CacheManager;
import org.mmbase.module.core.*;
import org.mmbase.storage.search.*;
import org.mmbase.storage.search.implementation.BasicSearchQuery;
@@ -105,7 +106,7 @@
public static void fillTypeCache(MMObjectBuilder builder) {
MMBase mmbase = builder.getMMBase();
try {
- Cache typeCache = Cache.getCache("TypeCache");
+ Cache typeCache = CacheManager.getCache("TypeCache");
if (typeCache != null) {
BasicSearchQuery query = new BasicSearchQuery();
Step step = query.addStep(builder);
Modified: CMSContainer/trunk/CMSContainer_Templates/single/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Templates/single/pom.xml 2009-06-03
11:58:18 UTC (rev 35612)
+++ CMSContainer/trunk/CMSContainer_Templates/single/pom.xml 2009-06-03
12:09:00 UTC (rev 35613)
@@ -184,5 +184,13 @@
<artifactId>ehcache</artifactId>
</dependency>
+<!-- JSON -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ </dependency>
+
+
</dependencies>
</project>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
