[jboss-svn-commits] JBL Code SVN: r6375 - in labs/jbossforums/trunk: authz-jaae-plugin forums forums/src/main/org/jboss/portlet/forums/ui forums/src/main/org/jboss/portlet/forums/ui/view forums/src/resources/portal-forums-ear/META-INF forums/src/resources/portal-forums-war/WEB-INF/classes forums/src/resources/portal-forums-war/views/admin forums/src/resources/portal-forums-war/views/topics thirdparty/facelets/lib tools/etc/buildfragments

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Sep 22 12:55:22 EDT 2006


Author: unibrew
Date: 2006-09-22 12:55:11 -0400 (Fri, 22 Sep 2006)
New Revision: 6375

Added:
   labs/jbossforums/trunk/thirdparty/facelets/lib/el-ri.jar
Modified:
   labs/jbossforums/trunk/authz-jaae-plugin/build.xml
   labs/jbossforums/trunk/forums/build.xml
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java
   labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
   labs/jbossforums/trunk/tools/etc/buildfragments/libraries.ent
Log:
[JBFORUMS-105] Final bugfixes for migration to Portal 2.4.

Modified: labs/jbossforums/trunk/authz-jaae-plugin/build.xml
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/build.xml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/authz-jaae-plugin/build.xml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -200,8 +200,10 @@
      | Deploy the application
    -->
    <target name="deploy" description="Deploy." depends="output">
-		<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
-		<copy file="${build.lib}/portal-forums-authz-plugin.sar" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>	    
+		<!--<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+		<copy file="${build.lib}/portal-forums-authz-plugin.sar" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>-->
+		<require file="../forums/output/lib"/>
+		<copy file="${build.lib}/portal-forums-authz-plugin.sar" todir="../forums/output/lib/"/>
 	</target>
 
    <!--

Modified: labs/jbossforums/trunk/forums/build.xml
===================================================================
--- labs/jbossforums/trunk/forums/build.xml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/build.xml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -213,9 +213,10 @@
 
       <!-- portal-forums.ear -->
       <copy todir="${build.resources}/portal-forums-ear">
-			<fileset dir="${jakarta.lucene.root}/lib" includes="lucene-1.4-final.jar"/>
+			<fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
 			<fileset dir="${jbportal.root}/lib" includes="portal-forums-lib.jar"/>
-			<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar"/>
+			<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar"/>
+			<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
 	  </copy>
 	  <jar jarfile="${build.lib}/portal-forums.ear">
 			<fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>
@@ -262,8 +263,21 @@
      | Deploy the application
    -->
    <target name="deploy" description="Deploy." depends="output">
+	   
+	   <!-- TEMPORARILY COPIED HERE, NEEDS TO BE REDONE -->
+	   <!-- portal-forums.ear -->
+	   <copy todir="${build.resources}/portal-forums-ear">
+		   <fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
+		   <fileset dir="${jbportal.root}/lib" includes="portal-forums-lib.jar"/>
+		   <fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar"/>
+		   <fileset dir="${jbportal.root}/../facelets/lib" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
+	   </copy>
+	   <jar jarfile="${build.lib}/portal-forums.ear">
+		   <fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>
+	  </jar>
+	   
 		<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
-		<copy file="${build.lib}/portal-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>	    
+		<copy file="${build.lib}/portal-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
 	</target>
 
    <!--

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2006-09-22 16:55:11 UTC (rev 6375)
@@ -57,6 +57,7 @@
 
 import org.jboss.portal.core.CoreConstants;
 import org.jboss.portal.core.modules.ModuleConstants;
+import org.jboss.portal.identity.PropertyMap;
 import org.jboss.portal.identity.UserModule;
 import org.jboss.portal.identity.User;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLConfig;
@@ -86,8 +87,100 @@
 {
     private static CLLoader loader = new CLLoader("template");
     private static Logger log = Logger.getLogger(PortalUtil.class);
-    private static CoreConstants coreConstants = new CoreConstants()
+    private static User user = new User()
         {
+            public Object getId() {
+                return null;
+            }
+
+            public boolean getEnabled() {
+                return false;
+            }
+
+            public void setEnabled(boolean b) {
+            }
+
+            public void updatePassword(String string) {
+            }
+
+            public boolean validatePassword(String string) {
+                return false;
+            }
+
+            public PropertyMap getProperties() {
+                return null;
+            }
+
+            public String getUserName() {
+                return null;
+            }
+
+            public String getGivenName() {
+                return null;
+            }
+
+            public void setGivenName(String string) {
+            }
+
+            public String getFamilyName() {
+                return null;
+            }
+
+            public void setFamilyName(String string) {
+            }
+
+            public String getRealEmail() {
+                return null;
+            }
+
+            public void setRealEmail(String string) {
+            }
+
+            public String getFakeEmail() {
+                return null;
+            }
+
+            public void setFakeEmail(String string) {
+            }
+
+            public Date getRegistrationDate() {
+                return null;
+            }
+
+            public boolean getViewRealEmail() {
+                return false;
+            }
+
+            public void setViewRealEmail(boolean b) {
+            }
+
+            public Locale getPreferredLocale() {
+                return null;
+            }
+
+            public void setPreferredLocale(Locale locale) {
+            }
+
+            public String getSignature() {
+                return null;
+            }
+
+            public void setSignature(String string) {
+            }
+
+            public Date getLastVisitDate() {
+                return null;
+            }
+
+            public void setLastVisitDate(Date date) {
+            }
+
+            public String getTheme() {
+                return null;
+            }
+
+            public void setTheme(String string) {
+            }
         };
 
      
@@ -280,7 +373,7 @@
     }
 
     /**
-     * TODO: IMPLEMENTATION CHANGES BETWEEN PORTAL 2.2 and 2.4. In 2.4 constants are in User interface.
+     * 
      * @return
      * @throws Exception
      */
@@ -291,7 +384,7 @@
         String valueStr = null;
         try
         {
-            property = coreConstants.getClass().getField(propertyName).get(coreConstants).toString();
+            property = user.getClass().getField(propertyName).get(user).toString();
             Object value = properties.get(property);
             if (value != null)
             {

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java	2006-09-22 16:55:11 UTC (rev 6375)
@@ -221,18 +221,4 @@
             }
         }
     }
-  
-  
-  //implement this functionality later in 1.1.0 release of forums-------------------------------------------------------------------------------------------------------------------------------------------------
-  /**
-     * This method is for changing the displayed amount of posts in topic. User may
-     * want to see posts from 1 Day, 7 Days, 2 Weeks etc. Additionaly user may
-     * decide to show them in descending or ascending order.
-     * @return
-     */
-  /* TODO: METHOD IS WAITING FOR NEEDED METHODS IN FORUMSMODEL   
-  public String topicsConstraint () 
-  {
-      
-  }*/    
 }

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -1,13 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
-   <display-name>JBoss Forums</display-name>
-   <module>
-		<java>portal-forums-ui.jar</java>
-   </module>
-   <module>
-      <web>
-         <web-uri>portal-forums.war</web-uri>
-         <!--context-root>/forums</context-root-->
-      </web>
-   </module>   
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+   <display-name>JBoss Forums</display-name>
+   <module>
+		<java>portal-forums-ui.jar</java>
+   </module>
+   <module>
+	   <java>jsf-facelets.jar</java>
+   </module>
+   <module>
+	   <java>el-api.jar</java>
+   </module>
+   <module>
+	   <java>el-ri.jar</java>
+   </module>
+   <!--<module>
+	   <java>tomahawk.jar</java>
+   </module>
+   <module>
+	   <java>myfaces-impl.jar</java>
+   </module>
+   <module>
+	   <java>myfaces-api.jar</java>
+   </module>
+   <module>
+	   <java>commons-collections.jar</java>
+   </module>
+   <module>
+	   <java>commons-fileupload.jar</java>
+   </module>
+   <module>
+	   <java>javassist.jar</java>
+   </module>-->
+   <module>
+      <web>
+         <web-uri>portal-forums.war</web-uri>
+         <!--context-root>/forums</context-root-->
+      </web>
+   </module>   
+</application>

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -1,9 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-   <module>
-      <service>portal-forums.sar</service>
-   </module>
-   <module>
-      <service>jboss-service.xml</service>
-   </module>
-</jboss-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+   <loader-repository> 
+         forums.jboss.com:loader=jboss-forums-sar 
+      <loader-repository-config>
+         java2ParentDelegation=false 
+      </loader-repository-config> 
+   </loader-repository>
+   <module>
+	   <java>portal-forums-ui.jar</java>
+   </module>
+   <module>
+      <service>portal-forums.sar</service>
+   </module>
+   <module>
+	   <service>portal-forums-authz-plugin.sar</service>
+   </module>
+   <module>
+      <service>jboss-service.xml</service>
+   </module>
+</jboss-app>

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/security-config.xml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -1,22 +1,34 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
-security domain used by the security-spec test case
--->
-<policy>
-    <application-policy name="forums">       
-       <authentication>
-         <login-module code="org.jboss.portal.core.security.jaas.ModelLoginModule" flag="required">
-            <module-option name="unauthenticatedIdentity">guest</module-option>
-            <module-option name="hashAlgorithm">MD5</module-option>
-            <module-option name="hashEncoding">HEX</module-option>
-            <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
-            <module-option name="additionalRole">Authenticated</module-option>
-            <module-option name="password-stacking">useFirstPass</module-option>
-         </login-module>
-      </authentication>
-    </application-policy>
-</policy>
\ No newline at end of file
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
+security domain used by the security-spec test case
+-->
+<!--<policy>
+    <application-policy name="forums">       
+       <authentication>
+	       <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
+            <module-option name="unauthenticatedIdentity">guest</module-option>
+            <module-option name="hashAlgorithm">MD5</module-option>
+            <module-option name="hashEncoding">HEX</module-option>
+            <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+            <module-option name="additionalRole">Authenticated</module-option>
+            <module-option name="password-stacking">useFirstPass</module-option>
+         </login-module>
+      </authentication>
+    </application-policy>
+</policy>-->
+<policy>
+	<application-policy name="forums">       
+       <authentication>
+<login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">             <module-option name="unauthenticatedIdentity">guest</module-option>
+	<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+	<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+	<module-option name="additionalRole">Authenticated</module-option>
+	<module-option name="password-stacking">useFirstPass</module-option>
+</login-module>
+</authentication>
+</application-policy>
+</policy>

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties	2006-09-22 16:55:11 UTC (rev 6375)
@@ -37,13 +37,13 @@
 L_MESSAGE=Message
 Message=Message
 
-1_Day=1 Day
-7_Days=7 Days
-2_Weeks=2 Weeks
-1_Month=1 Month
-3_Months=3 Months
-6_Months=6 Months
-1_Year=1 Year
+period_1_Day=1 Day
+period_7_Days=7 Days
+period_2_Weeks=2 Weeks
+period_1_Month=1 Month
+period_3_Months=3 Months
+period_6_Months=6 Months
+period_1_Year=1 Year
 
 Go=Go
 Jump_to=Jump to

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -61,7 +61,7 @@
 		      </tr>
 		      <tr>
 		         <td class="catBottom" colspan="2" align="center">		         			         	
-		         	<h:commandButton value="{resource.Confirm}" styleClass="mainoption" action="#{adminController.deleteCategory}"/>
+		         	<h:commandButton value="${resource.Confirm}" styleClass="mainoption" action="#{adminController.deleteCategory}"/>
 		         </td>
 		      </tr>
 		   </table>

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-09-22 16:55:11 UTC (rev 6375)
@@ -229,15 +229,15 @@
                      <br/>
                      <!-- TODO: NEED TO BE REIMPLEMENTED
                      <span class="postdetails">                        
-                        ${postrow.poster.user.POSTER_RANK}
-                        <br/>
-                        ${postrow.RANK_IMAGE}${postrow.POSTER_AVATAR}
-                        <br/>
-                        ${postrow.POSTER_JOINED}
-                        <br/>
-                        ${postrow.POSTER_POSTS}
-                        <br/>
-                        ${postrow.POSTER_FROM}
+                        ${POSTER_RANK}
+                        <br />
+                        ${RANK_IMAGE}${POSTER_AVATAR}
+                        <br />
+                        ${POSTER_JOINED}
+                        <br />
+                        ${POSTER_POSTS}
+                        <br />
+                        ${POSTER_FROM}
                      </span>
                      -->
                      <br/>
@@ -448,13 +448,13 @@
                               <!--
 
 								if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 && navigator.userAgent.indexOf('6.') == -1 )
-									document.write(' ${postrow.ICQ_IMG}');
+									document.write(' ${ICQ_IMG}');
 								else
-									document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">${postrow.ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${postrow.ICQ_STATUS_IMG}</div></div>');
+									document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">${ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${ICQ_STATUS_IMG}</div></div>');
 				
 							  //-->
                               <!--</script>
-                                 <noscript>${postrow.ICQ_IMG}</noscript>-->
+                                 <noscript>${ICQ_IMG}</noscript>-->
                            </td>
                         </tr>
                      </table>
@@ -471,31 +471,33 @@
          <!--tr align="center">
             <td class="catBottom" colspan="2" height="28">
                 <table cellspacing="0" cellpadding="0" border="0">
-				<tr>
-                <h:form>
+                    <tr>
+                          <h:form>
 				<td align="center">
                                     <span class="gensmall">
                                         ${resource.Display_posts}:
                                         <h:selectOneMenu value="#{topic.postDays}">
                                             <f:selectItem itemValue="0" itemLabel="All Posts" />
-                                            <f:selectItem itemValue="86400000" itemLabel="#{resource.1_Day}" />
-                                            <f:selectItem itemValue="604800000" itemLabel="#{resource.7_Days}" />
-                                            <f:selectItem itemValue="1209600000" itemLabel="#{resource.2_Weeks}" />
-                                            <f:selectItem itemValue="2592000000" itemLabel="#{resource.1_Month}" />
-                                            <f:selectItem itemValue="7776000000" itemLabel="#{resource.3_Months}" />
-                                            <f:selectItem itemValue="15552000000" itemLabel="#{resource.6_Months}" />
-                                            <f:selectItem itemValue="31104000000" itemLabel="#{resource.1_Year}" />
+                                            <f:selectItem itemValue="86400000" itemLabel="#{resource.period_1_Day}" />
+                                            <f:selectItem itemValue="604800000" itemLabel="#{resource.period_7_Days}" />
+                                            <f:selectItem itemValue="1209600000" itemLabel="#{resource.period_2_Weeks}" />
+                                            <f:selectItem itemValue="2592000000" itemLabel="#{resource.period_1_Month}" />
+                                            <f:selectItem itemValue="7776000000" itemLabel="#{resource.period_3_Months}" />
+                                            <f:selectItem itemValue="15552000000" itemLabel="#{resource.period_6_Months}" />
+                                            <f:selectItem itemValue="31104000000" itemLabel="#{resource.period_1_Year}" />
                                         </h:selectOneMenu>
                                         <h:selectOneMenu>
                                             <f:selectItem itemValue="0" itemLabel="#{resource.L_ASCENDING}" />
                                             <f:selectItem itemValue="1" itemLabel="#{resource.L_DESCENDING}" />
                                         </h:selectOneMenu>
-                                        <h:commandButton value="${resource.Go}" class="liteoption" action="#{topic.topicsConstraint}"/>
+                                        
+                                        <input type="button" value="${resource.Go}" class="liteoption"  />
+                                        
                                     </span>
                                 </td>
                             </h:form>
                         </tr>
-				</table>
+                    </table>
             </td>
  	   </tr>-->
  	   
@@ -677,21 +679,36 @@
    		<tr>   			
          	<td width="40%" valign="top" nowrap="nowrap" align="left">
             	<span class="gensmall">
+                
             		<c:choose>
+                        
             			<c:when test="#{forums:isWatchingTopic(topic.topic)}">
-            				<h:commandLink action="#{topicWatch.deActivateWatch}">
+                                
+            				<h:commandLink id="watchDeActivator" action="#{topicWatch.deActivateWatch}" >
+                                        
             					<f:param name="t" value="#{topic.topic.id}"/>
+                                                
             					<h:outputText>Stop watching this topic for replies</h:outputText>
+                                                
             				</h:commandLink>
             			</c:when>
+                                
             			<c:otherwise>
-            				<h:commandLink action="#{topicWatch.activateWatch}">
+                                
+            				<h:commandLink id="watchActivator" action="#{topicWatch.activateWatch}" >
+                                        
             					<f:param name="t" value="#{topic.topic.id}"/>
+                                                
             					<h:outputText>Watch this topic for replies</h:outputText>
+                                                
             				</h:commandLink>
+                                        
             			</c:otherwise>
+                                
             		</c:choose>
+                        
             	</span>
+                
             	<br/>
             	&#160;
             	<br/>

Added: labs/jbossforums/trunk/thirdparty/facelets/lib/el-ri.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/trunk/thirdparty/facelets/lib/el-ri.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossforums/trunk/tools/etc/buildfragments/libraries.ent
===================================================================
--- labs/jbossforums/trunk/tools/etc/buildfragments/libraries.ent	2006-09-22 16:40:48 UTC (rev 6374)
+++ labs/jbossforums/trunk/tools/etc/buildfragments/libraries.ent	2006-09-22 16:55:11 UTC (rev 6375)
@@ -121,7 +121,7 @@
   <property name="facelets.root" value="${project.thirdparty}/facelets"/>
   <property name="facelets.lib" value="${facelets.root}/lib"/>
   <path id="facelets.classpath">
-    <filelist dir="${facelets.lib}" files="jsf-facelets.jar,el-api.jar"/>
+    <filelist dir="${facelets.lib}" files="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
   </path>
 
   <!-- Hibernate -->




More information about the jboss-svn-commits mailing list