svn commit: r516536 - in /ofbiz/trunk/applications/content/src/org/ofbiz/content: cms/CmsEvents.java data/DataResourceWorker.java

[ja...@apache.org]

Author: jaz
Date: Fri Mar  9 12:12:44 2007
New Revision: 516536

URL: http://svn.apache.org/viewvc?view=rev&rev=516536
Log:
implemented default page WS content type; changed URL_RESOURCE to support component:// resources

Modified:
    ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
    ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?view=diff&rev=516536&r1=516535&r2=516536
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Fri Mar  9 12:12:44 2007
@@ -94,6 +94,23 @@
             }
         } // if called through the default request, there is no request in pathinfo
 
+
+        // if path info is null; check for a default content
+        if (pathInfo == null) {
+            List defaultContents = null;
+            try {
+                defaultContents = delegator.findByAnd("WebSiteContent", UtilMisc.toMap("webSiteId", webSiteId,
+                        "webSiteContentTypeId", "DEFAULT_PAGE"), UtilMisc.toList("-fromDate"));
+            } catch (GenericEntityException e) {
+                Debug.logError(e, module);
+            }
+            defaultContents = EntityUtil.filterByDate(defaultContents);
+            GenericValue defaultContent = EntityUtil.getFirst(defaultContents);
+            if (defaultContent != null) {
+                pathInfo = defaultContent.getString("contentId");
+            }
+        }
+
         // check for path alias first
         if (pathInfo != null) {
             // clean up the pathinfo for parsing
@@ -137,8 +154,6 @@
             }
 
             // process through CMS -- using the mapKey (for now)
-            GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
-            Timestamp fromDate = UtilDateTime.nowTimestamp();
             Locale locale = UtilHttp.getLocale(request);
 
             // get the contentId/mapKey from URL

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?view=diff&rev=516536&r1=516535&r2=516536
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Fri Mar  9 12:12:44 2007
@@ -44,6 +44,7 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.collections.MapStack;
 import org.ofbiz.base.util.template.FreeMarkerWorker;
+import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.content.content.UploadContentAndImage;
 import org.ofbiz.content.email.NotificationServices;
 import org.ofbiz.entity.GenericDelegator;
@@ -759,7 +760,8 @@
         // resource type
         } else if (dataResourceTypeId.equals("URL_RESOURCE")) {
             String text = null;
-            URL url = new URL(dataResource.getString("objectInfo"));
+            URL url = FlexibleLocation.resolveLocation(dataResource.getString("objectInfo"));
+            
             if (url.getHost() != null) { // is absolute
                 InputStream in = url.openStream();
                 int c;