[Jboss-svn-commits] JBL Code SVN: r4742 - in labs/jbosslabs/trunk/portal-extensions/forge-ads: . src/java/org/jbosslabs/portlet/ads

[<jbo...@li...>]

Author: adamw
Date: 2006-06-12 12:19:23 -0400 (Mon, 12 Jun 2006)
New Revision: 4742

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
Log:
Ads fix

Added: labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml	2006-06-12 15:47:43 UTC (rev 4741)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml	2006-06-12 16:19:23 UTC (rev 4742)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shotoku-base" />
+    <orderEntry type="module" module-name="shotoku-aop" />
+    <orderEntry type="module" module-name="forge-common" />
+    <orderEntry type="library" name="jboss" level="application" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java	2006-06-12 15:47:43 UTC (rev 4741)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java	2006-06-12 16:19:23 UTC (rev 4742)
@@ -28,6 +28,7 @@
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.common.projects.ProjectsHelper;
 import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
@@ -62,10 +63,10 @@
     		Projects projects = ProjectsHelper.getProjects(portalName);
     		        	
         	DelegateContext context = projects.getProjectContext(
-        									new NullPermissionsChecker(),
+        									new RenderRequestPermissionsChecker(rReq),
         									projectId);
         	
-        	if ((context.childIterator("ads") != null)
+        	if ((context != null) && (context.childIterator("ads") != null)
         				&& context.childIterator("ads").hasNext()) {
         		return context;
         	} else { // If project ads are not specified show default ads 
@@ -115,7 +116,7 @@
         rReq.setAttribute(PortalJsp.CTX_REQUEST, content);
         writeJsp(rReq, rRes, fileName);
     }
-
+
     protected static String[] parse(String target) {
         String[] cnt;
         String[] separated;