[jboss-svn-commits] JBL Code SVN: r8812 - in labs/jbosslabs/trunk/portal-extensions: forge-prj-info and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2007-01-10 18:50:03 -0500 (Wed, 10 Jan 2007)
New Revision: 8812

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfEmptyTag.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml
Log:
JBLAB-780
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfEmptyTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfEmptyTag.java	2007-01-10 23:42:47 UTC (rev 8811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfEmptyTag.java	2007-01-10 23:50:03 UTC (rev 8812)
@@ -42,13 +42,14 @@
 			((value instanceof String) && (((String) value).length() == 0)) ||
 			((value instanceof Collection) && (((Collection)value).size() == 0))
 		)
-			return EVAL_PAGE;
+			return EVAL_BODY_INCLUDE;
 		else
 			return SKIP_BODY;
 	}
 
 	public int doEndTag() {
-		return SKIP_BODY;
+		
+		return EVAL_PAGE;
 	}
 
 	public Object getValue() {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java	2007-01-10 23:42:47 UTC (rev 8811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java	2007-01-10 23:50:03 UTC (rev 8812)
@@ -38,17 +38,22 @@
 
 	public int doStartTag() throws JspException {
 		
+		System.out.println("IfNotEmptyTag | value=" + value);
+		
 		if ((value == null) ||
 			((value instanceof String) && (((String) value).length() == 0)) ||
 			((value instanceof Collection) && (((Collection)value).size() == 0))
 		)
 			return SKIP_BODY;
 		else
-			return EVAL_PAGE;
+			return EVAL_BODY_INCLUDE;
 	}
 
 	public int doEndTag() {
-		return SKIP_BODY;
+		
+		System.out.println("DO END TAG ifn");
+		
+		return EVAL_PAGE;
 	}
 
 	public Object getValue() {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml	2007-01-10 23:42:47 UTC (rev 8811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml	2007-01-10 23:50:03 UTC (rev 8812)
@@ -23,10 +23,9 @@
 	    <version>1.0</version>
 	</dependency>
 	<dependency>
-		<groupId>taglibs</groupId>
+		<groupId>jstl</groupId>
 		<artifactId>jstl</artifactId>
-		<version>1.0</version>
-		<jar>jstl.jar</jar>
+		<version>1.1.2</version>
 		<properties>
 			<war.bundle>true</war.bundle>
 		</properties>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml	2007-01-10 23:42:47 UTC (rev 8811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml	2007-01-10 23:50:03 UTC (rev 8812)
@@ -9,13 +9,13 @@
 	<managed-bean>
 		<managed-bean-name>p</managed-bean-name>
 		<managed-bean-class>org.jboss.forge.projects.info.ProjectsServerBean</managed-bean-class>
-		<managed-bean-scope>application</managed-bean-scope>
+		<managed-bean-scope>request</managed-bean-scope>
 	</managed-bean>
 	
 	<managed-bean>
 		<managed-bean-name>x</managed-bean-name>
 		<managed-bean-class>org.jboss.forge.projects.info.ProjectsServerBean</managed-bean-class>
-		<managed-bean-scope>application</managed-bean-scope>
+		<managed-bean-scope>request</managed-bean-scope>
 	</managed-bean>
 	
 </faces-config>