Author: julien(a)jboss.com Date: 2007-02-24 20:11:40 -0500 (Sat, 24 Feb 2007) New Revision: 6395 Modified: trunk/core-admin/build.xml trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml trunk/core/build.xml Log: package facelets & co in jboss-portal.sar rather than in portal-admin.sar Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2007-02-25 01:07:09 UTC (rev 6394) +++ trunk/core/build.xml 2007-02-25 01:11:40 UTC (rev 6395) @@ -338,6 +338,12 @@ <fileset dir="${apache.fileupload.lib}" includes="commons-fileupload.jar"/> <fileset dir="${jakarta.io.lib}" includes="commons-io.jar"/> <fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/> + + <!-- For JSF --> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/> + <fileset dir="${apache.lang.lib}" includes="commons-lang-2.0.jar"/> + <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> + <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> </copy> </target> Modified: trunk/core-admin/build.xml =================================================================== --- trunk/core-admin/build.xml 2007-02-25 01:07:09 UTC (rev 6394) +++ trunk/core-admin/build.xml 2007-02-25 01:11:40 UTC (rev 6395) @@ -196,11 +196,7 @@ </copy> <copy todir="${build.resources}/portal-admin.sar/lib"> <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> - <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${apache.tomahawk.lib}" includes="tomahawk.jar"/> - <fileset dir="${source.etc}/sun-jsf" includes="jsf-example.jar"/> - <fileset dir="${apache.lang.lib}" includes="commons-lang-2.0.jar"/> - <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/portal-admin.war"> <fileset dir="${build.resources}/portal-admin-war"/> Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 01:07:09 UTC (rev 6394) +++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 01:11:40 UTC (rev 6395) @@ -17,7 +17,7 @@ <h:panelGroup rendered="#{instance != null}"> <h:outputText value="#{instance.id}"/> <h:panelGroup rendered="#{portlet != null}"> - <h:outputText value="there is a portlet"/> + <h:outputText value="Portlet #{portlet.name} - #{portlet.description}"/> </h:panelGroup> </h:panelGroup> </pfc:context>