[jboss-svn-commits] JBL Code SVN: r10757 - in labs/jbosslabs/trunk/portal-extensions: binaries/portal/to-copy/jboss-portal.sar/conf and 68 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Apr 4 09:24:35 EDT 2007


Author: adamw
Date: 2007-04-04 09:24:34 -0400 (Wed, 04 Apr 2007)
New Revision: 10757

Added:
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/identity-config_2_6.dtd
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/profile-config_2_6.dtd
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/freemarker.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-admin-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-cms-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-management-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-samples-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/el-api.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/el-ri.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-example.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-facelets.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dyna.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/lib/portal-core-samples-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/accessorize.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/developers_banner.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/dodemo.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/getcode.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/jstl.jar
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/standard.jar
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
Removed:
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/commons-lang-2.0.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/el-api.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/el-ri.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jsf-example.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jsf-facelets.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/content/editor.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/META-INF/content.taglib.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/tabTemplate.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/myfaces_ext.tld
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/event.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/content/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/help.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/index.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/normal.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/dashboard/editpage.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/lib/portal-core-samples-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/accessorize.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/developers_banner.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/dodemo.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/getcode.gif
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml.old
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog.taglib.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/faces-config.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/jstl.jar
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/standard.jar
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld
Modified:
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/identity-config.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/standardidentity-config.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/login-config.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-federation-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-registration-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-search-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-core-admin-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss_portal.tld
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindow.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectNavigation.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portal.taglib.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/builder.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/controls.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dragdrop.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/effects.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/prototype.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/scriptaculous.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/slider.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/unittest.js
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-cms-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-core-cms-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-workflow.sar/portal-workflow-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-management.sar/lib/portal-core-management-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/error.jsp
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/lib/jboss-blog-core.jar
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/lib/portal-identity-lib.jar
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/forge/common/facelets/LabsFaceletsResourceResolver.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java
   labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/jboss-portlet.xml
Log:
New portal & blog - merge with -adam branch

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -34,6 +34,7 @@
       <attribute name="ConfigLocation">conf/config.xml</attribute>
    </mbean>
 
+   <!-- DTD repository -->
    <mbean
       code="org.jboss.portal.server.impl.xml.EntityResolverService"
       name="portal:service=EntityResolver"
@@ -50,6 +51,15 @@
       </attribute>
    </mbean>
 
+   <!-- Runtime context for running portlet container -->
+   <mbean
+      code="org.jboss.portal.web.jboss.JBossWebContext"
+      name="portal:service=ServletContainerContext"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
    <!-- Portal security services-->
    <mbean
       code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
@@ -91,6 +101,13 @@
       <xmbean/>
    </mbean>
    <mbean
+      code="org.jboss.portal.core.event.user.UserEventInterceptor"
+      name="portal:service=Interceptor,type=Server,name=UserEvent"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
       code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
       name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
       xmbean-dd=""
@@ -103,6 +120,7 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute name="CacheUser">true</attribute>
       <depends>portal:service=Module,type=IdentityServiceController</depends>
    </mbean>
    <mbean
@@ -127,6 +145,7 @@
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
          <depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=UserEvent</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
@@ -136,6 +155,20 @@
 
    <!-- Command stack -->
    <mbean
+      code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+      name="portal:service=Interceptor,type=Command,name=Ajax"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor"
+      name="portal:service=Interceptor,type=Command,name=NavigationalState"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
       code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
       name="portal:service=Interceptor,type=Command,name=PortalNode"
       xmbean-dd=""
@@ -160,13 +193,6 @@
          proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
-      name="portal:service=Interceptor,type=Command,name=Ajax"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
       code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
       name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
       xmbean-dd=""
@@ -183,10 +209,11 @@
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
       </depends-list>
    </mbean>
@@ -255,6 +282,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <depends
+         optional-attribute-name="ServletContainerContext"
+         proxy-type="attribute">portal:service=ServletContainerContext</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
@@ -491,7 +521,7 @@
 
    <!-- Registries -->
    <mbean
-      code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
+      code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"
       name="portal:service=WebAppRegistry"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -546,23 +576,12 @@
       <depends
          optional-attribute-name="InstanceContainer"
          proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="ContentProviderRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
       <attribute name="CacheNaturalId">true</attribute>
    </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.content.portlet.PortletContentHandler"
-      name="portal:service=ContentHandler,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="ContentType">portlet</attribute>
-   </mbean>
 
    <!-- Customization manager -->
    <mbean
@@ -584,6 +603,48 @@
       <attribute name="DashboardContextId">dashboard</attribute>
    </mbean>
 
+   <!-- The content provider framework -->
+   <mbean
+      code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
+      name="portal:service=ContentProviderRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
+      name="portal:service=ContentRenderer,type=portlet"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="ContentType">portlet</attribute>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.impl.model.content.generic.GenericContentProviderRegistry"
+      name="portal:service=GenericContentProviderRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+   </mbean>
+
    <!-- Integrate identity -->
    <mbean
       code="org.jboss.portal.core.identity.DashboardBridge"
@@ -700,50 +761,6 @@
          optional-attribute-name="DelegateFactory"
          proxy-type="attribute">portal:commandFactory=Dashboard</depends>
    </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
-      name="portal:commandFactory=Configurator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=configure"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/configure</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Configurator</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/test</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Test</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
-      name="portal:commandFactory=Test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">TestPortletInstance</attribute>
-   </mbean>
 
    <!-- URL factories -->
    <mbean
@@ -788,30 +805,6 @@
          optional-attribute-name="Factory"
          proxy-type="attribute">portal:urlFactory=Delegating</depends>
    </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
-      name="portal:urlFactory=Configurator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
-      <attribute name="Path">/configure</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
-      name="portal:urlFactory=Test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">TestPortletInstance</attribute>
-      <attribute name="Path">/test</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
 
    <!-- The federating portlet invoker -->
    <mbean
@@ -898,52 +891,6 @@
          proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
    </mbean>
 
-   <!-- The content editor registry -->
-   <mbean
-      code="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistryService"
-      name="portal:service=ContentEditorRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.portlet.dashboard.PortletContentEditor"
-      name="portal:service=ContentEditor,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentEditorRegistry</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="ContentType">portlet</attribute>
-   </mbean>
-
-   <!-- The content renderer registry -->
-   <mbean
-      code="org.jboss.portal.core.impl.model.portal.content.ContentRendererRegistryService"
-      name="portal:service=ContentRendererRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.portal.content.PortletContentRenderer"
-      name="portal:service=ContentRenderer,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="ContentType">portlet</attribute>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentRendererRegistry</depends>
-      <depends
-         optional-attribute-name="CustomizationManager"
-         proxy-type="attribute">portal:service=CustomizationManager</depends>
-   </mbean>
-
    <!-- The core controller -->
    <mbean
       code="org.jboss.portal.core.controller.classic.ClassicController"
@@ -977,7 +924,7 @@
          proxy-type="attribute">portal:service=CustomizationManager</depends>
       <depends
          optional-attribute-name="ContentRendererRegistry"
-         proxy-type="attribute">portal:service=ContentRendererRegistry</depends>
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
    </mbean>
 
    <!-- The ajax controller -->
@@ -1011,8 +958,26 @@
       <depends
          optional-attribute-name="CustomizationManager"
          proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="ContentRendererRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
    </mbean>
 
+   <!-- The controller factory -->
+   <mbean
+      code="org.jboss.portal.core.controller.ControllerFactory"
+      name="portal:service=ControllerFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="ClassicController"
+         proxy-type="attribute">portal:controller=Core</depends>
+      <depends
+         optional-attribute-name="AjaxController"
+         proxy-type="attribute">portal:controller=Ajax</depends>
+   </mbean>
+
    <!-- -->
    <mbean
       code="org.jboss.portal.server.impl.ServerImpl"
@@ -1069,8 +1034,8 @@
          optional-attribute-name="PortalObjectContainer"
          proxy-type="attribute">portal:container=PortalObject</depends>
       <depends
-         optional-attribute-name="ContentHandlerRegistry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
+         optional-attribute-name="ContentProviderRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <depends
          optional-attribute-name="PortalObjectEntityResolver"
          proxy-type="attribute">portal:service=EntityResolver</depends>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -23,6 +23,6 @@
 
 # Navigation Portlet
 PAGENAME_default=Home
-PAGENAME_Admin=Administraci�n
+PAGENAME_Admin=Administraci?n
 PAGENAME_Test=Ejemplos
 PAGENAME_News=Noticias
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -89,7 +89,7 @@
    </class>
    <class
       name="org.jboss.portal.core.impl.model.portal.PortalObjectImpl"
-      table="JBP_PORTAL_NODE">
+      table="JBP_PORTAL_OBJECT">
       <cache usage="read-write"/>
       <id
          name="key"

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/identity-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/identity-config.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/identity-config.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -22,9 +22,9 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-   <!--<!DOCTYPE identity-configuration PUBLIC
+   <!DOCTYPE identity-configuration PUBLIC
    "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN"
-   "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">-->
+   "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd">
 
 <identity-configuration>
    <datasources/>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -22,9 +22,9 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-   <!--<!DOCTYPE profile PUBLIC
+   <!DOCTYPE profile PUBLIC
    "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN"
-   "http://www.jboss.org/portal/dtd/profile-config_1_0.dtd">-->
+   "http://www.jboss.org/portal/dtd/profile-config_2_6.dtd">
 
 <profile>
    <!--Database mapping - jbp_user table column mapping-->

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/standardidentity-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/standardidentity-config.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/standardidentity-config.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -58,7 +58,7 @@
                <value>password</value>
             </option>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/LDAPConnectionContext</value>
             </option>
          </config>
@@ -77,7 +77,7 @@
          <!--set of options that are set in instantiated object-->
          <config>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/UserProfileModule</value>
             </option>
             <option>
@@ -109,7 +109,7 @@
                <value>java:/portal/IdentitySessionFactory</value>
             </option>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/UserModule</value>
             </option>
          </config>
@@ -131,7 +131,7 @@
                <value>java:/portal/IdentitySessionFactory</value>
             </option>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/RoleModule</value>
             </option>
          </config>
@@ -153,7 +153,7 @@
                <value>java:/portal/IdentitySessionFactory</value>
             </option>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/MembershipModule</value>
             </option>
          </config>
@@ -175,7 +175,7 @@
                <value>java:/portal/IdentitySessionFactory</value>
             </option>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/DBUserProfileModule</value>
             </option>
          </config>
@@ -194,7 +194,7 @@
          <!--set of options that are set in instantiated object-->
          <config>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/UserModule</value>
             </option>
             <option>
@@ -216,7 +216,7 @@
          <!--set of options that are set in instantiated object-->
          <config>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/RoleModule</value>
             </option>
             <option>
@@ -238,7 +238,7 @@
          <!--set of options that are set in instantiated object-->
          <config>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/MembershipModule</value>
             </option>
             <option>
@@ -260,7 +260,7 @@
          <!--set of options that are set in instantiated object-->
          <config>
             <option>
-               <name>jndiName</name>
+               <name>jNDIName</name>
                <value>java:/portal/LDAPUserProfileModule</value>
             </option>
             <option>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/login-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/login-config.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/login-config.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -42,6 +42,7 @@
             <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="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
             <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
             <module-option name="additionalRole">Authenticated</module-option>
             <module-option name="password-stacking">useFirstPass</module-option>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/identity-config_2_6.dtd (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/dtd/identity-config_2_6.dtd)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/identity-config_2_6.dtd	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/identity-config_2_6.dtd	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!--
+<!DOCTYPE identity-configuration PUBLIC
+   "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN"
+   "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd">
+-->
+
+<!--
+.
+-->
+<!ELEMENT identity-configuration (datasources,modules, options) >
+
+<!--
+.
+-->
+<!ELEMENT datasources (datasource*) >
+
+<!--
+.
+-->
+<!ELEMENT datasource (name, service-name?, class?, config) >
+
+<!--
+.
+-->
+<!ELEMENT name (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT service-name (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT class (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT config (option*)>
+
+<!--
+.
+-->
+<!ELEMENT option (name, value+) >
+
+<!--
+.
+-->
+<!ELEMENT value (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT modules (module*) >
+
+<!--
+.
+-->
+<!ELEMENT module (type, implementation, service-name?, class?, config) >
+
+<!--
+.
+-->
+<!ELEMENT type (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT implementation (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT options (option-group*)>
+
+<!--
+.
+-->
+<!ELEMENT option-group (group-name, option+)>
+
+<!--
+.
+-->
+<!ELEMENT group-name (#PCDATA) >
+

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/profile-config_2_6.dtd (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/dtd/profile-config_2_6.dtd)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/profile-config_2_6.dtd	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/profile-config_2_6.dtd	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!--
+<!DOCTYPE profile PUBLIC
+   "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN"
+   "http://www.jboss.org/portal/dtd/profile-config_2_6.dtd">
+-->
+
+
+<!--<profile>
+   --><!--Database mapping - jbp_user table column mapping--><!--
+   <property>
+      <name>portal.user.name.given</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Name</display-name>
+      <description xml:lang="en">The user name</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_username</value>
+         </database>
+      </mapping>
+   </property>-->
+
+<!--
+.
+-->
+<!ELEMENT profile (property+) >
+
+<!--
+.
+-->
+<!ELEMENT property (name, type, access-mode, usage, display-name, description, mapping) >
+
+<!--
+.
+-->
+<!ELEMENT name (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT type (#PCDATA)>
+
+<!--
+.
+-->
+<!ELEMENT access-mode (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT usage (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT display-name (#PCDATA) >
+
+<!ATTLIST display-name
+          xml:lang CDATA #IMPLIED>
+
+<!--
+.
+-->
+<!ELEMENT description (#PCDATA) >
+
+<!ATTLIST description
+          xml:lang CDATA #IMPLIED>
+<!--
+.
+-->
+<!ELEMENT mapping (database?, ldap?) >
+
+<!--
+.
+-->
+<!ELEMENT database (type, value) >
+
+<!--
+.
+-->
+<!--<!ELEMENT type (#PCDATA) >-->
+
+<!--
+.
+-->
+<!ELEMENT value (#PCDATA) >
+
+<!--
+.
+-->
+<!ELEMENT ldap (value) >
+
+
+
+

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/commons-lang-2.0.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/el-api.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/el-ri.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/freemarker.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/lib/freemarker.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jsf-example.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jsf-facelets.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-admin-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-admin-lib.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-cms-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-cms-lib.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-management-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-management-lib.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-samples-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-samples-lib.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-federation-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-registration-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-search-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/META-INF/jboss-service.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -23,30 +23,41 @@
 
 <server>
 
-   <!--   -->
    <mbean
-      code="org.jboss.portal.core.admin.ui.content.ContentEditorRegistryService"
-      name="portal:service=ContentEditorRegistry2"
+      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
+      name="portal:commandFactory=Configurator"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute name="InstanceId">DashboardConfigPortletInstance</attribute>
    </mbean>
 
-   <!--   -->
    <mbean
-      code="org.jboss.portal.core.admin.ui.content.PortletContentEditor"
-      name="portal:service=ContentEditor,type=portlet2"
+      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,path=configure"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <attribute name="ContentType">portlet</attribute>
-      <attribute name="FaceletPath">content/editor.xhtml</attribute>
+      <attribute name="Path">/configure</attribute>
       <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentEditorRegistry2</depends>
+         optional-attribute-name="DelegatingFactory"
+         proxy-type="attribute">portal:commandFactory=Delegating</depends>
       <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
+         optional-attribute-name="DelegateFactory"
+         proxy-type="attribute">portal:commandFactory=Configurator</depends>
    </mbean>
 
+   <mbean
+      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
+      name="portal:urlFactory=Configurator"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="InstanceId">DashboardConfigPortletInstance</attribute>
+      <attribute name="Path">/configure</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+
 </server>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/content/editor.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/content/editor.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/content/editor.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,47 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:ct="http://www.julien.com"
-   xmlns:pfc="http://www.jboss.com/portal/facelet/common"
-   xmlns:c="http://java.sun.com/jstl/core">
-
-   <table>
-      <tr>
-         <td>
-            <h:selectOneListbox
-               value="#{contentURI}"
-               styleClass="instanceList portlet-form-field"
-               onclick="#{submitFunction}"
-               size="13"
-               style="">
-               <f:selectItems value="#{registry.editors.portlet.instanceItems}"/>
-            </h:selectOneListbox>
-         </td>
-      </tr>
-      <tr>
-         <td>
-            <pfc:context>
-               <ui:param name="instance" value="#{registry.editors.portlet.instanceMap[contentURI]}"/>
-               <ui:param name="portlet" value="#{instance.portlet}"/>
-               <c:if test="#{instance != null}">
-                  <div class="portlet-font" style="float:left">
-                     <div><span class="portlet-form-field-label">Portlet instance:</span> #{instance.id}</div>
-                     <c:choose>
-                        <c:when test="#{portlet != null}">
-                           <ui:include src="/WEB-INF/jsf/common/showPortletDetails.xhtml">
-                              <ui:param name="portlet" value="#{portlet}"/>
-                           </ui:include>
-                        </c:when>
-                        <c:otherwise>The associated portlet is not available</c:otherwise>
-                     </c:choose>
-                  </div>
-               </c:if>
-            </pfc:context>
-         </td>
-      </tr>
-   </table>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/el-api.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/el-api.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/el-ri.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/el-ri.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-example.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-example.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-facelets.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-facelets.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-core-admin-lib.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-lib.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/META-INF/content.taglib.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/META-INF/content.taglib.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/META-INF/content.taglib.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,14 +0,0 @@
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
-   <namespace>http://www.julien.com</namespace>
-   <tag>
-      <tag-name>content</tag-name>
-      <handler-class>org.jboss.portal.core.admin.ui.content.ContentEditorTagHandler</handler-class>
-   </tag>
-   <tag>
-      <tag-name>context</tag-name>
-      <handler-class>org.jboss.portal.faces.facelet.ContextTagHandler</handler-class>
-   </tag>
-</facelet-taglib>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -28,7 +28,7 @@
 <faces-config>
 
    <application>
-      <property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
+      <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver>
       <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
     </application>
 
@@ -68,13 +68,9 @@
          <value>#{applicationScope.ThemeService}</value>
       </managed-property>
       <managed-property>
-         <property-name>authorizationDomainRegistry</property-name>
-         <value>#{applicationScope.AuthorizationDomainRegistry}</value>
+         <property-name>domainConfigurator</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
       </managed-property>
-      <managed-property>
-         <property-name>portalAuthorizationManagerFactory</property-name>
-         <value>#{applicationScope.PortalAuthorizationManagerFactory}</value>
-      </managed-property>
    </managed-bean>
    <managed-bean>
       <managed-bean-name>portalAction</managed-bean-name>
@@ -90,26 +86,25 @@
       <managed-bean-class>org.jboss.portal.core.admin.ui.actions.AddPageAction</managed-bean-class>
       <managed-bean-scope>request</managed-bean-scope>
       <managed-property>
-         <property-name>portalObjectManager</property-name>
-         <value>#{sessionScope.portalobjectmgr}</value>
+         <property-name>pageContainer</property-name>
+         <value>#{portalobjectmgr.selectedObject}</value>
       </managed-property>
-   </managed-bean>
-   <managed-bean>
-      <managed-bean-name>assignWindowsAction</managed-bean-name>
-      <managed-bean-class>org.jboss.portal.core.admin.ui.actions.AssignWindowsAction</managed-bean-class>
-      <managed-bean-scope>request</managed-bean-scope>
       <managed-property>
-         <property-name>portalObjectManager</property-name>
-         <value>#{sessionScope.portalobjectmgr}</value>
+         <property-name>messageTarget</property-name>
+         <value>addPageForm:pageName</value>
       </managed-property>
+      <managed-property>
+         <property-name>listener</property-name>
+         <value>#{sessionScope.dashboard}</value>
+      </managed-property>
    </managed-bean>
    <managed-bean>
       <managed-bean-name>themePropertyAction</managed-bean-name>
       <managed-bean-class>org.jboss.portal.core.admin.ui.actions.ThemePropertyAction</managed-bean-class>
       <managed-bean-scope>request</managed-bean-scope>
       <managed-property>
-         <property-name>portalObjectManager</property-name>
-         <value>#{sessionScope.portalobjectmgr}</value>
+         <property-name>portalObject</property-name>
+         <value>#{sessionScope.portalobjectmgr.selectedObject}</value>
       </managed-property>
    </managed-bean>
    <managed-bean>
@@ -136,8 +131,8 @@
          <value>#{applicationScope.InstanceContainer}</value>
       </managed-property>
       <managed-property>
-         <property-name>authorizationDomainRegistry</property-name>
-         <value>#{applicationScope.AuthorizationDomainRegistry}</value>
+         <property-name>domainConfigurator</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry.instance.configurator}</value>
       </managed-property>
    </managed-bean>
 
@@ -167,7 +162,34 @@
          <value>local</value>
       </managed-property>
    </managed-bean>
+
    <managed-bean>
+      <managed-bean-name>newWindowWizard</managed-bean-name>
+      <managed-bean-class>org.jboss.portal.core.admin.ui.wizard.NewWindowWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>instanceContainer</property-name>
+         <value>#{applicationScope.InstanceContainer}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>federatingPortletInvoker</property-name>
+         <value>#{applicationScope.FederatingPortletInvoker}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>portalObjectContainer</property-name>
+         <value>#{applicationScope.PortalObjectContainer}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>layoutService</property-name>
+         <value>#{applicationScope.LayoutService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>authorizationDomainRegistry</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry}</value>
+      </managed-property>
+   </managed-bean>
+
+   <managed-bean>
       <managed-bean-name>createInstanceAction</managed-bean-name>
       <managed-bean-class>org.jboss.portal.core.admin.ui.actions.CreateInstanceAction</managed-bean-class>
       <managed-bean-scope>request</managed-bean-scope>
@@ -190,19 +212,78 @@
       </managed-property>
    </managed-bean>
 
-   <!-- The content editor registry bean -->
+   <!--
+     | Dashboard beans
+    -->
+
    <managed-bean>
-      <managed-bean-name>registry</managed-bean-name>
-      <managed-bean-class>org.jboss.portal.core.admin.ui.content.ContentEditorRegistryBean</managed-bean-class>
+      <managed-bean-name>dashboard</managed-bean-name>
+      <managed-bean-class>org.jboss.portal.core.admin.ui.dashboard.DashboardBean</managed-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
       <managed-property>
-         <property-name>registry</property-name>
-         <value>#{applicationScope.ContentEditorRegistry}</value>
+         <property-name>portalObjectContainer</property-name>
+         <value>#{applicationScope.PortalObjectContainer}</value>
       </managed-property>
+      <managed-property>
+         <property-name>layoutService</property-name>
+         <value>#{applicationScope.LayoutService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>themeService</property-name>
+         <value>#{applicationScope.ThemeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>instanceContainer</property-name>
+         <value>#{applicationScope.InstanceContainer}</value>
+      </managed-property>
    </managed-bean>
+   <managed-bean>
+      <managed-bean-name>addDashboardPageAction</managed-bean-name>
+      <managed-bean-class>org.jboss.portal.core.admin.ui.actions.AddPageAction</managed-bean-class>
+      <managed-bean-scope>request</managed-bean-scope>
+      <managed-property>
+         <property-name>pageContainer</property-name>
+         <value>#{sessionScope.dashboard.userPortal}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>messageTarget</property-name>
+         <value>error</value>
+      </managed-property>
+      <managed-property>
+         <property-name>listener</property-name>
+         <value>#{sessionScope.dashboard}</value>
+      </managed-property>
+   </managed-bean>
 
+   <managed-bean>
+      <managed-bean-name>renameAction</managed-bean-name>
+      <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class>
+      <managed-bean-scope>request</managed-bean-scope>
+      <managed-property>
+         <property-name>portalObjectManager</property-name>
+         <value>#{sessionScope.portalobjectmgr}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>domainConfigurator</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
+      </managed-property>
+      
+   </managed-bean>
+
    <navigation-rule>
       <navigation-case>
+         <from-outcome>index</from-outcome>
+         <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>advancedMode</from-outcome>
+         <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>wizardMode</from-outcome>
+         <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
          <from-outcome>objects</from-outcome>
          <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
       </navigation-case>
@@ -223,6 +304,10 @@
          <to-view-id>/WEB-INF/jsf/editPageSecurity.xhtml</to-view-id>
       </navigation-case>
       <navigation-case>
+         <from-outcome>editProperties</from-outcome>
+         <to-view-id>/WEB-INF/jsf/editProperties.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
          <from-outcome>editPageTheme</from-outcome>
          <to-view-id>/WEB-INF/jsf/editPageTheme.xhtml</to-view-id>
       </navigation-case>
@@ -231,6 +316,11 @@
          <to-view-id>/WEB-INF/jsf/editWindowSecurity.xhtml</to-view-id>
       </navigation-case>
       <navigation-case>
+         <from-outcome>renameObject</from-outcome>
+         <to-view-id>/WEB-INF/jsf/renameObject.xhtml</to-view-id>
+      </navigation-case>
+      
+      <navigation-case>
          <from-outcome>editWindowTheme</from-outcome>
          <to-view-id>/WEB-INF/jsf/editWindowTheme.xhtml</to-view-id>
       </navigation-case>
@@ -242,6 +332,35 @@
          <from-outcome>portlets</from-outcome>
          <to-view-id>/WEB-INF/jsf/portlets.xhtml</to-view-id>
       </navigation-case>
+      <navigation-case>
+         <from-outcome>selectPortlet</from-outcome>
+         <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>selectPortal</from-outcome>
+         <to-view-id>/WEB-INF/jsf/wizard/selectPortal.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>selectPage</from-outcome>
+         <to-view-id>/WEB-INF/jsf/wizard/selectPage.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>selectRegion</from-outcome>
+         <to-view-id>/WEB-INF/jsf/wizard/selectRegion.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>newWindowWizardConfirm</from-outcome>
+         <to-view-id>/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id>
+      </navigation-case>
+
+      <navigation-case>
+         <from-outcome>dashboard</from-outcome>
+         <to-view-id>/WEB-INF/jsf/dashboard/dashboard.xhtml</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>confirm</from-outcome>
+         <to-view-id>/WEB-INF/jsf/common/confirm.xhtml</to-view-id>
+      </navigation-case>
    </navigation-rule>
 
    <lifecycle>
@@ -249,15 +368,20 @@
    </lifecycle>
 
    <component>
-      <component-type>com.jboss.portal.Scroller</component-type>
-      <component-class>org.jboss.portal.faces.scroller.UIScroller</component-class>
+      <component-type>org.jboss.portal.Scroller</component-type>
+      <component-class>org.jboss.portal.faces.component.scroller.UIScroller</component-class>
    </component>
+
+   <component>
+      <component-type>org.jboss.portal.Portlet</component-type>
+      <component-class>org.jboss.portal.faces.component.portlet.UIPortlet</component-class>
+   </component>
    
    <render-kit>
       <renderer>
          <component-family>javax.faces.Input</component-family>
          <renderer-type>default</renderer-type>
-         <renderer-class>org.jboss.portal.faces.scroller.ScrollerRenderer</renderer-class>
+         <renderer-class>org.jboss.portal.faces.component.scroller.ScrollerRenderer</renderer-class>
       </renderer>
    </render-kit>
 

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -35,6 +35,12 @@
          <link rel="stylesheet" type="text/css" href="/style.css" title="" media="screen"/>
       </header-content>
    </portlet>
+   <portlet>
+      <portlet-name>DashboardConfigPortlet</portlet-name>
+      <transaction>
+         <trans-attribute>Required</trans-attribute>
+      </transaction>
+   </portlet>
 
    <!-- Service injected in the portlet context. -->
    <service>
@@ -97,9 +103,4 @@
       <service-class>org.jboss.portal.portlet.federation.FederatingPortletInvoker</service-class>
       <service-ref>:service=PortletInvoker,type=Federating</service-ref>
    </service>
-   <service>
-      <service-name>ContentEditorRegistry</service-name>
-      <service-class>org.jboss.portal.core.admin.ui.content.ContentEditorRegistry</service-class>
-      <service-ref>:service=ContentEditorRegistry2</service-ref>
-   </service>
 </portlet-app>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss_portal.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss_portal.tld	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss_portal.tld	2007-04-04 13:24:34 UTC (rev 10757)
@@ -4,13 +4,13 @@
 <taglib>
 <tlib-version>0.01</tlib-version>
 <jsp-version>1.2</jsp-version>
-<short-name>scroller</short-name>
-<uri>http://www.jboss.com/portal</uri>
+<short-name>jbp</short-name>
+<uri>http://www.jboss.org/portal</uri>
 <description>This tag library contains the scroller tag.</description>
 
 <tag>
    <name>scroller</name>
-   <tag-class>org.jboss.portal.faces.scroller.ScrollerTag</tag-class>
+   <tag-class>org.jboss.portal.faces.component.scroller.ScrollerTag</tag-class>
    
    <attribute>
      <name>for</name>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,47 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:jbp="http://www.jboss.org/portal"
+   xmlns:c="http://java.sun.com/jstl/core"
+   class="admin-ui">
+      
+    <p class="portlet-class">WARNING ! You are about to delete the following element of the portal:</p>
+	<ul class="objectpath">
+      <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node">
+         <li>
+         &gt;
+         </li>
+         <c:choose>
+            <c:when test="#{node.id == portalobjectmgr.selectedObject.id}">
+               <li class="selected">
+                  <c:if test="#{node.name == ''}">root</c:if>
+                  <c:if test="#{node.name != ''}">#{node.name}</c:if>
+               </li>
+            </c:when>
+            <c:otherwise>
+               <li>
+                  <c:if test="#{node.name == ''}">root</c:if>
+                  <c:if test="#{node.name != ''}">#{node.name}</c:if>
+               </li>
+            </c:otherwise>
+         </c:choose>
+      </c:forEach>
+    </ul>
+
+    <p class="portlet-class">Are you sure ?</p>
+	
+	<h:form>
+	<h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}">
+        <h:outputText value="Yes"/>
+        <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+    </h:commandLink>
+    <h:outputText value=" | "/>
+	<h:commandLink action="objects" actionListener="#{portalobjectmgr.selectObject}">
+        <h:outputText value="No"/>
+        <f:param name="id" value="#{portalobjectmgr.selectedObject.parent.id}"/>
+    </h:commandLink>
+
+    </h:form>
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,153 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:jbp="http://www.jboss.org/portal"
+   xmlns:c="http://java.sun.com/jstl/core">
+
+<div style="float:left; padding:0 2em 0 2em">
+   <h:form id="layoutForm">
+      <table>
+         <c:forEach items="#{pageManager.regionNames}" var="regionName"
+                    varStatus="status">
+            <tbody>
+               <c:choose>
+                  <c:when test="#{status.index > 0}">
+                     <tr>
+                        <td colspan="2" class="portlet-form-field-label"
+                            style="border-width:0px;border-top:1px dashed #d5d5d5">#{regionName}
+                           Region
+                        </td>
+                     </tr>
+                  </c:when>
+                  <c:otherwise>
+                     <tr>
+                        <td colspan="2" class="portlet-form-field-label">#{regionName}
+                           Region
+                        </td>
+                     </tr>
+                  </c:otherwise>
+               </c:choose>
+               <tr>
+                  <td>
+                     <div>
+                        <h:commandButton value="Up" id="u_#{regionName}"
+                                         actionListener="#{pageManager.assignWindows}"
+                                         styleClass="portlet-form-button"/>
+                     </div>
+                     <div>
+                        <h:commandButton value="Down" id="d_#{regionName}"
+                                         actionListener="#{pageManager.assignWindows}"
+                                         styleClass="portlet-form-button"/>
+                     </div>
+                     <div style="margin-top: 1em">
+                        <h:commandButton
+                           value="Delete" id="l_#{regionName}"
+                           actionListener="#{pageManager.assignWindows}"
+                           styleClass="portlet-form-button"/>
+                     </div>
+                  </td>
+                  <td>
+                     <h:selectManyListbox
+                        value="#{pageManager.assignedWindows[regionName]}"
+                        size="7" styleClass="windowList portlet-form-field">
+                        <f:selectItems
+                           value="#{pageManager.windowItemsMap[regionName]}"/>
+                     </h:selectManyListbox>
+                  </td>
+               </tr>
+            </tbody>
+         </c:forEach>
+         <tbody>
+            <tr>
+               <td colspan="2" class="portlet-form-field-label"
+                   style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned
+                  windows
+               </td>
+            </tr>
+            <tr>
+               <td>
+                  <div style="margin-top: 1em">
+                     <h:commandButton value="Delete"
+                                      id="l_unknown" actionListener="#{pageManager.assignWindows}"
+                                      styleClass="portlet-form-button"/>
+                  </div>
+               </td>
+               <td>
+                  <h:selectManyListbox
+                     value="#{pageManager.assignedWindows['unknown']}"
+                     size="7" styleClass="windowList portlet-form-field">
+                     <f:selectItems
+                        value="#{pageManager.windowItemsMap['unknown']}"/>
+                  </h:selectManyListbox>
+               </td>
+            </tr>
+         </tbody>
+      </table>
+   </h:form>
+</div>
+<div style="float:left">
+   <table class="form">
+      <tr>
+         <td class="label">
+            <span class="portlet-form-field-label">Content type:</span>
+         </td>
+         <td class="widget">
+            <h:form id="abc">
+               <h:selectOneMenu
+                  id="instanceId"
+                  value="#{pageManager.selectedContentType}"
+                  styleClass="portlet-form-field contentType">
+                  <f:selectItems value="#{pageManager.contentTypeItems}"/>
+               </h:selectOneMenu>
+               <h:commandButton value="Change" styleClass="portlet-form-button"/>
+               <h:message for="instanceId" errorClass="portlet-msg-error"/>
+            </h:form>
+         </td>
+      </tr>
+      <tr>
+         <td class="label">
+            <span class="portlet-form-field-label">Window Name:</span>
+         </td>
+         <td class="widget">
+            <h:form id="windowForm">
+               <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/>
+               <h:message for="windowName" errorClass="portlet-msg-error"/>
+            </h:form>
+         </td>
+      </tr>
+      <tr>
+         <td class="label">
+            <span class="portlet-form-field-label">Target Region:</span>
+         </td>
+         <td class="widget">
+            <h:form id="regionForm">
+               <h:selectOneMenu id="targetRegion" value="#{pageManager.targetRegion}" styleClass="portlet-form-input-field">
+                  <f:selectItems value="#{pageManager.regionItems}"/>
+               </h:selectOneMenu>
+               <h:message for="targetRegion" errorClass="portlet-msg-error"/>
+            </h:form>
+         </td>
+      </tr>
+      <tr>
+         <td class="label">
+         </td>
+         <td class="widget">
+            <div style="margin-top:3em;">
+               <jbp:portlet
+                  portletId="#{pageManager.selectedEditorPortletId}"
+                  portletInvoker="#{pageManager.portletInvoker}"
+                  actionListener="#{pageManager.assignWindow}"
+                  supportedModes="edit_content"
+                  supportedWindowStates="normal"
+                  initialMode="edit_content"
+                  initialWindowState="normal"
+                  onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value).setParameter('targetRegion', document.getElementById('regionForm:targetRegion').value);"/>
+            </div>
+         </td>
+      </tr>
+   </table>
+</div>
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,62 @@
+<div
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:c="http://java.sun.com/jstl/core">
+
+   <h:form>
+      <table width="100%">
+         <thead class="portlet-section-header" style="text-align:left;">
+            <tr>
+               <th>Name</th>
+               <th>Value</th>
+               <th>Delete</th>
+            </tr>
+         </thead>
+         <tbody>
+            <c:forEach items="#{properties.entries}" var="prop" varStatus="status">
+               <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+                  <td>
+                     <h:outputText>#{prop.name}</h:outputText>
+                  </td>
+                  <td>
+                     <h:inputText value="#{prop.value}"/>
+                  </td>
+                  <td>
+                     <h:commandLink action="#{propertyAction.removeProperty}">
+                        <h:outputText>Delete</h:outputText>
+                        <f:param name="name" value="#{prop.name}"/>
+                     </h:commandLink>
+                  </td>
+               </tr>
+            </c:forEach>
+         </tbody>
+      </table>
+      <h:commandButton value="Update" styleClass="portlet-form-button"/>
+   </h:form>
+
+   <h:form>
+      <table width="100%">
+         <thead class="portlet-section-header" style="text-align:left;">
+            <tr>
+               <th>Property name</th>
+               <th>Property value</th>
+            </tr>
+         </thead>
+         <tbody>
+            <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+               <td>
+                  <h:inputText value="#{propertyAction.selectedProperty}"
+                       validator="#{propertyAction.validatePropertyName}" />
+               </td>
+               <td>
+                  <h:inputText value="#{propertyAction.propertyValue}"/>
+               </td>
+            </tr>
+         </tbody>
+      </table>
+      <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/>
+   </h:form>
+
+</div>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -16,7 +16,7 @@
                   </td>
                   <td>
                      <h:selectOneMenu id="layout" styleClass="portlet-form-field" value="#{themePropertyAction.layoutName}">
-                        <f:selectItems value="#{portalobjectmgr.themes.layoutNames}"/>
+                        <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
                      </h:selectOneMenu>
                   </td>
                </tr>
@@ -26,7 +26,7 @@
                   </td>
                   <td>
                      <h:selectOneMenu id="theme" styleClass="portlet-form-field" value="#{themePropertyAction.themeName}">
-                        <f:selectItems value="#{portalobjectmgr.themes.themeNames}"/>
+                        <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
                      </h:selectOneMenu>
                   </td>
                </tr>
@@ -36,7 +36,7 @@
                   </td>
                   <td>
                      <h:selectOneMenu id="renderSet" styleClass="portlet-form-field" value="#{themePropertyAction.renderSetName}">
-                        <f:selectItems value="#{portalobjectmgr.themes.renderSetNames}"/>
+                        <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
                      </h:selectOneMenu>
                   </td>
                </tr>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,48 @@
+<div
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core">
+      
+   <h:panelGroup styleClass="portlet-section-body" id="themepg">
+   <h:form id="themeform">
+      <fieldset style="border: 1px solid;">
+         <legend>Theme properties</legend>
+         <table>
+            <tbody>
+         <tr>
+            <td class="portlet-form-field-label"><label class="portlet-form-field-label">Window Renderer:</label>
+            </td>
+            <td>
+               <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.windowRendererName}">
+                        <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
+               </h:selectOneMenu>
+            </td>
+         </tr>
+         <tr>
+            <td class="portlet-form-field-label"><label class="portlet-form-field-label">Decoration Renderer:</label>
+            </td>
+            <td>
+               <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.decorationRendererName}">
+                        <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
+               </h:selectOneMenu>
+            </td>
+         </tr>
+         <tr>
+            <td class="portlet-form-field-label"><label class="portlet-form-field-label">Portlet Renderer:</label>
+            </td>
+            <td>
+               <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.portletRendererName}">
+                        <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
+               </h:selectOneMenu>
+            </td>
+         </tr>
+            </tbody>
+         </table>
+      </fieldset>
+      <div style="text-align:center;padding: 1em 0 1em 0">
+         <ui:insert name="form_submit"/>
+      </div>
+   </h:form>
+</h:panelGroup>
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,143 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:c="http://java.sun.com/jstl/core">
-
-
-<div align="center">
-   <h:message id="error" for="error" errorClass="portlet-msg-error"/>
-</div>
-
-<table width="100%">
-<tr>
-   <th colspan="2" class="portlet-section-header" align="center">Personal Dashboard Editor</th>
-</tr>
-<tr>
-   <td class="portlet-section-body" align="center">
-      <table width="100%">
-         <tr>
-            <td width="250">
-               <table class="bottombuttonbar">
-                  <tr>
-                     <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:&#160;
-                        <h:form style="padding:0;margin:0">
-                           <h:inputText id="pageName" value="#{addDashboardPageAction.pageName}"
-                                        styleClass="portlet-form-input-field"/>
-                           <h:commandButton value="Save"
-                                            action="#{addDashboardPageAction.execute}"
-                                            styleClass="portlet-form-button"/>
-                        </h:form>
-                     </td>
-                  </tr>
-               </table>
-            </td>
-            <td align="left" valign="top">
-               Use this page to manage the content and appearance of your dashboard pages. <br/>
-               You can control the page titles, column layouts, page themes,
-               and add,
-               order, or remove portlets.
-            </td>
-         </tr>
-      </table>
-   </td>
-</tr>
-<tr>
-   <th colspan="2" class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</th>
-</tr>
-<tr>
-   <td class="portlet-section-body" align="center">
-      <h:form style="padding:0;margin:0">
-         Select: <h:selectOneMenu
-            id="pageNameSelector"
-            value="#{dashboard.selectedPageName}"
-            styleClass="portlet-form-field">
-            <f:selectItems value="#{dashboard.pageItems}"/>
-         </h:selectOneMenu>
-         <h:commandButton value="Go" styleClass="portlet-form-button"/>
-      </h:form>
-      <br/>
-   </td>
-</tr>
-<tr>
-   <td>
-         <table width="100%">
-            <tr>
-               <td valign="top" width="250">
-                  <table class="bottombuttonbar">
-                     <tr>
-                        <td valign="top">
-                           <b>Theme and Layout</b>
-                           <br/>
-                           Apply a theme to your dashboard, or select the number of columns for the layout.
-                           <hr/>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td>
-                           <h:form>
-                              Choose a layout:<br/>
-                              <h:selectOneMenu
-                                 id="layoutSelector"
-                                 value="#{dashboard.selectedPageLayout}"
-                                 styleClass="portlet-form-field">
-                                 <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
-                              </h:selectOneMenu>
-                              <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/>
-                           </h:form>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td height="20"></td>
-                     </tr>
-                     <tr>
-                        <td>
-                           <h:form>
-                              Choose a theme:<br/>
-                              <h:selectOneMenu
-                                 id="themeSelector"
-                                 value="#{dashboard.selectedPageTheme}"
-                                 styleClass="portlet-form-field">
-                                 <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
-                              </h:selectOneMenu>
-                              <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/>
-                           </h:form>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td height="20"></td>
-                     </tr>
-                  </table>
-               </td>
-               <td>
-                  <table>
-                     <tr>
-                        <td>
-                           <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
-                              <ui:param name="pageManager" value="#{dashboard.pageManager}"/>
-                           </ui:include>
-                        </td>
-                     </tr>
-                  </table>
-               </td>
-            </tr>
-         </table>
-   </td>
-</tr>
-</table>
-<hr/>
-<c:if test="#{dashboard.selectePageIsDefault == false}">
-   <table width="100%">
-      <tr>
-         <td align="left">
-            <h:form style="padding:0;margin:0">
-               <h:commandButton value="Delete this Page" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/>
-               <br/>
-               <font color="red">You cannot undo this action!</font>
-            </h:form>
-         </td>
-      </tr>
-   </table>
-</c:if>
-</div>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,143 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:c="http://java.sun.com/jstl/core">
+
+
+<div align="center">
+   <h:message id="error" for="error" errorClass="portlet-msg-error"/>
+</div>
+
+<table width="100%">
+<tr>
+   <th colspan="2" class="portlet-section-header" align="center">Personal Dashboard Editor</th>
+</tr>
+<tr>
+   <td class="portlet-section-body" align="center">
+      <table width="100%">
+         <tr>
+            <td width="250">
+               <table class="bottombuttonbar">
+                  <tr>
+                     <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:&#160;
+                        <h:form style="padding:0;margin:0">
+                           <h:inputText id="pageName" value="#{addDashboardPageAction.pageName}"
+                                        styleClass="portlet-form-input-field"/>
+                           <h:commandButton value="Save"
+                                            action="#{addDashboardPageAction.execute}"
+                                            styleClass="portlet-form-button"/>
+                        </h:form>
+                     </td>
+                  </tr>
+               </table>
+            </td>
+            <td align="left" valign="top">
+               Use this page to manage the content and appearance of your dashboard pages. <br/>
+               You can control the page titles, column layouts, page themes,
+               and add,
+               order, or remove portlets.
+            </td>
+         </tr>
+      </table>
+   </td>
+</tr>
+<tr>
+   <th colspan="2" class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</th>
+</tr>
+<tr>
+   <td class="portlet-section-body" align="center">
+      <h:form style="padding:0;margin:0">
+         Select: <h:selectOneMenu
+            id="pageNameSelector"
+            value="#{dashboard.selectedPageName}"
+            styleClass="portlet-form-field">
+            <f:selectItems value="#{dashboard.pageItems}"/>
+         </h:selectOneMenu>
+         <h:commandButton value="Go" styleClass="portlet-form-button"/>
+      </h:form>
+      <br/>
+   </td>
+</tr>
+<tr>
+   <td>
+         <table width="100%">
+            <tr>
+               <td valign="top" width="250">
+                  <table class="bottombuttonbar">
+                     <tr>
+                        <td valign="top">
+                           <b>Theme and Layout</b>
+                           <br/>
+                           Apply a theme to your dashboard, or select the number of columns for the layout.
+                           <hr/>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td>
+                           <h:form>
+                              Choose a layout:<br/>
+                              <h:selectOneMenu
+                                 id="layoutSelector"
+                                 value="#{dashboard.selectedPageLayout}"
+                                 styleClass="portlet-form-field">
+                                 <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
+                              </h:selectOneMenu>
+                              <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/>
+                           </h:form>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td height="20"></td>
+                     </tr>
+                     <tr>
+                        <td>
+                           <h:form>
+                              Choose a theme:<br/>
+                              <h:selectOneMenu
+                                 id="themeSelector"
+                                 value="#{dashboard.selectedPageTheme}"
+                                 styleClass="portlet-form-field">
+                                 <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
+                              </h:selectOneMenu>
+                              <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/>
+                           </h:form>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td height="20"></td>
+                     </tr>
+                  </table>
+               </td>
+               <td>
+                  <table>
+                     <tr>
+                        <td>
+                           <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
+                              <ui:param name="pageManager" value="#{dashboard.pageManager}"/>
+                           </ui:include>
+                        </td>
+                     </tr>
+                  </table>
+               </td>
+            </tr>
+         </table>
+   </td>
+</tr>
+</table>
+<hr/>
+<c:if test="#{dashboard.selectePageIsDefault == false}">
+   <table width="100%">
+      <tr>
+         <td align="left">
+            <h:form style="padding:0;margin:0">
+               <h:commandButton value="Delete this Page" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/>
+               <br/>
+               <font color="red">You cannot undo this action!</font>
+            </h:form>
+         </td>
+      </tr>
+   </table>
+</c:if>
+</div>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -7,32 +7,57 @@
    <ui:composition template="objectTemplate.xhtml">
 
       <ui:define name="content">
+        
+        <h:form>
+         <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == 2}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
+            <h:outputText value="Page layout"/>
+            <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+         </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}">
+            <h:outputText value="Security"/>
+            <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+         </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Properties"/>
+                  <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+               </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
+            <h:outputText value="Theme"/>
+            <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+         </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == 1) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+            <h:outputText value="Rename"/>
+            <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+         </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+            <h:outputText value="Destroy"/>
+            <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+         </h:commandLink>
+        </h:form>
 
          <!-- Sub page addition -->
          <div style="padding:1em 0 0 0">
-            <div class="portlet-font">Create a nested page:</div>
-            <div style="padding:1em 0 1em 0">
-               <h:form>
-                  <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
+            <h:form id="addPageForm">
+               <span class="portlet-font">Create a nested page:</span>
+               <span style="padding:1em 0 1em 0">
+                  <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
                   <h:commandButton action="#{addPageAction.execute}" value="Add" styleClass="portlet-form-button"/>
-                  <h:message for="name" errorClass="portlet-msg-error"/>
-               </h:form>
-            </div>
+                  <h:message for="pageName" errorClass="portlet-msg-error"/>
+               </span>
+            </h:form>
          </div>
 
          <!-- Default page -->
          <div style="padding:1em 0 0 0">
-            <div class="portlet-font">Default page:</div>
-            <div style="padding:1em 0 1em 0">
                <h:form>
+                  <span class="portlet-font">Default page:</span>
+                  <span style="padding:1em 0 1em 0">
                   <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
                      <f:selectItems value="#{portalobjectmgr.portalPageItems}" />
                   </h:selectOneMenu>
                   <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
+                  </span>
                </h:form>
-            </div>
          </div>
 
+         
+
+
          <!-- Separation -->
          <hr/>
 

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -4,6 +4,7 @@
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ct="http://www.julien.com"
+      xmlns:jbp="http://www.jboss.org/portal"
       xmlns:c="http://java.sun.com/jstl/core">
 
 <ui:composition template="objectTemplate.xhtml">
@@ -12,95 +13,9 @@
 
      <h3>You are editing the page layout</h3>
 
-     <h:form id="layoutForm">
-        <div style="float:left;padding:0 2em 0 2em">
-           <table>
-              <c:forEach items="#{portalobjectmgr.regionNames}" var="regionName" varStatus="status">
-                 <tbody>
-                    <c:choose>
-                       <c:when test="#{status.index > 0}">
-                          <tr>
-                             <td colspan="3" class="portlet-form-field-label" style="border-width:0px;border-top:1px dashed #d5d5d5">#{regionName} Region</td>
-                          </tr>
-                       </c:when>
-                       <c:otherwise>
-                          <tr>
-                             <td colspan="3" class="portlet-form-field-label">#{regionName} Region</td>
-                          </tr>
-                       </c:otherwise>
-                    </c:choose>
-                    <tr>
-                       <td>
-                          <div>
-                             <h:commandButton value="Up" id="u_#{regionName}" actionListener="#{assignWindowsAction.execute}" styleClass="portlet-form-button"/>
-                          </div>
-                          <div>
-                             <h:commandButton value="Down" id="d_#{regionName}" actionListener="#{assignWindowsAction.execute}" styleClass="portlet-form-button"/>
-                          </div>
-                       </td>
-                       <td>
-                          <h:selectManyListbox
-                             value="#{assignWindowsAction.assignedWindows[regionName]}"
-                             size="7"
-                             styleClass="windowList portlet-form-field">
-                             <f:selectItems value="#{portalobjectmgr.windowItemsMap[regionName]}"/>
-                          </h:selectManyListbox>
-                       </td>
-                       <td>
-                          <div>
-                             <h:commandButton value="-&gt;" id="l_#{regionName}" actionListener="#{assignWindowsAction.execute}" styleClass="portlet-form-button"/>
-                          </div>
-                          <div>
-                             <h:commandButton value="&lt;-" id="r_#{regionName}" actionListener="#{assignWindowsAction.execute}" styleClass="portlet-form-button"/>
-                          </div>
-                       </td>
-                    </tr>
-                 </tbody>
-              </c:forEach>
-           </table>
-        </div>
-        <div style="float:left">
-           <table class="form">
-              <tr>
-                 <td class="label">
-                    <h:outputLabel for="windowName">
-                       <h:outputText value="Window Name: " styleClass="portlet-form-field-label"/>
-                    </h:outputLabel>
-                 </td>
-                 <td class="widget">
-                    <h:inputText id="windowName" value="#{assignWindowsAction.windowName}" styleClass="portlet-form-input-field"/>
-                    <h:message for="windowName" errorClass="portlet-msg-error"/>
-                 </td>
-              </tr>
-              <tr>
-                 <td class="label">
-                    <span class="portlet-form-field-label label">Content type:</span>
-                 </td>
-                 <td class="widget">
-                    <h:selectOneMenu
-                       id="instanceId"
-                       value="#{portalobjectmgr.selectedContentType}"
-                       styleClass="portlet-form-field contentType">
-                       <f:selectItems value="#{registry.availableTypes}"/>
-                    </h:selectOneMenu>
-                    <h:commandButton value="Update" styleClass="portlet-form-button"/>
-                    <h:message for="instanceId" errorClass="portlet-msg-error"/>
-                 </td>
-              </tr>
-              <tr>
-                 <td class="label">
-                    <span class="portlet-form-field-label label">Portlet instance:</span>
-                 </td>
-                 <td class="widget">
-                    <ct:content
-                       contentType="#{portalobjectmgr.selectedContentType}"
-                       contentURI="#{portalobjectmgr.selectedContentURI}"
-                       submitFunction="document.layoutForm.submit()"/>
-                 </td>
-              </tr>
-           </table>
-        </div>
-     </h:form>
+     <ui:include src="common/editPageLayout.xhtml">
+        <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/>
+     </ui:include>
 
   </ui:define>
 

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -9,12 +9,10 @@
          <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
             <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
             <ui:define name="form_submit">
-               <h:form>
-                  <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
-                  <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
-                     <f:param name="id" value="#{node.id}"/>
-                  </h:commandButton>
-               </h:form>
+               <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
+               <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true">
+                  <f:param name="id" value="#{node.id}"/>
+               </h:commandButton>
             </ui:define>
          </ui:decorate>
       </ui:define>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -10,12 +10,10 @@
          <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
             <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
             <ui:define name="form_submit">
-               <h:form>
-                  <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
-                  <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
-                     <f:param name="id" value="#{node.id}"/>
-                  </h:commandButton>
-               </h:form>
+               <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
+               <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true">
+                  <f:param name="id" value="#{node.id}"/>
+               </h:commandButton>
             </ui:define>
          </ui:decorate>
       </ui:define>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,18 @@
+<div
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html">
+
+   <ui:composition template="objectTemplate.xhtml">
+
+      <ui:define name="content">
+      	
+      	<ui:include src="common/editProperties.xhtml">
+  	       <ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/>
+        </ui:include>
+      
+      </ui:define>
+      
+   </ui:composition>
+</div>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindow.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindow.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindow.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -2,6 +2,7 @@
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:ct="http://www.julien.com"
+      xmlns:jbp="http://www.jboss.org/portal"
       xmlns:h="http://java.sun.com/jsf/html">
 
    <ui:composition template="objectTemplate.xhtml">
@@ -9,13 +10,17 @@
       <ui:define name="content">
 
          <!-- -->
-         <h:form id="window_form">
-            <ct:content
-               contentType="#{portalobjectmgr.selectedContentType}"
-               contentURI="#{portalobjectmgr.selectedContentURI}"
-               submitFunction="document.window_form.submit()"/>
-            <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/>
-         </h:form>
+         <div>
+            <jbp:portlet
+               actionListener="#{portalobjectmgr.processEvent}"
+               portletId="#{portalobjectmgr.selectedContentEditorInstance}"
+               portletInvoker="#{portalobjectmgr.portletDefinitionInvoker}"
+               renderParameters="#{portalobjectmgr.renderParameters}"
+               supportedModes="edit_content"
+               supportedWindowStates="normal"
+               initialMode="edit_content"
+               initialWindowState="normal"/>
+         </div>
 
       </ui:define>
 

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -8,7 +8,7 @@
          <h3>Please set the display options for the window:
             <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
          </h3>
-         <ui:decorate template="common/editTheme.xhtml">
+         <ui:decorate template="common/editWindowTheme.xhtml">
             <ui:define name="form_submit">
                <h:form>
                   <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -8,103 +8,111 @@
 
 <ui:composition template="instancesTemplate.xhtml">
 
-  <ui:define name="content">
+   <ui:define name="content">
 
-  <h:form>
+      <h:form>
 
-     <table id="instancesTable2" width="100%">
-        <thead class="portlet-section-header">
-           <tr>
-              <th>Id</th>
-              <th>Actions</th>
-           </tr>
-        </thead>
-        <tbody>
-           <c:forEach  items="#{instancemgr.selectedInstances}" var="instance" varStatus="status">
-              <tr class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
-                 <td>
-                    <h:commandLink action="#{instancemgr.selectInstance}">
-                       <h:outputText value="#{instance.id}"/>
-                       <f:param name="id" value="#{instance.id}"/>
-                       <f:param name="plugin" value="info"/>
-                    </h:commandLink>
-                 </td>
-                 <td>
-                    <h:commandLink action="#{instancemgr.selectInstance}">
-                       <h:outputText value="Preferences"/>
-                       <f:param name="id" value="#{instance.id}"/>
-                       <f:param name="plugin" value="preferences"/>
-                    </h:commandLink> | <h:commandLink action="#{instancemgr.selectInstance}">
-                       <h:outputText value="Security"/>
-                       <f:param name="id" value="#{instance.id}"/>
-                       <f:param name="plugin" value="security"/>
-                    </h:commandLink> | <h:commandLink action="#{instancemgr.deleteInstance}">
-                       <h:outputText value="Destroy"/>
-                       <f:param name="id" value="#{instance.id}"/>
-                    </h:commandLink>
-                 </td>
-              </tr>
-           </c:forEach>
-        </tbody>
-     </table>
-     <ul class="pagination">
-        <c:forEach begin="0" end="#{instancemgr.instanceCount}" step="#{instancemgr.paginationSize}" var="index">
-           <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}">
-              <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText value="#{index}"/></h:commandLink>
-           </li>
-        </c:forEach>
-     </ul>
+         <table id="instancesTable2" width="100%">
+            <thead class="portlet-section-header">
+               <tr>
+                  <th>Id</th>
+                  <th>Actions</th>
+               </tr>
+            </thead>
+            <tbody>
+               <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status">
+                  <tr
+                     class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
+                     <td>
+                        <h:commandLink action="#{instancemgr.selectInstance}">
+                           <h:outputText value="#{instance.id}"/>
+                           <f:param name="id" value="#{instance.id}"/>
+                           <f:param name="plugin" value="info"/>
+                        </h:commandLink>
+                     </td>
+                     <td>
+                        <h:commandLink action="#{instancemgr.selectInstance}">
+                           <h:outputText value="Preferences"/>
+                           <f:param name="id" value="#{instance.id}"/>
+                           <f:param name="plugin" value="preferences"/>
+                        </h:commandLink> | <h:commandLink action="#{instancemgr.selectInstance}">
+                        <h:outputText value="Security"/>
+                        <f:param name="id" value="#{instance.id}"/>
+                        <f:param name="plugin" value="security"/>
+                     </h:commandLink> | <h:commandLink action="#{instancemgr.deleteInstance}">
+                        <h:outputText value="Destroy"/>
+                        <f:param name="id" value="#{instance.id}"/>
+                     </h:commandLink>
+                     </td>
+                  </tr>
+               </c:forEach>
+            </tbody>
+         </table>
+         <ul class="pagination">
+            <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}"
+                       var="index">
+               <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}">
+                  <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText
+                     value="#{index}"/></h:commandLink>
+               </li>
+            </c:forEach>
+         </ul>
 
-  </h:form>
+      </h:form>
 
-  <c:if test="#{instancemgr.selectedPlugin != null}">
-     
-     <hr/>
+      <c:if test="#{instancemgr.selectedPlugin != null}">
 
-     <c:if test="#{instancemgr.selectedPlugin == 'info'}">
-        <c:choose>
-           <c:when test="#{instancemgr.selectedInstance.portlet != null}">
-              <h3>Portlet details
-              </h3>
-              <h:form>
-                 <h:commandLink
-                    action="#{portletmgr.selectPortlet}">
-                    <f:param name="id" value="#{instancemgr.selectedInstance.portlet.context.id}"/>
-                    <f:param name="plugin" value="manager"/>
-                    Show
-                 </h:commandLink> the associated portlet
-              </h:form>
-              <ui:include src="common/showPortletDetails.xhtml">
-                 <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/>
-              </ui:include>
-           </c:when>
-           <c:otherwise>
-              <h3>Portlet details</h3>
-              The associated portlet is not available
-           </c:otherwise>
-        </c:choose>
-     </c:if>
+         <hr/>
 
-     <c:if test="#{instancemgr.selectedPlugin == 'preferences'}">
-        <h3>Editing preferences of #{instancemgr.selectedInstance.id}: </h3>
-        <ui:include src="common/editPreferences.xhtml">
-           <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/>
-        </ui:include>
-        <h:form style="text-align:center;padding: 1em 0 1em 0">
-           <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/>
-           <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/>
-        </h:form>
-     </c:if>
-     
-     <c:if test="#{instancemgr.selectedPlugin == 'security'}">
-        <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3>
-        <ui:include src="common/editSecurity.xhtml">
-           <ui:param name="auth" value="#{instancemgr.auth}"/>
-        </ui:include>
-     </c:if>
+         <c:if test="#{instancemgr.selectedPlugin == 'info'}">
+            <c:choose>
+               <c:when test="#{instancemgr.selectedInstance.portlet != null}">
+                  <h3>Portlet details
+                  </h3>
+                  <h:form>
+                     <h:commandLink
+                        action="#{portletmgr.selectPortlet}">
+                        <f:param name="id" value="#{instancemgr.selectedInstance.portlet.context.id}"/>
+                        <f:param name="plugin" value="manager"/>
+                        Show
+                     </h:commandLink> the associated portlet
+                  </h:form>
+                  <ui:include src="common/showPortletDetails.xhtml">
+                     <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/>
+                  </ui:include>
+               </c:when>
+               <c:otherwise>
+                  <h3>Portlet details</h3>
+                  The associated portlet is not available
+               </c:otherwise>
+            </c:choose>
+         </c:if>
 
-  </c:if>
+         <c:if test="#{instancemgr.selectedPlugin == 'preferences'}">
+            <h3>Editing preferences of #{instancemgr.selectedInstance.id}: </h3>
+            <ui:include src="common/editPreferences.xhtml">
+               <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/>
+            </ui:include>
+            <h:form style="text-align:center;padding: 1em 0 1em 0">
+               <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/>
+               <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/>
+            </h:form>
+         </c:if>
 
-</ui:define>
+         <c:if test="#{instancemgr.selectedPlugin == 'security'}">
+            <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3>
+            
+            <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
+              <ui:param name="auth" value="#{instancemgr.auth}"/>
+              <ui:define name="form_submit">
+                <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
+                <h:commandButton value="Cancel" action="instances" styleClass="portlet-form-button" immediate="true"/>
+              </ui:define>
+            </ui:decorate>
+         </c:if>
+
+      </c:if>
+
+   </ui:define>
 </ui:composition>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -5,10 +5,17 @@
    class="admin-ui">
       
    <!-- Common nav -->
-   <ui:include src="tabTemplate.xhtml"/>
-
-   <!-- -->
-   <hr/>
+   <h:form>
+      <ul class="topnav">
+         <li>
+            <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/>
+         </li>
+         <li id="currentTab">Portlet Instances</li>
+         <li>
+            <h:commandLink value="Portlet Definitions" action="portlets"/>
+         </li>
+      </ul>
+   </h:form>
    
    <!-- Status message -->
    <h:message id="status" for="status"/>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectNavigation.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectNavigation.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -6,111 +6,131 @@
    xmlns:pfc="http://www.jboss.com/portal/facelet/common"
    xmlns:c="http://java.sun.com/jstl/core">
 
-   <h:form>
+<h:form>
 
-   <table width="100%">
+<table width="100%">
 
-      <c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
-         <tbody class="portlet-section-header">
-            <tr>
-               <th>Portal</th>
-               <th>Actions</th>
-            </tr>
-         </tbody>
-         <tbody>
-            <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status">
-               <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
-                  <td>
-                     <h:commandLink action="#{portalobjectmgr.selectObject}">
-                     <h:outputText value="#{object.name}"/>
-                     <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>
-                  </td>
-                  <td>
-                     <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
-                        <h:outputText value="Security"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}">
-                        <h:outputText value="Theme"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}">
-                        <h:outputText value="Destroy"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>
-                  </td>
-               </tr>
-            </c:forEach>
-         </tbody>
-      </c:if>
+<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
+   <thead class="portlet-section-header">
+      <tr>
+         <th>Portal</th>
+         <th>Actions</th>
+      </tr>
+   </thead>
+   <tbody>
+      <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status">
+         <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+            <td>
+               <h:commandLink action="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="#{object.name}"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink>
+            </td>
+            <td>
+               <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Security"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Properties"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="editPortalTheme"
+                                                 actionListener="#{portalobjectmgr.selectObject}">
+               <h:outputText value="Theme"/>
+               <f:param name="id" value="#{object.id}"/>
+               </h:commandLink><h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Rename"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink></h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Destroy"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink>
+            </td>
+         </tr>
+      </c:forEach>
+   </tbody>
+</c:if>
 
-      <c:if test="#{not empty portalobjectmgr.selectedObject.pages}">
-         <tbody class="portlet-section-header">
-            <tr>
-               <th>Page</th>
-               <th>Actions</th>
-            </tr>
-         </tbody>
-         <tbody>
-            <c:forEach items="#{portalobjectmgr.selectedObject.pages}" var="object" varStatus="status">
-               <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
-                  <td>
-                     <h:commandLink action="#{portalobjectmgr.selectObject}">
-                     <h:outputText value="#{object.name}"/>
-                     <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>
-                  </td>
-                  <td>
-                     <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
-                        <h:outputText value="Layout"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>  |  <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}">
-                        <h:outputText value="Security"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>  |  <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
-                        <h:outputText value="Theme"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>  |  <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}">
-                        <h:outputText value="Destroy"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>
-                  </td>
-               </tr>
-            </c:forEach>
-         </tbody>
-      </c:if>
+<c:if test="#{not empty portalobjectmgr.selectedObject.pages}">
+   <thead class="portlet-section-header">
+      <tr>
+         <th>Page</th>
+         <th>Actions</th>
+      </tr>
+   </thead>
+   <tbody>
+      <c:forEach items="#{portalobjectmgr.selectedObject.pages}" var="object" varStatus="status">
+         <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+            <td>
+               <h:commandLink action="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="#{object.name}"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink>
+            </td>
+            <td>
+               <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Page layout"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="editPageSecurity"
+                                                 actionListener="#{portalobjectmgr.selectObject}">
+               <h:outputText value="Security"/>
+               <f:param name="id" value="#{object.id}"/>
+            </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Properties"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
+               <h:outputText value="Theme"/>
+               <f:param name="id" value="#{object.id}"/>
+            </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Rename"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+               <h:outputText value="Destroy"/>
+               <f:param name="id" value="#{object.id}"/>
+            </h:commandLink>
+            </td>
+         </tr>
+      </c:forEach>
+   </tbody>
+</c:if>
 
-      <c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
-         <tbody class="portlet-section-header">
-            <tr>
-               <th>Window</th>
-               <th>Actions</th>
-            </tr>
-         </tbody>
-         <tbody>
-            <c:forEach items="#{portalobjectmgr.selectedObject.windows}" var="object" varStatus="status">
-               <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
-                  <td>
-                     <h:commandLink action="#{portalobjectmgr.selectObject}">
-                     <h:outputText value="#{object.name}"/>
-                     <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>
-                  </td>
-                  <td>
-                     <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
-                        <h:outputText value="Theme"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>  |  <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}">
-                        <h:outputText value="Destroy"/>
-                        <f:param name="id" value="#{object.id}"/>
-                     </h:commandLink>
-                  </td>
-               </tr>
-            </c:forEach>
-         </tbody>
-      </c:if>
+<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
+   <thead class="portlet-section-header">
+      <tr>
+         <th>Window</th>
+         <th>Actions</th>
+      </tr>
+   </thead>
+   <tbody>
+      <c:forEach items="#{portalobjectmgr.selectedObject.windows}" var="object" varStatus="status">
+         <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+            <td>
+               <h:commandLink action="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="#{object.name}"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink>
+            </td>
+            <td>
+               <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Theme"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Properties"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Rename"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+                  <h:outputText value="Destroy"/>
+                  <f:param name="id" value="#{object.id}"/>
+               </h:commandLink>
+            </td>
+         </tr>
+      </c:forEach>
+   </tbody>
+</c:if>
 
-   </table>
+</table>
 
-   </h:form>
+</h:form>
 
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -7,11 +7,18 @@
    class="admin-ui">
 
    <!-- Common nav -->
-   <ui:include src="tabTemplate.xhtml"/>
+   <h:form>
+      <ul class="topnav">
+         <li id="currentTab">Portal Objects</li>
+         <li>
+            <h:commandLink value="Portlet Instances" action="instances"/>
+         </li>
+         <li>
+            <h:commandLink value="Portlet Definitions" action="portlets"/>
+         </li>
+      </ul>
+   </h:form>
 
-   <!-- -->
-   <hr/>
-
    <!-- Path nav -->
    <h:form>
       <ul class="objectpath">

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -20,4 +20,8 @@
       <c:otherwise>FIXME</c:otherwise>
    </c:choose>
 
+   <h:form>
+      <p style="text-align: right"><h:commandLink action="wizardMode">Switch to wizard mode</h:commandLink></p>
+   </h:form>
+
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,90 +1,94 @@
 <div
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbp="http://www.jboss.com/portal"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:pfc="http://www.jboss.com/portal/facelet/common">
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:jbp="http://www.jboss.com/portal"
+   xmlns:c="http://java.sun.com/jstl/core"
+   xmlns:pfc="http://www.jboss.com/portal/facelet/common">
 
-<ui:composition template="portletsTemplate.xhtml">
+   <ui:composition template="portletsTemplate.xhtml">
 
-  <ui:define name="content">
-  
-     <h:form>
-        <h:outputLabel for="menu">
-           <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/>
-        </h:outputLabel>
-        <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}">
-           <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
-        </h:selectOneMenu>
-        <h:commandButton value="Change" styleClass="portlet-form-button"/>
-     </h:form>
+      <ui:define name="content">
 
-     <h:form>
-        <table width="100%">
-           <thead class="portlet-section-header">
-              <tr>
-                 <th>Id</th>
-                 <th>Name</th>
-                 <th>Remote</th>
-                 <th>Remotable</th>
-                 <th>Actions</th>
-              </tr>
-           </thead>
-           <tbody>
-              <c:forEach items="#{portletmgr.selectedPortlets}" var="portlet" varStatus="status">
-                 <tr class="#{portlet.context.id == portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
-                    <td>
-                       <h:commandLink
-                          action="#{portletmgr.selectPortlet}">
-                          <f:param name="id" value="#{portlet.context.id}"/>
-                          <f:param name="plugin" value="manager"/>
-                          #{portlet.context.id}
-                       </h:commandLink>
-                    </td>
-                    <td>#{portlet.name.value}</td>
-                    <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td>
-                    <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
-                    <td>
-                       <h:commandLink action="#{portletmgr.selectPortlet}">
-                          <f:param name="id" value="#{portlet.context.id}"/>
-                          <f:param name="plugin" value="manager"/>
-                          Info
-                       </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}">
-                          <f:param name="id" value="#{portlet.context.id}"/>
-                          <f:param name="plugin" value="preferences"/>
-                          Preferences
-                       </h:commandLink>
-                    </td>
-                 </tr>
-              </c:forEach>
-           </tbody>
-        </table>
-        <ul class="pagination">
-           <c:forEach begin="0" end="#{portletmgr.portletCount}" step="#{portletmgr.paginationSize}" var="index">
-              <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
-                 <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText value="#{index}"/></h:commandLink>
-              </li>
-           </c:forEach>
-        </ul>
-     </h:form>
+         <h:form>
+            <h:outputLabel for="menu">
+               <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/>
+            </h:outputLabel>
+            <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}">
+               <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
+            </h:selectOneMenu>
+            <h:commandButton value="Change" styleClass="portlet-form-button"/>
+         </h:form>
 
-     <c:if test="#{portletmgr.selectedPortlet != null}">
-        <c:if test="#{portletmgr.selectedPlugin == 'manager'}">
-           <hr/>
-           <h3>Portlet details</h3>
-           <ui:include src="showPortletInfo.xhtml"/>
-        </c:if>
-        <c:if test="#{portletmgr.selectedPlugin == 'preferences'}">
-           <hr/>
-           <h3>Portlet preferences</h3>
-           <ui:include src="common/editPreferences.xhtml">
-              <ui:param name="prefs" value="#{portletmgr.selectedPreferences}"/>
-           </ui:include>
-        </c:if>
-     </c:if>
+         <h:form>
+            <table width="100%">
+               <thead class="portlet-section-header">
+                  <tr>
+                     <th>Id</th>
+                     <th>Name</th>
+                     <th>Remote</th>
+                     <th>Remotable</th>
+                     <th>Actions</th>
+                  </tr>
+               </thead>
+               <tbody>
+                  <c:forEach items="#{portletmgr.selectedPortlets}" var="portlet" varStatus="status">
+                     <tr
+                        class="#{portlet.context.id == portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
+                        <td>
+                           <h:commandLink
+                              action="#{portletmgr.selectPortlet}">
+                              <f:param name="id" value="#{portlet.context.id}"/>
+                              <f:param name="plugin" value="manager"/>
+                              #{portlet.context.id}
+                           </h:commandLink>
+                        </td>
+                        <td>#{portlet.name.value}</td>
+                        <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td>
+                        <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
+                        <td>
+                           <h:commandLink action="#{portletmgr.selectPortlet}">
+                              <f:param name="id" value="#{portlet.context.id}"/>
+                              <f:param name="plugin" value="manager"/>
+                              Info
+                           </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}">
+                           <f:param name="id" value="#{portlet.context.id}"/>
+                           <f:param name="plugin" value="preferences"/>
+                           Preferences
+                        </h:commandLink>
+                        </td>
+                     </tr>
+                  </c:forEach>
+               </tbody>
+            </table>
+            <ul class="pagination">
+               <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
+                          var="index">
+                  <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
+                     <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from"
+                                                                               value="#{index}"/><h:outputText
+                        value="#{index}"/></h:commandLink>
+                  </li>
+               </c:forEach>
+            </ul>
+         </h:form>
 
-  </ui:define>
-</ui:composition>
+         <c:if test="#{portletmgr.selectedPortlet != null}">
+            <c:if test="#{portletmgr.selectedPlugin == 'manager'}">
+               <hr/>
+               <h3>Portlet details</h3>
+               <ui:include src="showPortletInfo.xhtml"/>
+            </c:if>
+            <c:if test="#{portletmgr.selectedPlugin == 'preferences'}">
+               <hr/>
+               <h3>Portlet preferences</h3>
+               <ui:include src="common/editPreferences.xhtml">
+                  <ui:param name="prefs" value="#{portletmgr.selectedPreferences}"/>
+               </ui:include>
+            </c:if>
+         </c:if>
+
+      </ui:define>
+   </ui:composition>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -5,10 +5,17 @@
    class="admin-ui">
 
    <!-- Common nav -->
-   <ui:include src="tabTemplate.xhtml"/>
-
-   <!-- -->
-   <hr/>
+   <h:form>
+      <ul class="topnav">
+         <li>
+            <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/>
+         </li>
+         <li>
+            <h:commandLink value="Portlet Instances" action="instances"/>
+         </li>
+         <li id="currentTab">Portlet Definitions</li>
+      </ul>
+   </h:form>
    
    <!-- Status message -->
    <h:message id="status" for="status"/>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,18 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core">
+   <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+      <ui:define name="content">
+         <h3>Renaming:</h3>
+         <h:form id="renameForm">
+           <h:inputText id="newName" value="#{renameAction.newName}"/>
+           <h:message for="newName"/>
+           <br />
+           <h:commandButton value="Update" action="#{renameAction.execute}" styleClass="portlet-form-button"/>
+         </h:form>
+      </ui:define>
+   </ui:composition>
+</div>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/tabTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/tabTemplate.xhtml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/tabTemplate.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,19 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:h="http://java.sun.com/jsf/html"
-     xmlns:ui="http://java.sun.com/jsf/facelets">
-      
-   <h:form>
-      <ul class="topnav">
-         <li>
-            <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/>
-         </li>
-         <li>
-            <h:commandLink value="Portlet Instances" action="instances"/>
-         </li>
-         <li>
-            <h:commandLink value="Portlet Definitions" action="portlets"/>
-         </li>
-      </ul>
-   </h:form>
-
-</div>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,117 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:c="http://java.sun.com/jstl/core"
-   class="admin-ui">
-
-   <div class="portlet-section-header">Adding a new Portlet</div>
-   
-   <c:choose>
-      <c:when test="#{newWindowWizard.currentStep == 0}">
-         <div class="wizardStepBox" id="selected">
-            <p class="stepNumber">Step 1</p>
-
-            <p class="stepText">Select Portlet</p>
-         </div>
-      </c:when>
-      <c:otherwise>
-         <div class="wizardStepBox">
-            <p class="stepNumber">Step 1</p>
-
-            <p class="stepText">Select Portlet</p>
-         </div>
-      </c:otherwise>
-   </c:choose>
-
-   <c:choose>
-      <c:when test="#{newWindowWizard.currentStep == 1}">
-         <div class="wizardStepBox" id="selected">
-            <p class="stepNumber">Step 2</p>
-
-            <p class="stepText">Select Portal</p>
-         </div>
-      </c:when>
-      <c:otherwise>
-         <div class="wizardStepBox">
-            <p class="stepNumber">Step 2</p>
-
-            <p class="stepText">Select Portal</p>
-         </div>
-      </c:otherwise>
-   </c:choose>
-
-   <c:choose>
-      <c:when test="#{newWindowWizard.currentStep == 2}">
-         <div class="wizardStepBox" id="selected">
-            <p class="stepNumber">Step 3</p>
-
-            <p class="stepText">Select Page</p>
-         </div>
-      </c:when>
-      <c:otherwise>
-         <div class="wizardStepBox">
-            <p class="stepNumber">Step 3</p>
-
-            <p class="stepText">Select Page</p>
-         </div>
-      </c:otherwise>
-   </c:choose>
-
-   <c:choose>
-      <c:when test="#{newWindowWizard.currentStep == 3}">
-         <div class="wizardStepBox" id="selected">
-            <p class="stepNumber">Step 4</p>
-
-            <p class="stepText">Select Region</p>
-         </div>
-      </c:when>
-      <c:otherwise>
-         <div class="wizardStepBox">
-            <p class="stepNumber">Step 4</p>
-
-            <p class="stepText">Select Region</p>
-         </div>
-      </c:otherwise>
-   </c:choose>
-
-   <c:choose>
-      <c:when test="#{newWindowWizard.currentStep == 4}">
-         <div class="wizardStepBox" id="selected">
-            <p class="stepNumber">Step 5</p>
-
-            <p class="stepText">Confirm</p>
-         </div>
-      </c:when>
-      <c:otherwise>
-         <div class="wizardStepBox">
-            <p class="stepNumber">Step 5</p>
-
-            <p class="stepText">Confirm</p>
-         </div>
-      </c:otherwise>
-   </c:choose>
-
-   <!-- Status message -->
-   <h:message id="status" for="status"/>
-
-
-   <!-- Content -->
-   <div class="wizardContent">
-      <ui:insert name="content">Content</ui:insert>
-   </div>
-
-   <div class="wizardButtonBox">
-      <h:form>
-         <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous"
-                          action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/>
-         <h:commandButton disabled="#{!newWindowWizard.nextEnabled}" rendered="#{newWindowWizard.currentStep lt 4}"
-                          value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/>
-      </h:form>
-   </div>
-
-   <h:form>
-      <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p>
-   </h:form>
-
-</div>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowTpl.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,117 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:c="http://java.sun.com/jstl/core"
+   class="admin-ui">
+
+   <div class="portlet-section-header">Adding a new Portlet</div>
+   
+   <c:choose>
+      <c:when test="#{newWindowWizard.currentStep == 0}">
+         <div class="wizardStepBox" id="selected">
+            <p class="stepNumber">Step 1</p>
+
+            <p class="stepText">Select Portlet</p>
+         </div>
+      </c:when>
+      <c:otherwise>
+         <div class="wizardStepBox">
+            <p class="stepNumber">Step 1</p>
+
+            <p class="stepText">Select Portlet</p>
+         </div>
+      </c:otherwise>
+   </c:choose>
+
+   <c:choose>
+      <c:when test="#{newWindowWizard.currentStep == 1}">
+         <div class="wizardStepBox" id="selected">
+            <p class="stepNumber">Step 2</p>
+
+            <p class="stepText">Select Portal</p>
+         </div>
+      </c:when>
+      <c:otherwise>
+         <div class="wizardStepBox">
+            <p class="stepNumber">Step 2</p>
+
+            <p class="stepText">Select Portal</p>
+         </div>
+      </c:otherwise>
+   </c:choose>
+
+   <c:choose>
+      <c:when test="#{newWindowWizard.currentStep == 2}">
+         <div class="wizardStepBox" id="selected">
+            <p class="stepNumber">Step 3</p>
+
+            <p class="stepText">Select Page</p>
+         </div>
+      </c:when>
+      <c:otherwise>
+         <div class="wizardStepBox">
+            <p class="stepNumber">Step 3</p>
+
+            <p class="stepText">Select Page</p>
+         </div>
+      </c:otherwise>
+   </c:choose>
+
+   <c:choose>
+      <c:when test="#{newWindowWizard.currentStep == 3}">
+         <div class="wizardStepBox" id="selected">
+            <p class="stepNumber">Step 4</p>
+
+            <p class="stepText">Select Region</p>
+         </div>
+      </c:when>
+      <c:otherwise>
+         <div class="wizardStepBox">
+            <p class="stepNumber">Step 4</p>
+
+            <p class="stepText">Select Region</p>
+         </div>
+      </c:otherwise>
+   </c:choose>
+
+   <c:choose>
+      <c:when test="#{newWindowWizard.currentStep == 4}">
+         <div class="wizardStepBox" id="selected">
+            <p class="stepNumber">Step 5</p>
+
+            <p class="stepText">Confirm</p>
+         </div>
+      </c:when>
+      <c:otherwise>
+         <div class="wizardStepBox">
+            <p class="stepNumber">Step 5</p>
+
+            <p class="stepText">Confirm</p>
+         </div>
+      </c:otherwise>
+   </c:choose>
+
+   <!-- Status message -->
+   <h:message id="status" for="status"/>
+
+
+   <!-- Content -->
+   <div class="wizardContent">
+      <ui:insert name="content">Content</ui:insert>
+   </div>
+
+   <div class="wizardButtonBox">
+      <h:form>
+         <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous"
+                          action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/>
+         <h:commandButton disabled="#{!newWindowWizard.nextEnabled}" rendered="#{newWindowWizard.currentStep lt 4}"
+                          value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/>
+      </h:form>
+   </div>
+
+   <h:form>
+      <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p>
+   </h:form>
+
+</div>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,26 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:c="http://java.sun.com/jstl/core">
- 
-   <ui:composition template="newWindowTpl.xhtml">
-      <ui:define name="content">
- 
-    <table>
-      <tr><td>Portlet</td><td>#{newWindowWizard.selectedPortlet.name.defaultString}</td></tr>
-      <tr><td>Portal</td><td>#{newWindowWizard.selectedPortal.name}</td></tr>
-      <tr><td>Page</td><td>#{newWindowWizard.selectedPage.name}</td></tr>
-      <tr><td>Region</td><td>#{newWindowWizard.selectedRegionId}</td></tr>
-    </table>
-    
-  <h:form>
-    <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}"  styleClass="portlet-form-button"/> 
-    <h:commandButton value="Cancel"  action="#{newWindowWizard.cancel}"        styleClass="portlet-form-button"/> 
-  </h:form>
- 
-       </ui:define>
-  </ui:composition>
- 
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,26 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core">
+ 
+   <ui:composition template="newWindowTpl.xhtml">
+      <ui:define name="content">
+ 
+    <table>
+      <tr><td>Portlet</td><td>#{newWindowWizard.selectedPortlet.name.defaultString}</td></tr>
+      <tr><td>Portal</td><td>#{newWindowWizard.selectedPortal.name}</td></tr>
+      <tr><td>Page</td><td>#{newWindowWizard.selectedPage.name}</td></tr>
+      <tr><td>Region</td><td>#{newWindowWizard.selectedRegionId}</td></tr>
+    </table>
+    
+  <h:form>
+    <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}"  styleClass="portlet-form-button"/> 
+    <h:commandButton value="Cancel"  action="#{newWindowWizard.cancel}"        styleClass="portlet-form-button"/> 
+  </h:form>
+ 
+       </ui:define>
+  </ui:composition>
+ 
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,44 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:c="http://java.sun.com/jstl/core">
-
-   <ui:composition template="newWindowTpl.xhtml">
-      <ui:define name="content">
-
-         <table>
-            <tbody class="portlet-section-header">
-               <tr>
-                  <th>Page</th>
-                  <th></th>
-               </tr>
-            </tbody>
-            <tbody>
-               <h:form>
-                  <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status">
-                     <tr
-                        class="#{object.id == newWindowWizard.selectedPageId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
-                        <td>
-                           <h:commandLink id="cl_#{status.index}" action="#{newWindowWizard.selectPage}">
-                              <h:outputText id="ot_#{status.index}" value="#{object.name}"/>
-                              <f:param id="f_#{status.index}" name="id" value="#{object.id}"/>
-                           </h:commandLink>
-                        </td>
-                        <td>
-                           <c:if test="#{not empty object.pages}">
-                              <h:commandLink id="cl2_#{status.index}" action="#{newWindowWizard.selectParentPage}">
-                                 <h:outputText id="ot2_#{status.index}" value="Sub-Pages"/>
-                                 <f:param id="f2_#{status.index}" name="id" value="#{object.id}"/>
-                              </h:commandLink>
-                           </c:if>
-                        </td>
-                     </tr>
-                  </c:forEach>
-               </h:form>
-            </tbody>
-         </table>
-      </ui:define>
-   </ui:composition>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,44 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core">
+
+   <ui:composition template="newWindowTpl.xhtml">
+      <ui:define name="content">
+
+         <table>
+            <tbody class="portlet-section-header">
+               <tr>
+                  <th>Page</th>
+                  <th></th>
+               </tr>
+            </tbody>
+            <tbody>
+               <h:form>
+                  <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status">
+                     <tr
+                        class="#{object.id == newWindowWizard.selectedPageId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+                        <td>
+                           <h:commandLink id="cl_#{status.index}" action="#{newWindowWizard.selectPage}">
+                              <h:outputText id="ot_#{status.index}" value="#{object.name}"/>
+                              <f:param id="f_#{status.index}" name="id" value="#{object.id}"/>
+                           </h:commandLink>
+                        </td>
+                        <td>
+                           <c:if test="#{not empty object.pages}">
+                              <h:commandLink id="cl2_#{status.index}" action="#{newWindowWizard.selectParentPage}">
+                                 <h:outputText id="ot2_#{status.index}" value="Sub-Pages"/>
+                                 <f:param id="f2_#{status.index}" name="id" value="#{object.id}"/>
+                              </h:commandLink>
+                           </c:if>
+                        </td>
+                     </tr>
+                  </c:forEach>
+               </h:form>
+            </tbody>
+         </table>
+      </ui:define>
+   </ui:composition>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,36 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:c="http://java.sun.com/jstl/core">
-
-   <ui:composition template="newWindowTpl.xhtml">
-      <ui:define name="content">
-         <table width="100%">
-
-            <tbody class="portlet-section-header">
-               <tr>
-                  <th>Portal</th>
-               </tr>
-            </tbody>
-            <tbody>
-               <h:form>
-                  <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status">
-                     <tr
-                        class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
-                        <td>
-                           <h:commandLink action="#{newWindowWizard.selectPortal}">
-                              <h:outputText value="#{object.name}"/>
-                              <f:param name="id" value="#{object.id}"/>
-                           </h:commandLink>
-                        </td>
-                     </tr>
-                  </c:forEach>
-               </h:form>
-            </tbody>
-
-         </table>
-      </ui:define>
-   </ui:composition>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,36 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core">
+
+   <ui:composition template="newWindowTpl.xhtml">
+      <ui:define name="content">
+         <table width="100%">
+
+            <tbody class="portlet-section-header">
+               <tr>
+                  <th>Portal</th>
+               </tr>
+            </tbody>
+            <tbody>
+               <h:form>
+                  <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status">
+                     <tr
+                        class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+                        <td>
+                           <h:commandLink action="#{newWindowWizard.selectPortal}">
+                              <h:outputText value="#{object.name}"/>
+                              <f:param name="id" value="#{object.id}"/>
+                           </h:commandLink>
+                        </td>
+                     </tr>
+                  </c:forEach>
+               </h:form>
+            </tbody>
+
+         </table>
+      </ui:define>
+   </ui:composition>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,55 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:c="http://java.sun.com/jstl/core">
-   <ui:composition template="newWindowTpl.xhtml">
-      <ui:define name="content">
-         <h:form>
-            <h:outputLabel for="menu">
-               <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/>
-            </h:outputLabel>
-            <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}">
-               <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
-            </h:selectOneMenu>
-            <h:commandButton value="Change" styleClass="portlet-form-button"/>
-         </h:form>
-
-         <h:form>
-            <table width="100%">
-               <thead class="portlet-section-header">
-                  <tr>
-                     <th>Name</th>
-                  </tr>
-               </thead>
-               <tbody>
-                  <c:forEach items="#{portletmgr.selectedPortlets}" var="portlet" varStatus="status">
-                     <tr
-                        class="#{portlet.context.id == newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
-                        <td title="#{portlet.description.value}">
-                           <h:commandLink action="#{newWindowWizard.selectPortlet}">
-                              <h:outputText>#{!empty portlet.name.value ? portlet.name.value : "Unnamed"}</h:outputText>
-                              <f:param name="id" value="#{portlet.context.id}"/>
-                              <f:param name="portletInvokerId" value="#{portletmgr.selectedPortletInvokerId}"/>
-                           </h:commandLink></td>
-                     </tr>
-                  </c:forEach>
-               </tbody>
-            </table>
-            <ul class="pagination">
-               <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
-                          var="index">
-                  <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
-                     <h:commandLink action="#{portletmgr.selectFrom}">
-                        <f:param name="from" value="#{index}"/>
-                        <h:outputText value="#{index}"/>
-                     </h:commandLink>
-                  </li>
-               </c:forEach>
-            </ul>
-         </h:form>
-
-      </ui:define>
-   </ui:composition>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,55 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core">
+   <ui:composition template="newWindowTpl.xhtml">
+      <ui:define name="content">
+         <h:form>
+            <h:outputLabel for="menu">
+               <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/>
+            </h:outputLabel>
+            <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}">
+               <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
+            </h:selectOneMenu>
+            <h:commandButton value="Change" styleClass="portlet-form-button"/>
+         </h:form>
+
+         <h:form>
+            <table width="100%">
+               <thead class="portlet-section-header">
+                  <tr>
+                     <th>Name</th>
+                  </tr>
+               </thead>
+               <tbody>
+                  <c:forEach items="#{portletmgr.selectedPortlets}" var="portlet" varStatus="status">
+                     <tr
+                        class="#{portlet.context.id == newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
+                        <td title="#{portlet.description.value}">
+                           <h:commandLink action="#{newWindowWizard.selectPortlet}">
+                              <h:outputText>#{!empty portlet.name.value ? portlet.name.value : "Unnamed"}</h:outputText>
+                              <f:param name="id" value="#{portlet.context.id}"/>
+                              <f:param name="portletInvokerId" value="#{portletmgr.selectedPortletInvokerId}"/>
+                           </h:commandLink></td>
+                     </tr>
+                  </c:forEach>
+               </tbody>
+            </table>
+            <ul class="pagination">
+               <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
+                          var="index">
+                  <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
+                     <h:commandLink action="#{portletmgr.selectFrom}">
+                        <f:param name="from" value="#{index}"/>
+                        <h:outputText value="#{index}"/>
+                     </h:commandLink>
+                  </li>
+               </c:forEach>
+            </ul>
+         </h:form>
+
+      </ui:define>
+   </ui:composition>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,37 +0,0 @@
-<div
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:c="http://java.sun.com/jstl/core">
-
-   <ui:composition template="newWindowTpl.xhtml">
-      <ui:define name="content">
-
-         <table width="100%">
-
-            <tbody class="portlet-section-header">
-               <tr>
-                  <th>Portal</th>
-               </tr>
-            </tbody>
-            <tbody>
-               <h:form>
-                  <c:forEach items="#{newWindowWizard.regions}" var="object" varStatus="status">
-                     <tr
-                        class="#{object == newWindowWizard.selectedRegionId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
-                        <td>
-                           <h:commandLink action="#{newWindowWizard.selectRegion}">
-                              <h:outputText value="#{object}"/>
-                              <f:param name="name" value="#{object}"/>
-                           </h:commandLink>
-                        </td>
-                     </tr>
-                  </c:forEach>
-               </h:form>
-            </tbody>
-         </table>
-
-      </ui:define>
-   </ui:composition>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectRegion.xhtml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,37 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core">
+
+   <ui:composition template="newWindowTpl.xhtml">
+      <ui:define name="content">
+
+         <table width="100%">
+
+            <tbody class="portlet-section-header">
+               <tr>
+                  <th>Portal</th>
+               </tr>
+            </tbody>
+            <tbody>
+               <h:form>
+                  <c:forEach items="#{newWindowWizard.regions}" var="object" varStatus="status">
+                     <tr
+                        class="#{object == newWindowWizard.selectedRegionId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+                        <td>
+                           <h:commandLink action="#{newWindowWizard.selectRegion}">
+                              <h:outputText value="#{object}"/>
+                              <f:param name="name" value="#{object}"/>
+                           </h:commandLink>
+                        </td>
+                     </tr>
+                  </c:forEach>
+               </h:form>
+            </tbody>
+         </table>
+
+      </ui:define>
+   </ui:composition>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/myfaces_ext.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/myfaces_ext.tld	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/myfaces_ext.tld	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,9147 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
---><!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-
-    <tlib-version>1.0.10</tlib-version>
-    <jsp-version>1.2</jsp-version>
-    <short-name>t</short-name>
-    <uri>http://myfaces.apache.org/extensions</uri>
-    <description>
-        MyFaces subproject that contains components and other goodies to be used with any JSF implementation.
-    </description>
-
-<!--     Extended standard components     -->
-
-    <!-- commandButton -->
-    <tag>
-        <name>commandButton</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlCommandButtonTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard commandButton by user role support.
-        </description>
-                <!-- all standard attributes of the commandButton tag -->
-                <!-- UICommand attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property.</description>
-        </attribute>
-        <attribute>
-            <name>actionListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at method acception an ActionEvent with return type void.</description>
-        </attribute>
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase.</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 button attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>type</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- HtmlCommandButton attributes -->
-        <attribute>
-            <name>image</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-    </tag>
-
-    <!-- commandLink -->
-    <tag>
-        <name>commandLink</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlCommandLinkTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard commandLink by user role support and the HTML target attribute.
-        </description>
-                <!-- all standard attributes of the commandLink tag -->
-                <!-- UICommand attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property.</description>
-        </attribute>
-        <attribute>
-            <name>actionListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at method acception an ActionEvent with return type void.</description>
-        </attribute>
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase.</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 anchor (=a) attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>charset</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>coords</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "href" is a special LinkRenderer attribute -->
-        <attribute><name>hreflang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "name" cannot be set by user -->
-        <attribute><name>rel</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>rev</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>shape</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>type</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onblur</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onfocus</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>target</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-    </tag>
-
-    <!-- dataTable -->
-    <tag>
-        <name>dataTable</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlDataTableTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extended data_table that adds some additional features to the standard
-            data_table action: see attribute descriptions for preserveDataModel,
-            sortColumn, sortAscending and preserveSort.
-        </description>
-                <!-- all standard attributes of the dataTable tag -->
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- UIData attributes -->
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Supported types see JSF Spec 4.1.3</description>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rows</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>first</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!-- TableRenderer attributes -->
-        <attribute>
-            <name>columnClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>footerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>headerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rowClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extensions -->
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>preserveDataModel</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Indicates whether the state of the whole DataModel should be saved and
-                restored.
-                Default: false
-            </description>
-        </attribute>
-        <attribute>
-            <name>forceIdIndexFormula</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				A formula that overrides the defaut row index in the construction of table's
-				body components.
-				Example : #{myRowVar.key}
-				Warning, the EL should evaluate to a unique value for each row !
-            </description>
-        </attribute>
-        <attribute>
-            <name>sortColumn</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Value reference to a model property that gives the current sort column name.
-            </description>
-        </attribute>
-        <attribute>
-            <name>sortAscending</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Value reference to a model property that gives the current sort direction.
-            </description>
-        </attribute>
-        <attribute>
-            <name>preserveSort</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Indicates whether the state of the sortColumn and sortAscending attribute
-                should be saved and restored and written back to the model during the
-                update model phase.
-                Default: true
-            </description>
-        </attribute>
-        <attribute>
-            <name>renderedIfEmpty</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Indicates whether this table should be rendered if the underlying DataModel is
-                empty.
-                You could as well use rendered="#{not empty bean.list}", but this one causes
-                the getList method of your model bean beeing called up to five times per
-                request, which is not optimal when the list is backed by a DB table.
-                Using renderedIfEmpty="false" solves this problem, because the MyFaces
-                extended HtmlDataTable automatically caches the DataModel and calles the
-                model getter only once per request.
-                Default: true
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowIndexVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the current rowIndex is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowCountVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the rowCount is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>previousRowDataVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the previous RowData Object is set in request scope
-                similar to the rowIndexVar and rowCountVar parameters.
-                Mind that the value of this request scope attribute is null in the first row
-                or when isRowAvailable returns false for the previous row.
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnClick</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onclick event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnDblClick</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript ondblclick event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnMouseDown</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onmpusedown event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnMouseUp</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onmouseup event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnMouseOver</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onmouseover event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnMouseMove</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onmousemove event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnMouseOut</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onmouseout event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnKeyPress</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onkeypress event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnKeyDown</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onkeydown event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowOnKeyUp</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Defines a JavaScript onkeyup event handler for each table row
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The id to use for &lt;tr&gt; elements that are generated by the table.
-            </description>
-        </attribute>        
-        <attribute>
-            <name>rowStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute for the row tr tag.</description>
-        </attribute>
-        <attribute>
-            <name>rowStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML style attribute for the row tr tag.</description>
-        </attribute>
-     </tag>
-
-    <!-- inputHidden -->
-    <tag>
-        <name>inputHidden</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlInputHiddenTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard inputHidden by providing additional MyFaces goodies.
-        </description>
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-    </tag>
-
-    <!-- inputSecret -->
-    <tag>
-        <name>inputSecret</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlInputSecretTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard inputSecret.
-        </description>
-         <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 input attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>align</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>maxlength</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-        <!-- SecretRenderer attributes -->
-        <attribute>
-            <name>redisplay</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, the value will be re-sent (in plaintext) when the form
-                is rerendered (see JSF.7.4.4). Default is false.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- inputText -->
-    <tag>
-        <name>inputText</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlInputTextTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard inputText by user role support.
-        </description>
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-                <!-- all standard attributes of the inputText tag -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>align</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>maxlength</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- inputTextHelp -->
-    <tag>
-        <name>inputTextHelp</name>
-        <tag-class>org.apache.myfaces.custom.inputTextHelp.HtmlInputTextHelpTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard inputText by helptext support.
-        </description>
-                <!-- all standard attributes of the inputText tag -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>align</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>maxlength</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-        <!-- Attributes for HtmlInputText with Helptext -->
-        <attribute>
-            <name>helpText</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>selectText</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- inputTextarea -->
-    <tag>
-        <name>inputTextarea</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlInputTextareaTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard inputTextarea by user role support.
-        </description>
-                <!-- all standard attributes of the inputTextarea tag -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 textarea attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>cols</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>rows</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-     <!-- graphicImage -->
-    <tag>
-        <name>graphicImage</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlGraphicImageTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard graphicImage.
-        </description>
-                <!-- UIGraphic attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>url</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>URL of the image (see JSF.4.1.5).</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>URL of the image (see JSF.4.1.5).</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 img attributes that are not part of the JSF 1.1 specification -->
-        <attribute>
-            <name>align</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>border</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>hspace</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>vspace</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-
-        <!-- The subset of HTML 4.0 img attributes that are supported by the JSF 1.1 specification -->
-        <attribute>
-            <name>alt</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>height</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>ismap</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>longdesc</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <!-- "name" attribute cannot be set directly by user -->
-        <!-- "src" attribute cannot be set directly, use "url" instead! -->
-        <attribute>
-            <name>usemap</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>width</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-    </tag>
-
-    <!-- message -->
-    <tag>
-        <name>message</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlMessageTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            MyFaces extension to the standard messages tag: see summaryDetailSeparator attribute
-        </description>
-                <!-- all standard attributes of the message tag -->
-                <!-- UIMessage attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>for</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>The client identifier of the component for which this component represents associated message(s).</description>
-        </attribute>
-        <attribute>
-            <name>showSummary</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Indicates whether the summary of the associated message(s) should be displayed.
-                         Default is: true</description>
-        </attribute>
-        <attribute>
-            <name>showDetail</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Indicates whether the detail of the associated message(s) should be displayed.
-                         Default is: false</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HtmlMessage attributes -->
-        <attribute>
-            <name>infoClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "INFO".</description>
-        </attribute>
-        <attribute>
-            <name>infoStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "INFO".</description>
-        </attribute>
-        <attribute>
-            <name>warnClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "WARN".</description>
-        </attribute>
-        <attribute>
-            <name>warnStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "WARN".</description>
-        </attribute>
-        <attribute>
-            <name>errorClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "ERROR".</description>
-        </attribute>
-        <attribute>
-            <name>errorStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "ERROR".</description>
-        </attribute>
-        <attribute>
-            <name>fatalClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "FATAL".</description>
-        </attribute>
-        <attribute>
-            <name>fatalStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "FATAL".</description>
-        </attribute>
-        <attribute>
-            <name>tooltip</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, the message summary will be rendered as a tooltip (i.e. HTML title attribute).
-            </description>
-        </attribute>
-
-        <!-- MyFaces extensions -->
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <attribute>
-            <name>summaryFormat</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If present, instead of rendering the message summary, a MessageFormat with this
-                attribute as pattern is created. The format method of this MessageFormat is
-                called with the message summary as the first argument and the label of the
-                associated component (if any) as the second argument.
-                Example: "{0}:"
-            </description>
-        </attribute>
-        <attribute>
-            <name>detailFormat</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If present, instead of rendering the message detail, a MessageFormat with this
-                attribute as pattern is created. The format method of this MessageFormat is
-                called with the message detail as the first argument and the label of the
-                associated component (if any) as the second argument.
-                Example: "The input in field {1} is wrong: {0}"
-            </description>
-        </attribute>
-        <attribute>
-            <name>replaceIdWithLabel</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If present, all occurrences of the id of the component for which the message
-                is rendered will be replaced by the label. Standard is true for the extended
-                message renderer.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- messages -->
-    <tag>
-        <name>messages</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlMessagesTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            MyFaces extension to the standard messages tag: see showInputLabel attribute
-        </description>
-                <!-- all standard attributes of the messages tag -->
-                <!-- UIMessages attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>showSummary</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Indicates whether the summary of the message(s) should be displayed.
-                         Default is: true</description>
-        </attribute>
-        <attribute>
-            <name>showDetail</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Indicates whether the detail of the message(s) should be displayed.
-                         Default is: false</description>
-        </attribute>
-        <attribute>
-            <name>globalOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Indicates whether only global messages (that is, messages with no associated client identifier) should be rendered.
-                         Default is: false</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HtmlMessages attributes -->
-        <attribute>
-            <name>infoClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "INFO".</description>
-        </attribute>
-        <attribute>
-            <name>infoStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "INFO".</description>
-        </attribute>
-        <attribute>
-            <name>warnClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "WARN".</description>
-        </attribute>
-        <attribute>
-            <name>warnStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "WARN".</description>
-        </attribute>
-        <attribute>
-            <name>errorClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "ERROR".</description>
-        </attribute>
-        <attribute>
-            <name>errorStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "ERROR".</description>
-        </attribute>
-        <attribute>
-            <name>fatalClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for messages with severity "FATAL".</description>
-        </attribute>
-        <attribute>
-            <name>fatalStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for messages with severity "FATAL".</description>
-        </attribute>
-        <attribute>
-            <name>layout</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>The layout: "table" or "list". Default: list</description>
-        </attribute>
-        <attribute>
-            <name>tooltip</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, the message summary will be rendered as a tooltip (i.e. HTML title attribute).
-            </description>
-        </attribute>
-
-        <!-- MyFaces extensions -->
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <attribute>
-            <name>summaryFormat</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If present, instead of rendering the message summary, a MessageFormat with this
-                attribute as pattern is created. The format method of this MessageFormat is
-                called with the message summary as the first argument and the label of the
-                associated component (if any) as the second argument.
-                Example: "{0}:" or "{0} in field {1}"
-            </description>
-        </attribute>
-        <attribute>
-            <name>globalSummaryFormat</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Like summaryFormat, but applies to global messages (i.e. messages not associated
-                with a component). If no globalSummaryFormat is given, the summaryFormat is used for
-                global messages.
-                Example: "{0}:"
-            </description>
-        </attribute>
-        <attribute>
-            <name>detailFormat</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If present, instead of rendering the message detail, a MessageFormat with this
-                attribute as pattern is created. The format method of this MessageFormat is
-                called with the message detail as the first argument and the label of the
-                associated component (if any) as the second argument.
-                Example: "The input in field {1} is wrong: {0}"
-            </description>
-        </attribute>
-        <attribute>
-            <name>replaceIdWithLabel</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If present, all occurrences of the id of the component for which the message
-                is rendered will be replaced by the label.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- outputLabel -->
-    <tag>
-        <name>outputLabel</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlOutputLabelTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard outputLabel by user role support.
-        </description>
-                <!-- all standard attributes of the outputLabel tag -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 label attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "for" is a specific LabelRenderer attribute -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- LabelRenderer attributes -->
-        <attribute>
-          <name>for</name>
-          <required>false</required>
-          <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-    </tag>
-
-    <!-- outputText -->
-    <tag>
-        <name>outputText</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlOutputTextTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard outputText by user role support.
-        </description>
-                <!-- all standard attributes of the outputText tag -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HtmlOutputText attributes -->
-        <attribute>
-            <name>escape</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Indicates whether rendered markup should be escaped.
-                Default: true
-            </description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-    </tag>
-
-    <!-- panelGrid -->
-    <tag>
-        <name>panelGrid</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlPanelGridTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard panelGrid by user role support.
-        </description>
-                        <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- GridRenderer attributes -->
-        <attribute>
-            <name>columnClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>columns</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>footerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>headerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rowClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- panelGroup -->
-    <tag>
-        <name>panelGroup</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlPanelGroupTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard panelGroup by user role support.
-        </description>
-                <!-- all standard attributes of the panelGroup tag -->
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectOneMenu -->
-    <tag>
-        <name>selectOneMenu</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectOneMenuTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectOneMenu by user role support.
-        </description>
-                <!-- all standard attributes of the selectOneMenu tag -->
-                <!-- UISelectOne attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 select attributes -->
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "multiple" cannot be set manually -->
-        <!-- "name" cannot be set manually -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "size" cannot be set directly for it is a MenuRenderer specific attribute -->
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>readonly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Flag indicating that this component will prohibit
-          changes by the user.  The element may receive focus
-          unless it has also been disabled.</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectManyMenu -->
-    <tag>
-        <name>selectManyMenu</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectManyMenuTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectManyMenu by user role support.
-        </description>
-                        <!-- UISelectMany attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 select attributes -->
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "multiple" cannot be set manually -->
-        <!-- "name" cannot be set manually -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "size" cannot be set directly for it is a MenuRenderer specific attribute -->
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>readonly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Flag indicating that this component will prohibit
-          changes by the user.  The element may receive focus
-          unless it has also been disabled.</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectOneRadio -->
-    <tag>
-        <name>selectOneRadio</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectOneRadioTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectOneRadio by user role support.
-            Additionally this extended selectOneRadio accepts a layout attribute
-            of value "spread" (see custom radio tag).
-        </description>
-                <!-- all standard attributes of the selectOneRadio tag -->
-                <!-- UISelectOne attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes for type "radio" -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- RadioRenderer attributes -->
-        <attribute>
-            <name>layout</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>see JSF Spec. 8.5.10</description>
-        </attribute>
-        <attribute>
-            <name>border</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>see JSF Spec. 8.5.10</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectBooleanCheckbox -->
-    <tag>
-        <name>selectBooleanCheckbox</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectBooleanCheckboxTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectBooleanCheckbox by user role support.
-        </description>
-                        <!-- UISelectBoolean attributes -->
-        <!-- "selected" attribute is covered by HTML "checked" attribute -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes for type "checkbox" -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectManyCheckbox -->
-    <tag>
-        <name>selectManyCheckbox</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectManyCheckboxTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectManyCheckbox by user role support.
-            Additionally this extended selectManyCheckbox accepts a layout attribute
-            of value "spread" (see custom checkbox tag).
-        </description>
-                <!-- all standard attributes of the selectManyCheckbox tag -->
-                <!-- UISelectMany attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes for type "checkbox" -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-
-        <!-- CheckboxListRenderer attributes -->
-        <attribute>
-            <name>layout</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>see JSF Spec. 8.5.9</description>
-        </attribute>
-        <!--TODO: disabledClass, enabledClass -->
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <attribute>
-            <name>layoutWidth</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A number representing the amount of checkbox rows if
-                the layout is lineDirection and checkbox columns if
-                the layout is pageDirection.
-            </description>
-        </attribute>
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectOneListbox -->
-    <tag>
-        <name>selectOneListbox</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectOneListboxTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectOneListbox by user role support.
-        </description>
-                        <!-- UISelectOne attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 select attributes -->
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "multiple" cannot be set manually -->
-        <!-- "name" cannot be set manually -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "size" cannot be set directly for it is a MenuRenderer specific attribute -->
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>readonly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Flag indicating that this component will prohibit
-          changes by the user.  The element may receive focus
-          unless it has also been disabled.</description>
-        </attribute>
-        <!-- ListboxRenderer attributes -->
-        <attribute>
-            <name>size</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>see JSF Spec.</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectManyListbox -->
-    <tag>
-        <name>selectManyListbox</name>
-        <tag-class>org.apache.myfaces.taglib.html.ext.HtmlSelectManyListboxTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Extends standard selectManyListbox by user role support.
-        </description>
-                        <!-- UISelectMany attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 select attributes -->
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "multiple" cannot be set manually -->
-        <!-- "name" cannot be set manually -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "size" cannot be set directly for it is a MenuRenderer specific attribute -->
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>readonly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Flag indicating that this component will prohibit
-          changes by the user.  The element may receive focus
-          unless it has also been disabled.</description>
-        </attribute>
-        <!-- ListboxRenderer attributes -->
-        <attribute>
-            <name>size</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>see JSF Spec.</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-<!--     Custom components     -->
-
-    <!-- calendar -->
-    <tag>
-        <name>inputCalendar</name>
-        <tag-class>org.apache.myfaces.custom.calendar.HtmlInputCalendarTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Provides a calendar.
-        </description>
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 input attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>align</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>maxlength</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <attribute>
-            <name>monthYearRowClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the header-row showing month and year.</description>
-        </attribute>
-        <attribute>
-            <name>weekRowClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the header-row showing the week-days.</description>
-        </attribute>
-        <attribute>
-            <name>dayCellClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the cells showing days.</description>
-        </attribute>
-        <attribute>
-            <name>currentDayCellClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the cell of the currently selected date.</description>
-        </attribute>
-        <attribute>
-            <name>renderAsPopup</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Render the input-calendar as a java-script popup on client.</description>
-        </attribute>
-        <attribute>
-            <name>addResources</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Automatically add the input-calendar scripts and css files to the header - set that to false to provide the scripts yourself.</description>
-        </attribute>
-        <attribute>
-            <name>popupDateFormat</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Defines the date format used by the java-script popup on client.</description>
-        </attribute>
-        <attribute>
-            <name>popupButtonString</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Defines the string displayed on the button which leads to the calendar-popup-window (... by default).</description>
-        </attribute>
-        <attribute>
-            <name>popupGotoString</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for "Go To Current Month"</description>
-        </attribute>
-        <attribute>
-            <name>popupTodayString</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for "Today is"</description>
-        </attribute>
-        <attribute>
-            <name>popupWeekString</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for "Wk"</description>
-        </attribute>
-        <attribute>
-            <name>popupScrollLeftMessage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for scrolling to the left.</description>
-        </attribute>
-        <attribute>
-            <name>popupScrollRightMessage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for scrolling to the right.</description>
-        </attribute>
-        <attribute>
-            <name>popupSelectMonthMessage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for "Click to select a month".</description>
-        </attribute>
-        <attribute>
-            <name>popupSelectYearMessage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for "Click to select a year".</description>
-        </attribute>
-        <attribute>
-            <name>popupSelectDateMessage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Set the string for "Select [date] as date" (do not replace [date], it will be replaced by the current date).</description>
-		</attribute>
-        <attribute>
-            <name>renderPopupButtonAsImage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>If true, renders a calendar icon instead of the button to pop up the calendar.</description>
-        </attribute>
-    </tag>
-
-    <!-- jsValueChangeListener -->
-    <tag>
-        <name>jsValueChangeListener</name>
-        <tag-class>org.apache.myfaces.custom.jslistener.JsValueChangeListenerTag</tag-class>
-        <body-content>empty</body-content>
-        <description>Value change listener on client side.</description>
-        <attribute>
-          <name>for</name>
-          <required>false</required>
-          <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-          <name>property</name>
-          <required>false</required>
-          <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-          <name>expressionValue</name>
-          <required>true</required>
-          <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- jsValueSet -->
-    <tag>
-        <name>jsValueSet</name>
-        <tag-class>org.apache.myfaces.custom.jsvalueset.HtmlJsValueSetTag</tag-class>
-        <body-content>empty</body-content>
-        <description>Setting a value from the model in java-script so that it can be used (e.g. by the value change listener) afterwards.</description>
-        <attribute>
-          <name>name</name>
-          <required>true</required>
-          <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-          <name>value</name>
-          <required>true</required>
-          <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- checkbox -->
-    <tag>
-        <name>checkbox</name>
-        <tag-class>org.apache.myfaces.custom.checkbox.HtmlCheckboxTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Renders a HTML input of type "checkbox". The associated SelectItem comes from
-            an extended selectManyCheckbox component with layout "spread". The selectManyCheckbox
-            is referenced by the "for" attribute.
-            All HTML pass-through attributes for this input are taken from the associated
-            selectManyCheckbox.
-        </description>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- HtmlCheckbox attributes -->
-        <attribute>
-            <name>for</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                id of the referenced extended selectManyCheckbox component
-            </description>
-        </attribute>
-        <attribute>
-            <name>index</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                n-th SelectItem of referenced UISelectMany starting with 0.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- commandNavigation2 -->
-    <tag>
-        <name>commandNavigation2</name>
-        <tag-class>org.apache.myfaces.custom.navmenu.htmlnavmenu.HtmlCommandNavigationItemTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Must be nested inside a panel_navigation action and renders a
-            clickable navigation item.
-            This action is derived from the standard command_link action and
-            has equal attributes.
-            (Replaces former "navigation_item" tag.)
-        </description>
-        <!--TODO: make id attribute mandatory -->
-                <!-- UICommand attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property.</description>
-        </attribute>
-        <attribute>
-            <name>actionListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at method acception an ActionEvent with return type void.</description>
-        </attribute>
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase.</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 anchor (=a) attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>charset</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>coords</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "href" is a special LinkRenderer attribute -->
-        <attribute><name>hreflang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "name" cannot be set by user -->
-        <attribute><name>rel</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>rev</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>shape</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>type</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onblur</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onfocus</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>target</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- HtmlCommandLink attributes -->
-        <!--TODO: is in JSF API, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onblur</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!--TODO: is in JSF API, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onfocus</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!-- TODO attributes image, label - old todo.. still necessary?-->
-    </tag>
-
-    <!-- commandNavigation -->
-    <tag>
-        <name>commandNavigation</name>
-        <tag-class>org.apache.myfaces.custom.navigation.HtmlCommandNavigationTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Must be nested inside a panel_navigation action and renders a
-            clickable navigation item.
-            This action is derived from the standard command_link action and
-            has equal attributes.
-            (Replaces former "navigation_item" tag.)
-        </description>
-        <!--TODO: make id attribute mandatory -->
-                <!-- UICommand attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property.</description>
-        </attribute>
-        <attribute>
-            <name>actionListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at method acception an ActionEvent with return type void.</description>
-        </attribute>
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase.</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 anchor (=a) attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>charset</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>coords</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "href" is a special LinkRenderer attribute -->
-        <attribute><name>hreflang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "name" cannot be set by user -->
-        <attribute><name>rel</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>rev</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>shape</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>type</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onblur</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onfocus</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>target</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- HtmlCommandLink attributes -->
-        <!--TODO: is in JSF API, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onblur</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!--TODO: is in JSF API, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onfocus</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!-- TODO attributes image, label - old todo.. still necessary?-->
-    </tag>
-
-    <!-- commandSortHeader -->
-    <tag>
-        <name>commandSortHeader</name>
-        <tag-class>org.apache.myfaces.custom.sortheader.HtmlCommandSortHeaderTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Clickable sort column header.
-            Must be nested inside an extended data_table tag.
-            This tag is derived from the standard command_link tag and
-            has the additional attributes columnName and arrow.
-            Note: In contrary to normal command links the default for the "immediate"
-            attribute is "true".
-        </description>
-                <!-- UICommand attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property.</description>
-        </attribute>
-        <attribute>
-            <name>actionListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at method acception an ActionEvent with return type void.</description>
-        </attribute>
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase.</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 anchor (=a) attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>charset</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>coords</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "href" is a special LinkRenderer attribute -->
-        <attribute><name>hreflang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- "name" cannot be set by user -->
-        <attribute><name>rel</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>rev</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>shape</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>type</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onblur</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!--todo: is in JSF API of HtmlCommandLink and HtmlOutputLink, but there is no corresponding tag in HTML 4.0.. What to do?-->
-        <attribute>
-            <name>onfocus</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>target</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- HtmlCommandSortHeader attributes -->
-        <attribute>
-            <name>columnName</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The name of this column.
-                This name must uniquely identify this column among all other (sortable) columns
-                in the same data_table.
-                The sortColumn attribute of the embedding data_table reflects the current
-                sort column (see extended data_table).
-            </description>
-        </attribute>
-        <attribute>
-            <name>arrow</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Indicates whether an arrow, that shows the sort direction should be rendered.
-                Default: false
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- dataList -->
-    <tag>
-        <name>dataList</name>
-        <tag-class>org.apache.myfaces.custom.datalist.HtmlDataListTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Similar to dataTable, but does not render a table. Instead the layout
-            attribute controls how each dataRow is rendered.
-        </description>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- UIData attributes -->
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Supported types see JSF Spec 4.1.3</description>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rows</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>first</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>layout</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                simple|unorderedList|orderedList
-                simple = for each dataRow all children are simply rendered
-                unorderedList = the list is rendered as HTML unordered list (= bullet list)
-                orderedList = the list is rendered as HTML ordered list
-                Default: simple
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowIndexVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the current rowIndex is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowCountVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the rowCount is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-     </tag>
-
-    <!-- dataScroller -->
-    <tag>
-        <name>dataScroller</name>
-        <tag-class>org.apache.myfaces.custom.datascroller.HtmlDataScrollerTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Scroller for UIData components eg. dataTable
-            Must be nested inside footer facet of dataTable OR for attribute must be given
-            so that corresponding uiData can be found
-        </description>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>for</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>fastStep</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>step (pages) used for fastforward and fastrewind</description>
-        </attribute>
-        <attribute>
-            <name>pageIndexVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the actual page index is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>pageCountVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the actual page count is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>rowsCountVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the actual rows count is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayedRowsCountVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the actual displayed rows count is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>firstRowIndexVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the actual first displayed row index is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>lastRowIndexVar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                A parameter name, under which the actual last displayed row index is set in request scope
-                similar to the var parameter.
-            </description>
-        </attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                styleClass for scroller table
-            </description>
-        </attribute>
-        <attribute>
-            <name>style</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                style for scroller table
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If set true, then the paginator gets rendered
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorMaxPages</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The maximum amount of pages to be displayed in the paginator.
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorTableClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                styleclass for pagingator
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorTableStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                style for pagingator
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorColumnClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                styleClass for paginator's column
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorColumnStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                style for paginator's column
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorActiveColumnClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                styleClass for paginator's column with pageIndex = currentPageIndex
-            </description>
-        </attribute>
-        <attribute>
-            <name>paginatorActiveColumnStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                style for paginator's column with pageIndex = currentPageIndex
-            </description>
-        </attribute>
-        <attribute>
-            <name>renderFacetsIfSinglePage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If set to false, the facets aren't renderd if all the lines are contained on a single page.
-                Default is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase.</description>
-        </attribute>
-        <attribute>
-            <name>actionListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at method acception an ActionEvent with return type void.</description>
-        </attribute>
-     </tag>
-
-    <!-- inputDate -->
-    <tag>
-        <name>inputDate</name>
-        <tag-class>org.apache.myfaces.custom.date.HtmlInputDateTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>align</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>maxlength</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-		<!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-		<!-- type == date | time | both -->
-        <attribute>
-	        <name>type</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-	        <name>popupCalendar</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>timeZone</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- inputFileUpload -->
-    <tag>
-        <name>inputFileUpload</name>
-        <tag-class>org.apache.myfaces.custom.fileupload.HtmlInputFileUploadTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            You must enable the MultiPart Filter to make this component
-            work (see web.xml). Also, don't forget to set the form's attribute
-            "enctype" to "multipart/form-data".
-            See "examples/web/fileupload.jsp" for an example!
-        </description>
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 input attributes -->
-        <attribute><name>accesskey</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>align</name>       <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>alt</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>maxlength</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>onselect</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>readonly</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>size</name>        <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue><type>java.lang.String</type></attribute>
-        <!-- HTML 4.0 input type="file" attributes -->
-        <attribute>
-            <name>accept</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-	        <name>storage</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- inputHtml -->
-    <tag>
-        <name>inputHtml</name>
-        <tag-class>org.apache.myfaces.custom.inputHtml.InputHtmlTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            An inline HTML based word processor based on the Kupu library. See http://kupu.oscom.org
-            Right now, the support is limited to one editor per page
-            (but you can use tabs to have multiple editors, but only one rendered at a time).
-        </description>
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-        <attribute>
-	        <name>style</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-	        <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-	        <name>fallback</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-            	Use a text area instead of the javascript HTML editor.
-            	Default is false.
-            	Use with caution.
-            </description>
-        </attribute>
-        <attribute>
-	        <name>type</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-            	The type of the value. It can be either fragment for an HTML fragment (default)
-            	or document for a full HTML document, with head, title, body, ... tags.
-            </description>
-        </attribute>
-       	<attribute>
-	        <name>allowEditSource</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-            	Allows the user to edit the HTML source code.
-            	Default is true.
-            </description>
-       	</attribute>
-		<attribute>
-	        <name>allowExternalLinks</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-            	Allows the user to insert external links.
-            	Default is true.
-            </description>
-       	</attribute>
-       	<attribute>
-	        <name>addKupuLogo</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-            	Show the Kupu Logo in the buttons bar.
-            	Default is true.
-            </description>
-       	</attribute>
-       	<attribute>
-	        <name>showAllToolBoxes</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Shortcut to avoid setting all the showXXToolBox to true.
-            	Default is false.
-            </description>
-        </attribute>
-       	<attribute>
-	        <name>showPropertiesToolBox</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Show the Properties tool box next to the text.
-            	Default is false.
-            </description>
-        </attribute>
-       	<attribute>
-	        <name>showLinksToolBox</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Show the Links tool box next to the text.
-            	Default is false.
-            </description>
-        </attribute>
-       	<attribute>
-	        <name>showImagesToolBox</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Show the Images tool box next to the text.
-            	Default is false.
-            </description>
-        </attribute>
-       	<attribute>
-	        <name>showTablesToolBox</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Show the Tables tool box next to the text.
-            	Default is false.
-            </description>
-        </attribute>
-		<attribute>
-	        <name>showCleanupExpressionsToolBox</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Show the Cleanup Expressions tool box next to the text.
-            	Default is false.
-            </description>
-        </attribute>
-       	<attribute>
-	        <name>showDebugToolBox</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-			<description>
-            	Show the Debug tool box next to the text.
-            	Default is false.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- navigationMenu, jscookMenu -->
-    <tag>
-        <name>navigationMenuItem</name>
-        <tag-class>org.apache.myfaces.custom.navmenu.HtmlNavigationMenuItemTag</tag-class>
-        <body-content>JSP</body-content>
-        <!-- UISelectItem attributes -->
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-        <attribute>
-            <name>itemDisabled</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will not be saved during state saving.</description>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>itemDescription</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>itemLabel</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>itemValue</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Value reference pointing at a javax.faces.model.SelectItem instance.</description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- navigationMenuItem attributes -->
-        <attribute>
-            <name>icon</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>split</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>navigationMenuItems</name>
-        <tag-class>org.apache.myfaces.custom.navmenu.HtmlNavigationMenuItemsTag</tag-class>
-        <body-content>empty</body-content>
-        <!-- UISelectItems attributes -->
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Value reference pointing at a List or Array of javax.faces.model.SelectItem instances.</description>
-        </attribute>
-
-    </tag>
-    <tag>
-        <name>jscookMenu</name>
-        <tag-class>org.apache.myfaces.custom.navmenu.jscookmenu.HtmlJSCookMenuTag</tag-class>
-        <body-content>JSP</body-content>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <attribute>
-            <name>javascriptLocation</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                An alternate location to find javascript resources.  If no values is specified, javascript will
-                be loaded from the resources directory using AddResource and ExtensionsFilter.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>imageLocation</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                An alternate location to find image resources.  If no values is specified, images will
-                be loaded from the resources directory using AddResource and ExtensionsFilter.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>styleLocation</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                An alternate location to find stylesheet resources.  If no values is specified, stylesheets will
-                be loaded from the resources directory using AddResource and ExtensionsFilter.
-            </description>
-        </attribute>
-
-        <!-- jscookMenu attributes -->
-        <attribute>
-            <name>layout</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>theme</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- panelLayout -->
-    <tag>
-        <name>panelLayout</name>
-        <tag-class>org.apache.myfaces.custom.layout.HtmlPanelLayoutTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <attribute>
-            <name>layout</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                layout           | header | navigation | body  | footer
-                =================|========|============|=======|========
-                classic (Default)| top    | left       | right | bottom
-                navigationRight  | top    | right      | left  | bottom
-                upsideDown       | bottom | left       | right | top
-            </description>
-        </attribute>
-        <attribute>
-            <name>headerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>navigationClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>bodyClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>footerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS class to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>headerStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>navigationStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>bodyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for the table cell.</description>
-        </attribute>
-        <attribute>
-            <name>footerStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>CSS style to be used for the table cell.</description>
-        </attribute>
-    </tag>
-
-    <!-- panelNavigation2 -->
-    <tag>
-        <name>panelNavigation2</name>
-        <tag-class>org.apache.myfaces.custom.navmenu.htmlnavmenu.HtmlPanelNavigationMenuTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <attribute>
-            <name>itemClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class of closed navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>openItemClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class of open navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeItemClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class of the active navigation item.
-            </description>
-        </attribute>
-        <attribute>
-            <name>separatorClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class for the td element of a separator.
-            </description>
-        </attribute>
-        <attribute>
-            <name>itemStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style of closed navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>openItemStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style of open navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeItemStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style of the active navigation item.
-            </description>
-        </attribute>
-        <attribute>
-            <name>separatorStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style for the td element of a separator.
-            </description>
-        </attribute>
-        <attribute>
-            <name>layout</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Table or List Layout (default is Table) 
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- panelNavigation -->
-    <tag>
-        <name>panelNavigation</name>
-        <tag-class>org.apache.myfaces.custom.navigation.HtmlPanelNavigationTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <attribute>
-            <name>itemClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class of closed navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>openItemClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class of open navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeItemClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class of the active navigation item.
-            </description>
-        </attribute>
-        <attribute>
-            <name>separatorClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS class for the td element of a separator.
-            </description>
-        </attribute>
-        <attribute>
-            <name>itemStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style of closed navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>openItemStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style of open navigation items.
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeItemStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style of the active navigation item.
-            </description>
-        </attribute>
-        <attribute>
-            <name>separatorStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The CSS Style for the td element of a separator.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- panelTab -->
-    <tag>
-        <name>panelTab</name>
-        <tag-class>org.apache.myfaces.custom.tabbedpane.HtmlPanelTabTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>label</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Label of this tab.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- panelTabbedPane -->
-    <tag>
-        <name>panelTabbedPane</name>
-        <tag-class>org.apache.myfaces.custom.tabbedpane.HtmlPanelTabbedPaneTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>selectedIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Index of tab that is selected by default.
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeTabStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class of the active tab cell.
-            </description>
-        </attribute>
-        <attribute>
-            <name>inactiveTabStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class of the inactive tab cells.
-            </description>
-        </attribute>
-        <attribute>
-            <name>disabledTabStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class of the disabled tab cells.
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeSubStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class of the active tab sub cell.
-            </description>
-        </attribute>
-        <attribute>
-            <name>inactiveSubStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class of the inactive tab sub cells.
-            </description>
-        </attribute>
-        <attribute>
-            <name>tabContentStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class of the active tab content cell.
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- tab change listener -->
-    <tag>
-        <name>tabChangeListener</name>
-        <tag-class>org.apache.myfaces.custom.tabbedpane.TabChangeListenerTag</tag-class>
-        <body-content>empty</body-content>
-        <attribute>
-            <name>type</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-
-    <!-- collapsiblePanel -->
-    <tag>
-        <name>collapsiblePanel</name>
-        <tag-class>org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanelTag</tag-class>
-        <body-content>JSP</body-content>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>collapsed</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-               Boolean value indicating whether the panel should be collapsed by default.
-            </description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Label for collapsible panel.
-            </description>
-        </attribute>
-    </tag>
-
-	<!-- selectOneCountry -->
-    <tag>
-        <name>selectOneCountry</name>
-        <tag-class>org.apache.myfaces.custom.selectOneCountry.SelectOneCountryTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            A localized list of countries choose box.
-            The value binds to the country ISO 3166 code.
-            This is the same code as for java.util.Locale.getCountry().
-			The official codes list is available here :
-			http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html
-        </description>
-        <attribute>
-            <name>maxLength</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-               Integer equals to the maximum number of characters in the country name.
-            </description>
-        </attribute>
-                <!-- all standard attributes of the selectOneMenu tag -->
-                <!-- UISelectOne attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 select attributes -->
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "multiple" cannot be set manually -->
-        <!-- "name" cannot be set manually -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "size" cannot be set directly for it is a MenuRenderer specific attribute -->
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>readonly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Flag indicating that this component will prohibit
-          changes by the user.  The element may receive focus
-          unless it has also been disabled.</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-    <!-- selectOneLanguage -->
-    <tag>
-        <name>selectOneLanguage</name>
-        <tag-class>org.apache.myfaces.custom.selectOneLanguage.SelectOneLanguageTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            A localized list of languages choose box.
-            The value binds to the language ISO 639 code (lowercase).
-            This is the same code as for java.util.Locale.getLanguage().
-			The official codes list is available here :
-			http://www.loc.gov/standards/iso639-2/englangn.html
-        </description>
-        <attribute>
-            <name>maxLength</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-               Integer equals to the maximum number of characters in the language name.
-            </description>
-        </attribute>
-                <!-- all standard attributes of the selectOneMenu tag -->
-                <!-- UISelectOne attributes -->
-                <!-- UIInput attributes -->
-                <!-- UIOutput attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Initial value to set when rendered for the first time.</description>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Id of Converter to be used or reference to a Converter.</description>
-        </attribute>
-
-        <attribute>
-            <name>immediate</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.</description>
-        </attribute>
-        <attribute>
-            <name>required</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will be checked for non-empty input.</description>
-        </attribute>
-        <attribute>
-            <name>validator</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component.</description>
-        </attribute>
-        <attribute>
-            <name>valueChangeListener</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Listener for value changes.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 select attributes -->
-        <attribute><name>datafld</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>disabled</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "multiple" cannot be set manually -->
-        <!-- "name" cannot be set manually -->
-        <attribute><name>onblur</name>      <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onchange</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onfocus</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- "size" cannot be set directly for it is a MenuRenderer specific attribute -->
-        <attribute><name>tabindex</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>readonly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Flag indicating that this component will prohibit
-          changes by the user.  The element may receive focus
-          unless it has also been disabled.</description>
-        </attribute>
-        <attribute><name>enabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-         <attribute><name>disabledClass</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>displayValueOnly</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If true, renders only the value of the component, but no input widget.
-                Default is false.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style used when displayValueOnly is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayValueOnlyStyleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Style class used when displayValueOnly is true.
-            </description>
-        </attribute>        
-    </tag>
-
-	<!-- stylesheet -->
-
-	<tag>
-		<name>stylesheet</name>
-		<tag-class>org.apache.myfaces.custom.stylesheet.StylesheetTag</tag-class>
-		<body-content>JSP</body-content>
-		<description>a component, which renders the path to a common CSS-file</description>
-		<!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-		<!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-		<attribute>
-			<name>path</name>
-			<required>true</required>
-			<rtexprvalue>false</rtexprvalue>
-			<description>
-				URL for CSS-file.
-			</description>
-		</attribute>
-	</tag>
-
-	<!-- div -->
-
-	<tag>
-		<name>div</name>
-		<tag-class>org.apache.myfaces.custom.div.DivTag</tag-class>
-		<body-content>JSP</body-content>
-		<description>Places a div around its children</description>
-		<!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>false</rtexprvalue>
-			<description>
-				The style to use for this div.
-			</description>
-		</attribute>
-		<attribute>
-			<name>styleClass</name>
-			<required>false</required>
-			<rtexprvalue>false</rtexprvalue>
-			<description>
-				The class to use for this div.
-			</description>
-		</attribute>
-	</tag>
-
-	<!-- htmlTag -->
-
-	<tag>
-		<name>htmlTag</name>
-		<tag-class>org.apache.myfaces.custom.htmlTag.HtmlTagTag</tag-class>
-		<body-content>JSP</body-content>
-		<description>Places the given HTML tag div around its children</description>
-		<!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-                <!-- 
-        This attribute indicates that the component should be forced to use the specified id instead of 
-        using the one that faces generates.  Components contained within a "list" will include a '[n]'  
-        suffix where 'n' is the row index (unless the forceIdIndex attribute is set to false).
-        -->
-        <attribute>
-            <name>forceId</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will force the use of the specified id when rendering.</description>
-        </attribute>        
-
-        <!-- 
-        If the component is contained within an "list" (such as dataTable), this attribute indicates whether or not a 
-        '[n]' suffix should be added where 'n' is the row index.  Default is true.  The attribute is ignored if forceId 
-        is false (or not specified)
-        -->
-        <attribute>
-            <name>forceIdIndex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                If false, this component will not append a '[n]' suffix (where 'n' is the row index) to components 
-                that are contained within a "list."  This value will be true by default and the value will be ignored if 
-                the value of forceId is false (or not specified.)
-            </description>
-        </attribute>        
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				The name of the tag. For example, use h1 to generate an h1 tag.
-			</description>
-        </attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>false</rtexprvalue>
-			<description>
-				The style to use for this tag.
-			</description>
-		</attribute>
-		<attribute>
-			<name>styleClass</name>
-			<required>false</required>
-			<rtexprvalue>false</rtexprvalue>
-			<description>
-				The class to use for this tag.
-			</description>
-		</attribute>
-	</tag>
-
-
-    <!-- radio -->
-    <tag>
-        <name>radio</name>
-        <tag-class>org.apache.myfaces.custom.radio.HtmlRadioTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Renders a HTML input of type "radio". The associated SelectItem comes from
-            an extended selectOneRadio component with layout "spread". The selectOneRadio
-            is referenced by the "for" attribute.
-            All HTML pass-through attributes for this input are taken from the associated
-            selectOneRadio.
-        </description>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-        <!-- HtmlRadio attributes -->
-        <attribute>
-            <name>for</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                 id of the referenced extended selectOneRadio component
-            </description>
-        </attribute>
-        <attribute>
-            <name>index</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                n-th SelectItem of referenced UISelectOne starting with 0.
-            </description>
-        </attribute>
-    </tag>
-
-   <!-- tree -->
-    <tag>
-        <name>tree</name>
-        <tag-class>org.apache.myfaces.custom.tree.taglib.TreeTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>nodeClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>selectedNodeClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>headerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>footerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rowClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>columnClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconLine</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNoline</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconChildFirst</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconChildMiddle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconChildLast</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeOpen</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeOpenFirst</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeOpenMiddle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeOpenLast</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeClose</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeCloseFirst</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeCloseMiddle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>iconNodeCloseLast</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>expandRoot</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>expireListeners</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Time interval the tree will remain registered as a TreeModelListener without being accessed</description>
-        </attribute>
-    </tag>
-
-    <tag>
-        <name>treeSelectionListener</name>
-        <tag-class>org.apache.myfaces.custom.tree.taglib.TreeSelectionListenerTag</tag-class>
-        <body-content>empty</body-content>
-        <attribute>
-            <name>type</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <tag>
-        <name>iconProvider</name>
-        <tag-class>org.apache.myfaces.custom.tree.taglib.IconProviderTag</tag-class>
-        <body-content>empty</body-content>
-        <attribute>
-            <name>type</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- tree column -->
-    <tag>
-        <name>treeColumn</name>
-        <tag-class>org.apache.myfaces.custom.tree.taglib.TreeColumnTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Renders a HTML input of type "treeColumn". This tag outlines the column where
-            the tree structure will be render as part of the tree table.
-        </description>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-    </tag>
-
-    <!-- tree checkbox -->
-    <tag>
-        <name>treeCheckbox</name>
-        <tag-class>org.apache.myfaces.custom.tree.taglib.TreeCheckboxTag</tag-class>
-        <body-content>empty</body-content>
-        <description>
-            Renders a HTML input of type "treeCheckbox". The associated comes from
-            the treeCheckbox itemLabel and itemValue.  The selected items come from an extended
-            selectManyCheckbox component with layout "spread". The selectManyCheckbox
-            is referenced by the "for" attribute.
-            All HTML pass-through attributes for this input are taken from the associated
-            selectManyCheckbox.
-        </description>
-        <!-- UISelectItem attributes -->
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-        <attribute>
-            <name>itemDisabled</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If true, this component will not be saved during state saving.</description>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>itemDescription</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>itemLabel</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>itemValue</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Value reference pointing at a javax.faces.model.SelectItem instance.</description>
-        </attribute>
-
-        <!-- HtmlTreeCheckbox attributes -->
-        <attribute>
-            <name>for</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                id of the referenced extended selectManyCheckbox component
-            </description>
-        </attribute>
-    </tag>
-
-   <!-- tree2 -->
-    <tag>
-        <name>tree2</name>
-        <tag-class>org.apache.myfaces.custom.tree2.TreeTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>varNodeToggler</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>showNav</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Show the "plus" and "minus" navigation icons (default is true.) Value is ignored if
-                clientSideToggle is true.
-            </description>
-        </attribute>
-        <attribute>
-            <name>showLines</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Show the connecting lines (default is true.)</description>
-        </attribute>
-        <attribute>
-            <name>clientSideToggle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Perform client-side toggling of expand/collapse state via javascript (default is true.)</description>
-        </attribute>
-        <attribute>
-            <name>showRootNode</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Include the root node when rendering the tree (default is true.)</description>
-        </attribute>
-        <attribute>
-            <name>preserveToggle</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Preserve changes in client-side toggle information between requests (default is true.)</description>
-        </attribute>
-                <attribute>
-            <name>javascriptLocation</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                An alternate location to find javascript resources.  If no values is specified, javascript will
-                be loaded from the resources directory using AddResource and ExtensionsFilter.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>imageLocation</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                An alternate location to find image resources.  If no values is specified, images will
-                be loaded from the resources directory using AddResource and ExtensionsFilter.
-            </description>
-        </attribute>
-
-        <attribute>
-            <name>styleLocation</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>
-                An alternate location to find stylesheet resources.  If no values is specified, stylesheets will
-                be loaded from the resources directory using AddResource and ExtensionsFilter.
-            </description>
-        </attribute>
-
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-    </tag>
-
-    <!-- panelStack -->
-    <tag>
-        <name>panelStack</name>
-        <tag-class>org.apache.myfaces.custom.panelstack.PanelStackTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>selectedPanel</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Id of the child to be rendered.</description>
-        </attribute>
-    </tag>
-
-    <!-- popup -->
-    <tag>
-        <name>popup</name>
-        <tag-class>org.apache.myfaces.custom.popup.HtmlPopupTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Renders a popup which displays on a mouse event.
-        </description>
-        <attribute>
-            <name>displayAtDistanceX</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Pop the panel up in horizontal distance of x pixels from
-                event.
-            </description>
-        </attribute>
-        <attribute>
-            <name>displayAtDistanceY</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Pop the panel up in vertical distance of y pixels from
-                event.
-            </description>
-        </attribute>
-        <attribute>
-            <name>closePopupOnExitingElement</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Close the popup when the triggering element is left.
-            </description>
-        </attribute>
-        <attribute>
-            <name>closePopupOnExitingPopup</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                Close the popup when the popup itself is left.
-            </description>
-        </attribute>
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- MyFaces extension: user role attributes -->
-        <attribute>
-            <name>enabledOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, no hyperlink is rendered but all nested
-                tags (=body) are rendered.
-            </description>
-        </attribute>
-        <attribute>
-            <name>visibleOnUserRole</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                If user is in given role, this component will be rendered
-                normally. If not, nothing is rendered and the body of this tag
-                will be skipped.
-            </description>
-        </attribute>
-
-     </tag>
-
-
-    <!-- newspaperTable -->
-    <tag>
-        <name>newspaperTable</name>
-        <tag-class>org.apache.myfaces.custom.newspaper.HtmlNewspaperTableTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            A data table for rendering long skinny tables as short wide table by
-            wrapping the table over a specified number of columns.
-        </description>
-                <!-- all standard attributes of the dataTable tag -->
-                <!-- UIPanel attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- HTML 4.0 table attributes -->
-        <attribute><name>align</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>border</name>          <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>bgcolor</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellpadding</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>cellspacing</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datafld</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>datasrc</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>dataformatas</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>frame</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>rules</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>summary</name>         <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>width</name>           <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- UIData attributes -->
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Supported types see JSF Spec 4.1.3</description>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rows</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>first</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!-- TableRenderer attributes -->
-        <attribute>
-            <name>columnClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>footerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>headerClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>rowClasses</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-        <attribute>
-            <name>newspaperColumns</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The number of columns to wrap the table over.
-                Default: 1
-            </description>
-        </attribute>
-     </tag>
-
-
-
-<!--     Custom non-component tags     -->
-
-	<!-- aliasBean -->
-    <tag>
-        <name>aliasBean</name>
-        <tag-class>org.apache.myfaces.custom.aliasbean.AliasBeanTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            A tag that defines a new bean (alias) with a given value.
-            This allows you to design a subform with a generic (fictive) beans and to include it in all the pages where you use it.
-			You just need to make an alias to the real bean named after the generic bean before including the subform.
-
-			When used within an aliasBeansScope tag, this tag adds the alias to the aliasBeansScope.
-			This makes configuration with multiple aliasBeans easier to write.
-        </description>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>alias</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The bean that will be set to the given value.
-                Example : #{holder}
-            </description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-                The value that the alias can be set to.
-				This can be a string (like "toto") or a reference to an existing bean (like "#{myBean.member1}").
-            </description>
-        </attribute>
-    </tag>
-    <tag>
-        <name>aliasBeansScope</name>
-        <tag-class>org.apache.myfaces.custom.aliasbean.AliasBeansScopeTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            This is like an aliasBean tag, but instead of the alias/value attributes, you configure the aliases
-            by adding aliasBean tags in the body.
-
-            The aliasBeans should be declared right after this tag.
-        </description>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- bufferBean -->
-    <tag>
-        <name>buffer</name>
-        <tag-class>org.apache.myfaces.custom.buffer.BufferTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>into</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- saveState -->
-    <tag>
-        <name>saveState</name>
-        <tag-class>org.apache.myfaces.custom.savestate.SaveStateTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            saveState enables you to persist beans and values longer than
-            request scope, but shorter than session scope. It is ideal for
-            persisting backing beans and values with the same scope as your view
-            components. It does this by saving the target state with the
-            component tree.
-        </description>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-    <!-- updateActionListener -->
-    <tag>
-        <name>updateActionListener</name>
-        <tag-class>org.apache.myfaces.custom.updateactionlistener.UpdateActionListenerTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-            Registers a org.apache.myfaces.custom.updateactionlistener.UpdateActionListener at the
-            parent component.
-        </description>
-        <attribute>
-            <name>property</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>converter</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-
-
-<!-- validators -->
-
-
-        <!-- creditCard -->
-    <tag>
-        <name>validateCreditCard</name>
-        <tag-class>org.apache.myfaces.custom.creditcardvalidator.ValidateCreditCardTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-			A custom validator for creditCards, based upons Jakarta Commons.
-        </description>
-
-        <attribute>
-            <name>none</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				none of the given cardtypes is allowed.
-            </description>
-        </attribute>
-        <attribute>
-            <name>amex</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				american express cards
-            </description>
-        </attribute>
-        <attribute>
-            <name>visa</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				validation for visa
-            </description>
-        </attribute>
-        <attribute>
-            <name>mastercard</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				validation for mastercard
-            </description>
-        </attribute>
-        <attribute>
-            <name>discover</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				validation for discover
-            </description>
-        </attribute>
-    </tag>
-
-    <!-- Validator for Email -->
-     <tag>
-        <name>validateEmail</name>
-        <tag-class>org.apache.myfaces.custom.emailvalidator.ValidateEmailTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-			A custom validator for email address format, based upons Jakarta Commons.
-        </description>
-	</tag>
-
-    <!-- Validator for ISBN -->
-     <!--tag>
-        <name>validateISBN</name>
-        <tag-class>org.apache.myfaces.custom.isbnvalidator.ValidateISBNTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-			A custom validator for isbn codes, based upons Jakarta Commons.
-        </description>
-	</tag -->
-
-    <!-- Validator for Regular Expressions -->
-    <tag>
-        <name>validateRegExpr</name>
-        <tag-class>org.apache.myfaces.custom.regexprvalidator.ValidateRegExprTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-			A custom validator for reg. expr., based upons Jakarta Commons.
-        </description>
-
-        <attribute>
-            <name>pattern</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				the pattern, which is the base of the validation
-            </description>
-        </attribute>
-	</tag>
-
-    <!-- Validator for Equal -->
-     <tag>
-        <name>validateEqual</name>
-        <tag-class>org.apache.myfaces.custom.equalvalidator.ValidateEqualTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>
-			A custom validator for validations against foreign component values.
-        </description>
-
-        <attribute>
-            <name>for</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				the id of the foreign component, which is needed for the validation
-            </description>
-        </attribute>
-	</tag>
-
-    <!-- swap_image -->
-    <tag>
-        <name>swapImage</name>
-        <tag-class>org.apache.myfaces.custom.swapimage.HtmlSwapImageTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>swapImageUrl</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				the url of the image displayed onmouseover
-            </description>
-        </attribute>
-        <attribute>
-            <name>activeImageUrl</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>
-				activeImage will be rendered if: swapImage is a direct child of commandNavigation
-                and the commandNavigation.isActive
-            </description>
-        </attribute>
-                <!-- UIGraphic attributes -->
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <attribute>
-            <name>url</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>URL of the image (see JSF.4.1.5).</description>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>URL of the image (see JSF.4.1.5).</description>
-        </attribute>
-
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 img attributes that are not part of the JSF 1.1 specification -->
-        <attribute>
-            <name>align</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>border</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>hspace</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>vspace</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-
-        <!-- The subset of HTML 4.0 img attributes that are supported by the JSF 1.1 specification -->
-        <attribute>
-            <name>alt</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>height</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>ismap</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>longdesc</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <!-- "name" attribute cannot be set directly by user -->
-        <!-- "src" attribute cannot be set directly, use "url" instead! -->
-        <attribute>
-            <name>usemap</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-        <attribute>
-            <name>width</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-        </attribute>
-
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-    </tag>
-
-	<!-- columns -->
-    <tag>
-        <name>columns</name>
-        <tag-class>org.apache.myfaces.custom.crosstable.HtmlColumnsTag</tag-class>
-        <body-content>JSP</body-content>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <!-- UIColumn attributes -->
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Supported types see JSF Spec 4.1.3</description>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        
-        <!-- header attributes -->
-        <attribute><name>headerdir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerlang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerstyle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headertitle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerstyleClass</name><required>false</required><rtexprvalue>false</rtexprvalue><description>Corresponds to the HTML class attribute.</description></attribute>
-        <attribute><name>headeronclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- footer attributes -->
-        <attribute><name>footerdir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerlang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerstyle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footertitle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerstyleClass</name><required>false</required><rtexprvalue>false</rtexprvalue><description>Corresponds to the HTML class attribute.</description></attribute>
-        <attribute><name>footeronclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <attribute>
-            <name>width</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>This attribute can be used to set the width of the &lt;TD&gt; elements</description>
-        </attribute>        
-     </tag>
-
-
-  <!-- column -->
-    <tag>
-        <name>column</name>
-        <tag-class>org.apache.myfaces.custom.column.HtmlColumnTag</tag-class>
-        <body-content>JSP</body-content>
-        <!-- UIComponent attributes -->
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Every component may have an unique id. Automatically created if omitted.</description>
-        </attribute>
-        <attribute>
-            <name>rendered</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>If false, this component will not be rendered.</description>
-        </attribute>
-        <attribute>
-            <name>binding</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <type>java.lang.String</type>
-            <description>Component binding.</description>
-        </attribute>
-
-        <!-- UIColumn attributes -->
-        <!-- HTML 4.0 universal attributes -->
-        <attribute><name>dir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>lang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>style</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>title</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute>
-            <name>styleClass</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>Corresponds to the HTML class attribute.</description>
-        </attribute>
-
-        <!-- HTML 4.0 event-handler attributes -->
-        <attribute><name>onclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>ondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>onkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        
-        <!-- header attributes -->
-        <attribute><name>headerdir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerlang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerstyle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headertitle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerstyleClass</name><required>false</required><rtexprvalue>false</rtexprvalue><description>Corresponds to the HTML class attribute.</description></attribute>
-        <attribute><name>headeronclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headerondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>headeronkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <!-- footer attributes -->
-        <attribute><name>footerdir</name>     <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerlang</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerstyle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footertitle</name>   <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerstyleClass</name><required>false</required><rtexprvalue>false</rtexprvalue><description>Corresponds to the HTML class attribute.</description></attribute>
-        <attribute><name>footeronclick</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footerondblclick</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmousedown</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmouseup</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmouseover</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmousemove</name><required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronmouseout</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronkeypress</name> <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronkeydown</name>  <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-        <attribute><name>footeronkeyup</name>    <required>false</required>  <rtexprvalue>false</rtexprvalue></attribute>
-
-        <attribute>
-            <name>width</name>
-            <required>false</required>
-            <rtexprvalue>false</rtexprvalue>
-            <description>This attribute can be used to set the width of the &lt;TD&gt; elements</description>
-        </attribute>        
-     </tag>
-
-</taglib>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portal.taglib.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portal.taglib.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portal.taglib.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,12 +1,20 @@
 <?xml version="1.0"?>
 <!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
 <facelet-taglib>
-    <namespace>http://www.jboss.com/portal</namespace>
+    <namespace>http://www.jboss.org/portal</namespace>
     <tag>
         <tag-name>scroller</tag-name>
         <component>
-            <component-type>com.jboss.portal.Scroller</component-type>
+            <component-type>org.jboss.portal.Scroller</component-type>
             <renderer-type>default</renderer-type>
         </component>
     </tag>
+   <tag>
+       <tag-name>portlet</tag-name>
+       <component>
+           <component-type>org.jboss.portal.Portlet</component-type>
+           <renderer-type>default</renderer-type>
+           <handler-class>org.jboss.portal.faces.component.portlet.PortletHandler</handler-class>
+       </component>
+   </tag>
 </facelet-taglib>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet-instances.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet-instances.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -39,4 +39,10 @@
          </security-constraint>
       </instance>
    </deployment>
+   <deployment>
+      <instance>
+         <instance-id>DashboardConfigPortletInstance</instance-id>
+         <portlet-ref>DashboardConfigPortlet</portlet-ref>
+      </instance>
+   </deployment>
 </deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -31,9 +31,9 @@
       <description>Administration Portlet</description>
       <portlet-name>AdminPortlet</portlet-name>
       <display-name>Administration Portlet</display-name>
-      <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
+      <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class>
       <init-param>
-         <name>default-view</name>
+         <name>VIEW</name>
          <value>/WEB-INF/jsf/objects.xhtml</value>
       </init-param>
       <expiration-cache>-1</expiration-cache>
@@ -46,4 +46,23 @@
          <keywords>management,admin</keywords>
       </portlet-info>
    </portlet>
+   <portlet>
+      <description>Dashboard Configurator Portlet</description>
+      <portlet-name>DashboardConfigPortlet</portlet-name>
+      <display-name>Dashboard Configurator Portlet</display-name>
+      <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class>
+      <init-param>
+         <name>VIEW</name>
+         <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value>
+      </init-param>
+      <expiration-cache>-1</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Dashboard Configurator Portlet</title>
+         <keywords>management,admin</keywords>
+      </portlet-info>
+   </portlet>
 </portlet-app>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -27,6 +27,8 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee  http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
    version="2.4">
+
+   <!-- MyFaces specific configuration -->
    <context-param>
       <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
       <param-value>true</param-value>
@@ -47,6 +49,8 @@
       <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
       <param-value>true</param-value>
    </context-param>
+
+   <!-- Facelet configuration -->
    <context-param>
       <param-name>facelets.DEVELOPMENT</param-name>
       <param-value>false</param-value>
@@ -59,6 +63,8 @@
       <param-name>facelets.LIBRARIES</param-name>
       <param-value>/WEB-INF/portal.taglib.xml</param-value>
    </context-param>
+
+   <!-- JSF configuration -->
    <context-param>
       <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
       <param-value>.xhtml</param-value>
@@ -67,6 +73,15 @@
       <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
       <param-value>server</param-value>
    </context-param>
+
+   <!-- -->
+   <servlet>
+       <servlet-name>Faces Servlet</servlet-name>
+       <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+       <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <!-- -->
    <listener>
       <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
    </listener>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css	2007-04-04 13:24:34 UTC (rev 10757)
@@ -6,7 +6,7 @@
 }
 
 .admin-ui th {
-   text-align:left;
+   text-align: left;
    border: 0px;
    border-bottom: 1px solid;
 }
@@ -21,10 +21,11 @@
 
 .admin-ui ul.pagination {
    margin: 0;
-   padding: 4px 0px 3px 0px;
+   padding: .2em;
 }
 
 .admin-ui ul.pagination li {
+   text-align: center;
    list-style-type: none;
    display: inline;
    margin-right: 2px;
@@ -33,25 +34,46 @@
 
 .admin-ui ul.pagination li.selected {
    font-weight: bold;
+   background-color: #eef;
+   border: 1px solid black;
+   border-bottom: 3px solid black;
 }
 
-.pagination a, .pagination a:visited, .pagination a:hover{
-   text-decoration: none; 
+.pagination a, .pagination a:visited, .pagination a:hover {
+   text-decoration: none;
 }
 
 /* Top nav. */
 
 .admin-ui ul.topnav {
-   margin: 0;
-   padding: 5px 0px 5px 0px;
+   margin-left: 0;
+   padding: 3px 0;
+   border-bottom: 1px solid;
 }
 
 .admin-ui ul.topnav li {
    list-style-type: none;
    display: inline;
-   margin-right: 10px;
+   margin: 0;
+   padding: 3px 0.5em;
+   margin-left: 5px;
+   border: 1px solid #777;
+   border-bottom: none;
+   background-color: #eef;
 }
 
+.admin-ui ul.topnav li a:hover {
+   background-color: #ccf;
+}
+
+.admin-ui ul.topnav li#currentTab {
+   background-color: white;
+   border-bottom: 1px solid white;
+}
+
+.admin-ui ul.topnav li#currentTab a:hover {
+}
+
 /* Object path. */
 
 .admin-ui ul.objectpath {
@@ -72,25 +94,20 @@
 /*  */
 
 .admin-ui select.contentType {
-   width:8em;
+   width: 8em;
 }
 
 .admin-ui select.instanceList {
-   width:11em;
+   width: 11em;
 }
 
 .admin-ui select.windowList {
-   width:11em;
+   width: 11em;
 }
 
 /* Style a table for form layout */
 
 .admin-ui table.form {
-   border-spacing: 10px 4px;
-   margin-left: -10px;
-   margin-right: -10px;
-   margin-top: -4px;
-   margin-bottom: -4px;
 }
 
 .admin-ui table.form td.label {
@@ -108,3 +125,38 @@
 .admin-ui hr {
    border-top-style: solid;
 }
+
+.admin-ui .wizardStepBox {
+   display: inline;
+   float: left;
+   border: 1px solid #98B7C6;
+   height: 7em;
+   width: 9em;
+   background-color: #DFE8ED;
+   margin: .5em;
+}
+
+.admin-ui .wizardButtonBox {
+   margin: 1em;
+}
+
+.admin-ui .wizardContent {
+   clear: both;
+}
+
+.admin-ui #selected.wizardStepBox {
+   background-color: #C8DCC4;
+   border: 1px solid black;
+   border-bottom: 5px solid black;
+}
+
+.admin-ui .stepNumber {
+   font-size: 2em;
+   text-align: center;
+   margin-top: 5px;
+   margin-bottom: 0px;
+}
+
+.admin-ui .stepText {
+   text-align: center;
+}

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/builder.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/builder.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/builder.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,8 +1,9 @@
-// script.aculo.us builder.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
+// script.aculo.us builder.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
 
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //
-// See scriptaculous.js for full license.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
 var Builder = {
   NODEMAP: {
@@ -35,7 +36,7 @@
     var element = parentElement.firstChild || null;
       
     // see if browser added wrapping tags
-    if(element && (element.tagName != elementName))
+    if(element && (element.tagName.toUpperCase() != elementName))
       element = element.getElementsByTagName(elementName)[0];
     
     // fallback to createElement approach
@@ -63,7 +64,7 @@
               for(attr in arguments[1]) 
                 element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
             }
-            if(element.tagName != elementName)
+            if(element.tagName.toUpperCase() != elementName)
               element = parentElement.getElementsByTagName(elementName)[0];
             }
         } 
@@ -77,10 +78,16 @@
   _text: function(text) {
      return document.createTextNode(text);
   },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
   _attributes: function(attributes) {
     var attrs = [];
     for(attribute in attributes)
-      attrs.push((attribute=='className' ? 'class' : attribute) +
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
           '="' + attributes[attribute].toString().escapeHTML() + '"');
     return attrs.join(" ");
   },
@@ -100,6 +107,11 @@
   _isStringOrNumber: function(param) {
     return(typeof param=='string' || typeof param=='number');
   },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
   dump: function(scope) { 
     if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
   
@@ -116,4 +128,4 @@
       } 
     });
   }
-}
\ No newline at end of file
+}

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/controls.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/controls.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/controls.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,14 +1,15 @@
-// script.aculo.us controls.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
+// script.aculo.us controls.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
 
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005 Jon Tirsen (http://www.tirsen.com)
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
 // Contributors:
 //  Richard Livsey
 //  Rahul Bhargava
 //  Rob Wills
 // 
-// See scriptaculous.js for full license.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
 // Autocompleter.Base handles all the autocompletion functionality 
 // that's independent of the data source for autocompletion. This
@@ -264,11 +265,11 @@
     if(!this.changed && this.hasFocus) {
       this.update.innerHTML = choices;
       Element.cleanWhitespace(this.update);
-      Element.cleanWhitespace(this.update.firstChild);
+      Element.cleanWhitespace(this.update.down());
 
-      if(this.update.firstChild && this.update.firstChild.childNodes) {
+      if(this.update.firstChild && this.update.down().childNodes) {
         this.entryCount = 
-          this.update.firstChild.childNodes.length;
+          this.update.down().childNodes.length;
         for (var i = 0; i < this.entryCount; i++) {
           var entry = this.getEntry(i);
           entry.autocompleteIndex = i;
@@ -474,6 +475,7 @@
     this.element = $(element);
 
     this.options = Object.extend({
+      paramName: "value",
       okButton: true,
       okText: "ok",
       cancelLink: true,
@@ -605,7 +607,7 @@
       var textField = document.createElement("input");
       textField.obj = this;
       textField.type = "text";
-      textField.name = "value";
+      textField.name = this.options.paramName;
       textField.value = text;
       textField.style.backgroundColor = this.options.highlightcolor;
       textField.className = 'editor_field';
@@ -618,7 +620,7 @@
       this.options.textarea = true;
       var textArea = document.createElement("textarea");
       textArea.obj = this;
-      textArea.name = "value";
+      textArea.name = this.options.paramName;
       textArea.value = this.convertHTMLLineBreaks(text);
       textArea.rows = this.options.rows;
       textArea.cols = this.options.cols || 40;

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dragdrop.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dragdrop.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dragdrop.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,12 +1,11 @@
-// script.aculo.us dragdrop.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
+// script.aculo.us dragdrop.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
 
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005 Sammi Williams (http://www.oriontransfer.co.nz, sammi at oriontransfer.co.nz)
-//
-// See scriptaculous.js for full license.
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi at oriontransfer.co.nz)
+// 
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
-/*--------------------------------------------------------------------------*/
-
 if(typeof Effect == 'undefined')
   throw("dragdrop.js requires including script.aculo.us' effects.js library");
 
@@ -29,14 +28,14 @@
     if(options.containment) {
       options._containers = [];
       var containment = options.containment;
-      if((typeof containment == 'object') &&
+      if((typeof containment == 'object') && 
         (containment.constructor == Array)) {
         containment.each( function(c) { options._containers.push($(c)) });
       } else {
         options._containers.push($(containment));
       }
     }
-
+    
     if(options.accept) options.accept = [options.accept].flatten();
 
     Element.makePositioned(element); // fix IE
@@ -44,34 +43,34 @@
 
     this.drops.push(options);
   },
-
+  
   findDeepestChild: function(drops) {
     deepest = drops[0];
-
+      
     for (i = 1; i < drops.length; ++i)
       if (Element.isParent(drops[i].element, deepest.element))
         deepest = drops[i];
-
+    
     return deepest;
   },
 
   isContained: function(element, drop) {
     var containmentNode;
     if(drop.tree) {
-      containmentNode = element.treeNode;
+      containmentNode = element.treeNode; 
     } else {
       containmentNode = element.parentNode;
     }
     return drop._containers.detect(function(c) { return containmentNode == c });
   },
-
+  
   isAffected: function(point, element, drop) {
     return (
       (drop.element!=element) &&
       ((!drop._containers) ||
         this.isContained(element, drop)) &&
       ((!drop.accept) ||
-        (Element.classNames(element).detect(
+        (Element.classNames(element).detect( 
           function(v) { return drop.accept.include(v) } ) )) &&
       Position.within(drop.element, point[0], point[1]) );
   },
@@ -91,19 +90,19 @@
   show: function(point, element) {
     if(!this.drops.length) return;
     var affected = [];
-
+    
     if(this.last_active) this.deactivate(this.last_active);
     this.drops.each( function(drop) {
       if(Droppables.isAffected(point, element, drop))
         affected.push(drop);
     });
-
+        
     if(affected.length>0) {
       drop = Droppables.findDeepestChild(affected);
       Position.within(drop.element, point[0], point[1]);
       if(drop.onHover)
         drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-
+      
       Droppables.activate(drop);
     }
   },
@@ -113,7 +112,7 @@
     Position.prepare();
 
     if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
-      if (this.last_active.onDrop)
+      if (this.last_active.onDrop) 
         this.last_active.onDrop(element, this.last_active.element, event);
   },
 
@@ -126,20 +125,20 @@
 var Draggables = {
   drags: [],
   observers: [],
-
+  
   register: function(draggable) {
     if(this.drags.length == 0) {
       this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
       this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
       this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-
+      
       Event.observe(document, "mouseup", this.eventMouseUp);
       Event.observe(document, "mousemove", this.eventMouseMove);
       Event.observe(document, "keypress", this.eventKeypress);
     }
     this.drags.push(draggable);
   },
-
+  
   unregister: function(draggable) {
     this.drags = this.drags.reject(function(d) { return d==draggable });
     if(this.drags.length == 0) {
@@ -148,24 +147,24 @@
       Event.stopObserving(document, "keypress", this.eventKeypress);
     }
   },
-
+  
   activate: function(draggable) {
-    if(draggable.options.delay) {
-      this._timeout = setTimeout(function() {
-        Draggables._timeout = null;
-        window.focus();
-        Draggables.activeDraggable = draggable;
-      }.bind(this), draggable.options.delay);
+    if(draggable.options.delay) { 
+      this._timeout = setTimeout(function() { 
+        Draggables._timeout = null; 
+        window.focus(); 
+        Draggables.activeDraggable = draggable; 
+      }.bind(this), draggable.options.delay); 
     } else {
       window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
       this.activeDraggable = draggable;
     }
   },
-
+  
   deactivate: function() {
     this.activeDraggable = null;
   },
-
+  
   updateDrag: function(event) {
     if(!this.activeDraggable) return;
     var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -173,36 +172,36 @@
     // the same coordinates, prevent needless redrawing (moz bug?)
     if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
     this._lastPointer = pointer;
-
+    
     this.activeDraggable.updateDrag(event, pointer);
   },
-
+  
   endDrag: function(event) {
-    if(this._timeout) {
-      clearTimeout(this._timeout);
-      this._timeout = null;
+    if(this._timeout) { 
+      clearTimeout(this._timeout); 
+      this._timeout = null; 
     }
     if(!this.activeDraggable) return;
     this._lastPointer = null;
     this.activeDraggable.endDrag(event);
     this.activeDraggable = null;
   },
-
+  
   keyPress: function(event) {
     if(this.activeDraggable)
       this.activeDraggable.keyPress(event);
   },
-
+  
   addObserver: function(observer) {
     this.observers.push(observer);
     this._cacheObserverCallbacks();
   },
-
+  
   removeObserver: function(element) {  // element instead of observer fixes mem leaks
     this.observers = this.observers.reject( function(o) { return o.element==element });
     this._cacheObserverCallbacks();
   },
-
+  
   notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
     if(this[eventName+'Count'] > 0)
       this.observers.each( function(o) {
@@ -210,7 +209,7 @@
       });
     if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
   },
-
+  
   _cacheObserverCallbacks: function() {
     ['onStart','onEnd','onDrag'].each( function(eventName) {
       Draggables[eventName+'Count'] = Draggables.observers.select(
@@ -237,12 +236,12 @@
       },
       endeffect: function(element) {
         var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0;
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
           queue: {scope:'_draggable', position:'end'},
-          afterFinish: function(){
-            Draggable._dragging[element] = false
+          afterFinish: function(){ 
+            Draggable._dragging[element] = false 
           }
-        });
+        }); 
       },
       zindex: 1000,
       revert: false,
@@ -252,91 +251,90 @@
       snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
       delay: 0
     };
-
-    if(arguments[1] && typeof arguments[1].endeffect == 'undefined')
+    
+    if(!arguments[1] || typeof arguments[1].endeffect == 'undefined')
       Object.extend(defaults, {
         starteffect: function(element) {
           element._opacity = Element.getOpacity(element);
           Draggable._dragging[element] = true;
-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
         }
       });
-
+    
     var options = Object.extend(defaults, arguments[1] || {});
 
     this.element = $(element);
-
-    if(options.handle && (typeof options.handle == 'string')) {
-      var h = Element.childrenWithClassName(this.element, options.handle, true);
-      if(h.length>0) this.handle = h[0];
-    }
+    
+    if(options.handle && (typeof options.handle == 'string'))
+      this.handle = this.element.down('.'+options.handle, 0);
+    
     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;
-
+    
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
       options.scroll = $(options.scroll);
       this._isScrollChild = Element.childOf(this.element, options.scroll);
     }
 
-    Element.makePositioned(this.element); // fix IE
+    Element.makePositioned(this.element); // fix IE    
 
     this.delta    = this.currentDelta();
     this.options  = options;
-    this.dragging = false;
+    this.dragging = false;   
 
     this.eventMouseDown = this.initDrag.bindAsEventListener(this);
     Event.observe(this.handle, "mousedown", this.eventMouseDown);
-
+    
     Draggables.register(this);
   },
-
+  
   destroy: function() {
     Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
     Draggables.unregister(this);
   },
-
+  
   currentDelta: function() {
     return([
       parseInt(Element.getStyle(this.element,'left') || '0'),
       parseInt(Element.getStyle(this.element,'top') || '0')]);
   },
-
+  
   initDrag: function(event) {
     if(typeof Draggable._dragging[this.element] != 'undefined' &&
       Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {
+    if(Event.isLeftClick(event)) {    
       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
-      if(src.tagName && (
-        src.tagName=='INPUT' ||
-        src.tagName=='SELECT' ||
-        src.tagName=='OPTION' ||
-        src.tagName=='BUTTON' ||
-        src.tagName=='TEXTAREA')) return;
-
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
+        
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
       this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-
+      
       Draggables.activate(this);
       Event.stop(event);
     }
   },
-
+  
   startDrag: function(event) {
     this.dragging = true;
-
+    
     if(this.options.zindex) {
       this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
       this.element.style.zIndex = this.options.zindex;
     }
-
+    
     if(this.options.ghosting) {
       this._clone = this.element.cloneNode(true);
       Position.absolutize(this.element);
       this.element.parentNode.insertBefore(this._clone, this.element);
     }
-
+    
     if(this.options.scroll) {
       if (this.options.scroll == window) {
         var where = this._getWindowScroll(this.options.scroll);
@@ -347,35 +345,31 @@
         this.originalScrollTop = this.options.scroll.scrollTop;
       }
     }
-
+    
     Draggables.notify('onStart', this, event);
-
+        
     if(this.options.starteffect) this.options.starteffect(this.element);
   },
-
+  
   updateDrag: function(event, pointer) {
     if(!this.dragging) this.startDrag(event);
     Position.prepare();
     Droppables.show(pointer, this.element);
     Draggables.notify('onDrag', this, event);
-
+    
     this.draw(pointer);
     if(this.options.change) this.options.change(this);
-
+    
     if(this.options.scroll) {
       this.stopScrolling();
-
+      
       var p;
       if (this.options.scroll == window) {
         with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
       } else {
         p = Position.page(this.options.scroll);
-        p[0] += this.options.scroll.scrollLeft;
-        p[1] += this.options.scroll.scrollTop;
-
-        p[0] += (window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0);
-        p[1] += (window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0);
-
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
         p.push(p[0]+this.options.scroll.offsetWidth);
         p.push(p[1]+this.options.scroll.offsetHeight);
       }
@@ -386,13 +380,13 @@
       if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
       this.startScrolling(speed);
     }
-
+    
     // fix AppleWebKit rendering
     if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
-
+    
     Event.stop(event);
   },
-
+  
   finishDrag: function(event, success) {
     this.dragging = false;
 
@@ -407,10 +401,10 @@
 
     var revert = this.options.revert;
     if(revert && typeof revert == 'function') revert = revert(this.element);
-
+    
     var d = this.currentDelta();
     if(revert && this.options.reverteffect) {
-      this.options.reverteffect(this.element,
+      this.options.reverteffect(this.element, 
         d[1]-this.delta[1], d[0]-this.delta[0]);
     } else {
       this.delta = d;
@@ -419,46 +413,45 @@
     if(this.options.zindex)
       this.element.style.zIndex = this.originalZ;
 
-    if(this.options.endeffect)
+    if(this.options.endeffect) 
       this.options.endeffect(this.element);
-
+      
     Draggables.deactivate(this);
     Droppables.reset();
   },
-
+  
   keyPress: function(event) {
     if(event.keyCode!=Event.KEY_ESC) return;
     this.finishDrag(event, false);
     Event.stop(event);
   },
-
+  
   endDrag: function(event) {
     if(!this.dragging) return;
     this.stopScrolling();
     this.finishDrag(event, true);
     Event.stop(event);
   },
-
+  
   draw: function(point) {
     var pos = Position.cumulativeOffset(this.element);
     if(this.options.ghosting) {
       var r   = Position.realOffset(this.element);
-      window.status = r.inspect();
       pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
     }
-
+    
     var d = this.currentDelta();
     pos[0] -= d[0]; pos[1] -= d[1];
-
+    
     if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
       pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
       pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
     }
-
-    var p = [0,1].map(function(i){
-      return (point[i]-pos[i]-this.offset[i])
+    
+    var p = [0,1].map(function(i){ 
+      return (point[i]-pos[i]-this.offset[i]) 
     }.bind(this));
-
+    
     if(this.options.snap) {
       if(typeof this.options.snap == 'function') {
         p = this.options.snap(p[0],p[1],this);
@@ -471,16 +464,16 @@
           return Math.round(v/this.options.snap)*this.options.snap }.bind(this))
       }
     }}
-
+    
     var style = this.element.style;
     if((!this.options.constraint) || (this.options.constraint=='horizontal'))
       style.left = p[0] + "px";
     if((!this.options.constraint) || (this.options.constraint=='vertical'))
       style.top  = p[1] + "px";
-
+    
     if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
   },
-
+  
   stopScrolling: function() {
     if(this.scrollInterval) {
       clearInterval(this.scrollInterval);
@@ -488,14 +481,14 @@
       Draggables._lastScrollPointer = null;
     }
   },
-
+  
   startScrolling: function(speed) {
     if(!(speed[0] || speed[1])) return;
     this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
     this.lastScrolled = new Date();
     this.scrollInterval = setInterval(this.scroll.bind(this), 10);
   },
-
+  
   scroll: function() {
     var current = new Date();
     var delta = current - this.lastScrolled;
@@ -511,7 +504,7 @@
       this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
       this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
     }
-
+    
     Position.prepare();
     Droppables.show(Draggables._lastPointer, this.element);
     Draggables.notify('onDrag', this);
@@ -525,10 +518,10 @@
         Draggables._lastScrollPointer[1] = 0;
       this.draw(Draggables._lastScrollPointer);
     }
-
+    
     if(this.options.change) this.options.change(this);
   },
-
+  
   _getWindowScroll: function(w) {
     var T, L, W, H;
     with (w.document) {
@@ -563,11 +556,11 @@
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },
-
+  
   onStart: function() {
     this.lastValue = Sortable.serialize(this.element);
   },
-
+  
   onEnd: function() {
     Sortable.unmark();
     if(this.lastValue != Sortable.serialize(this.element))
@@ -577,11 +570,11 @@
 
 var Sortable = {
   SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-
+  
   sortables: {},
-
+  
   _findRootElement: function(element) {
-    while (element.tagName != "BODY") {
+    while (element.tagName.toUpperCase() != "BODY") {  
       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
     }
@@ -592,22 +585,22 @@
     if(!element) return;
     return Sortable.sortables[element.id];
   },
-
+  
   destroy: function(element){
     var s = Sortable.options(element);
-
+    
     if(s) {
       Draggables.removeObserver(s.element);
       s.droppables.each(function(d){ Droppables.remove(d) });
       s.draggables.invoke('destroy');
-
+      
       delete Sortable.sortables[s.element.id];
     }
   },
 
   create: function(element) {
     element = $(element);
-    var options = Object.extend({
+    var options = Object.extend({ 
       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
       dropOnEmpty: false,
@@ -660,16 +653,15 @@
     if(options.zindex)
       options_for_draggable.zindex = options.zindex;
 
-    // build options for the droppables
+    // build options for the droppables  
     var options_for_droppable = {
       overlap:     options.overlap,
       containment: options.containment,
       tree:        options.tree,
       hoverclass:  options.hoverclass,
       onHover:     Sortable.onHover
-      //greedy:      !options.dropOnEmpty
     }
-
+    
     var options_for_tree = {
       onHover:      Sortable.onEmptyHover,
       overlap:      options.overlap,
@@ -678,7 +670,7 @@
     }
 
     // fix for gecko engine
-    Element.cleanWhitespace(element);
+    Element.cleanWhitespace(element); 
 
     options.draggables = [];
     options.droppables = [];
@@ -691,15 +683,15 @@
 
     (this.findElements(element, options) || []).each( function(e) {
       // handles are per-draggable
-      var handle = options.handle ?
-        Element.childrenWithClassName(e, options.handle)[0] : e;
+      var handle = options.handle ? 
+        $(e).down('.'+options.handle,0) : e;    
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
       if(options.tree) e.treeNode = element;
-      options.droppables.push(e);
+      options.droppables.push(e);      
     });
-
+    
     if(options.tree) {
       (Sortable.findTreeElements(element, options) || []).each( function(e) {
         Droppables.add(e, options_for_tree);
@@ -721,7 +713,7 @@
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.tag);
   },
-
+  
   findTreeElements: function(element, options) {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.treeTag);
@@ -737,51 +729,38 @@
       if(dropon.previousSibling != element) {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
-
-        Sortable.createGuide(element);
         dropon.parentNode.insertBefore(element, dropon);
-        dropon.parentNode.insertBefore(Sortable._guide, element);
-        Sortable.markEmptyPlace(element);
-
-        if(dropon.parentNode!=oldParentNode)
+        if(dropon.parentNode!=oldParentNode) 
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
     } else {
       Sortable.mark(dropon, 'after');
       var nextElement = dropon.nextSibling || null;
-
       if(nextElement != element) {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
-
-        Sortable.createGuide(element);
         dropon.parentNode.insertBefore(element, nextElement);
-        dropon.parentNode.insertBefore(Sortable._guide, element);
-        Sortable.markEmptyPlace(element);
-
-        if(dropon.parentNode!=oldParentNode)
+        if(dropon.parentNode!=oldParentNode) 
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
     }
   },
-
-
-
+  
   onEmptyHover: function(element, dropon, overlap) {
     var oldParentNode = element.parentNode;
     var droponOptions = Sortable.options(dropon);
-
+        
     if(!Element.isParent(dropon, element)) {
       var index;
-
+      
       var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
       var child = null;
-
+            
       if(children) {
         var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-
+        
         for (index = 0; index < children.length; index += 1) {
           if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
             offset -= Element.offsetSize (children[index], droponOptions.overlap);
@@ -794,133 +773,68 @@
           }
         }
       }
-
-      Sortable.createGuide(element);
+      
       dropon.insertBefore(element, child);
-      dropon.insertBefore(Sortable._guide, element);
-      Sortable.markEmptyPlace(element);
-
+      
       Sortable.options(oldParentNode).onChange(element);
       droponOptions.onChange(element);
     }
   },
-  createGuide : function (element) {
-    if(!Sortable._guide) {
-          Sortable._guide = $('_guide') || document.createElement('DIV');
-          Sortable._guide.style.position = 'relative';
-          Sortable._guide.style.width = '1px';
-          Sortable._guide.style.height = '0px';
-          Sortable._guide.style.left == '0px';
-          Sortable._guide.style.top == '0px';
 
-          Sortable._guide.style.cssFloat = 'left';
-          Sortable._guide.id = 'guide';
-
-          document.getElementsByTagName("body").item(0).appendChild(Sortable._guide);
-    }
-
-  },
-
-  markEmptyPlace: function(element) {
-
-    if(!Sortable._emptyPlaceMarker) {
-      Sortable._emptyPlaceMarker = $('emptyPlaceMarker') || document.createElement('DIV');
-      Element.hide(Sortable._emptyPlaceMarker);
-      Element.addClassName(Sortable._emptyPlaceMarker, 'emptyPlaceMarker');
-      Sortable._emptyPlaceMarker.style.position = 'absolute';
-      document.getElementsByTagName("body").item(0).appendChild(Sortable._emptyPlaceMarker);
-    }
-
-    var pos = Position.cumulativeOffset(Sortable._guide);
-    Sortable._emptyPlaceMarker.style.left = (pos[0] + 5)+ 'px';
-    Sortable._emptyPlaceMarker.style.top = (pos[1] + 5) + 'px';
-
-    var dim = {};
-    dim.width = (Element.getDimensions(element).width-5) + 'px';
-    dim.height = (Element.getDimensions(element).height-5) + 'px';
-    Sortable._emptyPlaceMarker.setStyle(dim);
-
-    var mg = Element.getStyle(element, 'margin');
-    if(mg && mg != '') {
-        Sortable._emptyPlaceMarker.setStyle({margin : mg});
-    } else  {
-        Sortable._emptyPlaceMarker.setStyle({ margin : ''});
-    }
-
-    Element.show(Sortable._emptyPlaceMarker);
-  },
-
   unmark: function() {
-    if(Sortable._marker) Element.hide(Sortable._marker);
-    if(Sortable._guide && Sortable._guide.parentNode){
-        Sortable._guide.parentNode.removeChild(Sortable._guide);
-    }
-    if(Sortable._emptyPlaceMarker) Element.hide(Sortable._emptyPlaceMarker);
+    if(Sortable._marker) Sortable._marker.hide();
   },
 
   mark: function(dropon, position) {
     // mark on ghosting only
     var sortable = Sortable.options(dropon.parentNode);
-    if(sortable && !sortable.ghosting) return;
+    if(sortable && !sortable.ghosting) return; 
 
     if(!Sortable._marker) {
-      Sortable._marker = $('dropmarker') || document.createElement('DIV');
-      Element.hide(Sortable._marker);
-      Element.addClassName(Sortable._marker, 'dropmarker');
-      Sortable._marker.style.position = 'absolute';
+      Sortable._marker = 
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-    }
+    }    
     var offsets = Position.cumulativeOffset(dropon);
-    Sortable._marker.style.left = offsets[0] + 'px';
-    Sortable._marker.style.top = offsets[1] + 'px';
-
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+    
     if(position=='after')
-      if(sortable.overlap == 'horizontal')
-        Sortable._marker.style.left = (offsets[0]+dropon.clientWidth) + 'px';
+      if(sortable.overlap == 'horizontal') 
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
       else
-        Sortable._marker.style.top = (offsets[1]+dropon.clientHeight) + 'px';
-
-    Element.show(Sortable._marker);
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+    
+    Sortable._marker.show();
   },
-
+  
   _tree: function(element, options, parent) {
     var children = Sortable.findElements(element, options) || [];
-
+  
     for (var i = 0; i < children.length; ++i) {
       var match = children[i].id.match(options.format);
 
       if (!match) continue;
-
+      
       var child = {
         id: encodeURIComponent(match ? match[1] : null),
         element: element,
         parent: parent,
-        children: new Array,
+        children: [],
         position: parent.children.length,
-        container: Sortable._findChildrenElement(children[i], options.treeTag.toUpperCase())
+        container: $(children[i]).down(options.treeTag)
       }
-
+      
       /* Get the element containing the children and recurse over it */
       if (child.container)
         this._tree(child.container, options, child)
-
+      
       parent.children.push (child);
     }
 
-    return parent;
+    return parent; 
   },
 
-  /* Finds the first element of the given tag type within a parent element.
-    Used for finding the first LI[ST] within a L[IST]I[TEM].*/
-  _findChildrenElement: function (element, containerTag) {
-    if (element && element.hasChildNodes)
-      for (var i = 0; i < element.childNodes.length; ++i)
-        if (element.childNodes[i].tagName == containerTag)
-          return element.childNodes[i];
-
-    return null;
-  },
-
   tree: function(element) {
     element = $(element);
     var sortableOptions = this.options(element);
@@ -931,16 +845,16 @@
       name: element.id,
       format: sortableOptions.format
     }, arguments[1] || {});
-
+    
     var root = {
       id: null,
       parent: null,
-      children: new Array,
+      children: [],
       container: element,
       position: 0
     }
-
-    return Sortable._tree (element, options, root);
+    
+    return Sortable._tree(element, options, root);
   },
 
   /* Construct a [i] index for a particular node */
@@ -955,7 +869,7 @@
   sequence: function(element) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[1] || {});
-
+    
     return $(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });
@@ -964,14 +878,14 @@
   setSequence: function(element, new_sequence) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[2] || {});
-
+    
     var nodeMap = {};
     this.findElements(element, options).each( function(n) {
         if (n.id.match(options.format))
             nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
         n.parentNode.removeChild(n);
     });
-
+   
     new_sequence.each(function(ident) {
       var n = nodeMap[ident];
       if (n) {
@@ -980,16 +894,16 @@
       }
     });
   },
-
+  
   serialize: function(element) {
     element = $(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || {});
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-
+    
     if (options.tree) {
       return Sortable.tree(element, arguments[1]).children.map( function (item) {
-        return [name + Sortable._constructIndex(item) + "[id]=" +
+        return [name + Sortable._constructIndex(item) + "[id]=" + 
                 encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
       }).flatten().join('&');
     } else {
@@ -1000,16 +914,14 @@
   }
 }
 
-/* Returns true if child is contained within element */
+// Returns true if child is contained within element
 Element.isParent = function(child, element) {
   if (!child.parentNode || child == element) return false;
-
   if (child.parentNode == element) return true;
-
   return Element.isParent(child.parentNode, element);
 }
 
-Element.findChildren = function(element, only, recursive, tagName) {
+Element.findChildren = function(element, only, recursive, tagName) {    
   if(!element.hasChildNodes()) return null;
   tagName = tagName.toUpperCase();
   if(only) only = [only].flatten();
@@ -1028,8 +940,5 @@
 }
 
 Element.offsetSize = function (element, type) {
-  if (type == 'vertical' || type == 'height')
-    return element.offsetHeight;
-  else
-    return element.offsetWidth;
-}
\ No newline at end of file
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+}

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dyna.js (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dyna.js)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dyna.js	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/dyna.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,219 @@
+function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) {
+   var options = {
+      method: "post",
+      postBody: "action=" + action + "&windowId=" + windowId + "&fromPos=" + fromPos + "&fromRegion=" + fromRegionId + "&toPos=" + toPos + "&toRegion=" + toRegionId,
+      onSuccess: function(t)
+      {
+      },
+      on404: function(t)
+      {
+         alert("Error 404: location " + t.statusText + " was not found.");
+      },
+      onFailure: function(t)
+      {
+         alert("Error " + t.status + " -- " + t.statusText);
+      },
+      onLoading: function(t)
+      {
+      }
+   }
+   new Ajax.Request(async_server_url, options);
+}
+
+function snapshot() {
+
+   // Find draggable regions
+   var regions_on_page = document.getElementsByClassName("dyna-region");
+
+   // Save current state in the DOM itself
+   for(var i = 0;i < regions_on_page.length;i++) {
+      var regionDiv = regions_on_page[i]
+      for (var j = 0;j < regionDiv.childNodes.length;j++) {
+         var child = regionDiv.childNodes[j];
+         child["regionId"] = regionDiv.id;
+         child["pos"] = j;
+       }
+   }
+}
+
+function bilto(event)
+{
+
+   // Locate the div container of the window
+   var source = Event.element(event);
+   var container = Element.up(source, "div.dyna-window");
+
+   // We found the window
+   if (container != null) {
+
+
+      var form = source.nodeName == "FORM";
+      var link = !form & source.nodeName == "A";
+
+      var url;
+      var body;
+      var method;
+
+      if (source.nodeName == "A")
+      {
+         url = source.href;
+         method = "get";
+         body = "";
+      }
+//      else if (source.nodeName == "INPUT" && source.type == "submit")
+//      {
+//         // Find enclosing form
+//         var current = source.parentNode;
+//         while (current.nodeName != 'FORM' && current.nodeName != 'BODY') {
+//            current = current.parentNode;
+//         }
+//
+//         // Check we have a form and use it
+//         if (current.nodeName == 'FORM') {
+//
+//            //
+//            url = current.action;
+//
+//            // Get body if needed
+//            if (current.method.toLowerCase() == "post") {
+//               body = Form.serialize(current);
+//               method = "post";
+//            }
+//            else
+//            {
+//               body = "";
+//               method = "get";
+//            }
+//         }
+//      }
+
+      // Handle links here
+      if (url != null) {
+
+         var parameters = "";
+         var pos = url.indexOf("?");
+         if (pos != -1) {
+            parameters = url.substring(pos + 1);
+            url = url.substring(0, pos);
+         }
+
+         //
+         var headers = ["ajax","true"];
+         if (view_state !== undefined)
+         {
+            headers.view_state = view_state;
+         }
+
+         //
+         var options = {
+            parameters:parameters,
+            asynchronous:true,
+            method: method,
+            postBody: body,
+            requestHeaders:headers,
+            onSuccess: function(t)
+            {
+               var resp = "";
+               eval("resp =" + t.responseText + ";");
+               if (resp.type == "update_markup")
+               {
+                  // Iterate all changes
+                  for (var id in resp.fragments)
+                  {
+                     var matchingElts = document.getElementsByClassName(id);
+
+                     // Different than 1 is not good
+                     if (matchingElts.length == 1)
+                     {
+                        var markup = resp.fragments[id];
+                        markup = markup.substring(25, markup.length - 7);
+
+                        var markupContainer = Element.up(matchingElts[0]);
+                        markupContainer.innerHTML = markup;
+                     }
+                  }
+               }
+               else if (resp.type == "update_page")
+               {
+                  document.location = resp.location;
+               }
+            }
+         };
+
+         // Add the form post body
+         // todo : detect file upload
+         if (form)
+         {
+            options.postBody = Form.serialize(source);
+         }
+
+         //
+         Event.stop(event);
+         new Ajax.Request(url, options);
+      }
+
+   }
+
+}
+
+
+function footer()
+{
+   //
+   var WindowMoveObserver = Class.create();
+   WindowMoveObserver.prototype =
+   {
+      initialize: function(element)
+      {
+         this.element = $(element);
+      },
+      onStart: function()
+      {
+      },
+      onEnd: function()
+      {
+         var elt = Draggables.activeDraggable.element;
+         var fromRegionId = elt["regionId"];
+         var fromPos = elt["pos"];
+         snapshot();
+         var toRegionId = elt["regionId"];
+         var toPos = elt["pos"];
+         sendData("windowmove", elt.id, fromPos, fromRegionId, toPos, toRegionId);
+      }
+   };
+
+   // Find the draggable regions
+   var regions_on_page = document.getElementsByClassName("dyna-region");
+
+   // Create draggable regions
+   for(var i = 0;i < regions_on_page.length;i++) {
+      var region = regions_on_page[i];
+      Sortable.create(region, {dropOnEmpty:true,handle:"handle",tag:"div",containment:regions_on_page,constraint:false});
+   }
+
+   //
+   Draggables.addObserver(new WindowMoveObserver());
+   snapshot();
+
+   // Find the dyna portlets
+   var portlets_on_page = document.getElementsByClassName("dyna-window");
+
+   // Add listener for the dyna windows
+   for(var i = 0;i < portlets_on_page.length;i++) {
+      var portlet = portlets_on_page[i];
+      Event.observe(portlet, "click", bilto);
+   }
+}
+
+
+//            String u = "" +
+//               "function removeWindow(elementId)\n" +
+//               "{\n" +
+//               "   var effectElement = document.getElementById(elementId)\n" +
+//               "   new Effect.BlindUp(effectElement);\n" +
+//               "\n" +
+//               "   //removeElement(effectElement);\n" +
+//               "\n" +
+//               "   sendData('windowremove', elementId);\n" +
+//               "}\n";
+//            markup.append(u);

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/effects.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/effects.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/effects.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,17 +1,18 @@
-// script.aculo.us effects.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
+// script.aculo.us effects.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
 
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // Contributors:
 //  Justin Palmer (http://encytemedia.com/)
 //  Mark Pilgrim (http://diveintomark.org/)
 //  Martin Bialasinki
 // 
-// See scriptaculous.js for full license.  
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/ 
 
 // converts rgb() and #xxx to #xxxxxx format,  
 // returns self (or first argument) if not convertable  
 String.prototype.parseColor = function() {  
-  var color = '#';  
+  var color = '#';
   if(this.slice(0,4) == 'rgb(') {  
     var cols = this.slice(4,this.length-1).split(',');  
     var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
@@ -43,48 +44,21 @@
 
 Element.setContentZoom = function(element, percent) {
   element = $(element);  
-  Element.setStyle(element, {fontSize: (percent/100) + 'em'});   
+  element.setStyle({fontSize: (percent/100) + 'em'});   
   if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+  return element;
 }
 
-Element.getOpacity = function(element){  
-  var opacity;
-  if (opacity = Element.getStyle(element, 'opacity'))  
-    return parseFloat(opacity);  
-  if (opacity = (Element.getStyle(element, 'filter') || '').match(/alpha\(opacity=(.*)\)/))  
-    if(opacity[1]) return parseFloat(opacity[1]) / 100;  
-  return 1.0;  
+Element.getOpacity = function(element){
+  return $(element).getStyle('opacity');
 }
 
-Element.setOpacity = function(element, value){  
-  element= $(element);  
-  if (value == 1){
-    Element.setStyle(element, { opacity: 
-      (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 
-      0.999999 : 1.0 });
-    if(/MSIE/.test(navigator.userAgent) && !window.opera)  
-      Element.setStyle(element, {filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')});  
-  } else {  
-    if(value < 0.00001) value = 0;  
-    Element.setStyle(element, {opacity: value});
-    if(/MSIE/.test(navigator.userAgent) && !window.opera)  
-     Element.setStyle(element, 
-       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
-                 'alpha(opacity='+value*100+')' });  
-  }
-}  
- 
-Element.getInlineOpacity = function(element){  
+Element.setOpacity = function(element, value){
+  return $(element).setStyle({opacity:value});
+}
+
+Element.getInlineOpacity = function(element){
   return $(element).style.opacity || '';
-}  
-
-Element.childrenWithClassName = function(element, className, findFirst) {
-  var classNameRegExp = new RegExp("(^|\\s)" + className + "(\\s|$)");
-  var results = $A($(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) { 
-    return (c.className && c.className.match(classNameRegExp));
-  });
-  if(!results) results = [];
-  return results;
 }
 
 Element.forceRerendering = function(element) {
@@ -116,6 +90,7 @@
       
     var tagifyStyle = 'position:relative';
     if(/MSIE/.test(navigator.userAgent) && !window.opera) tagifyStyle += ';zoom:1';
+    
     element = $(element);
     $A(element.childNodes).each( function(child) {
       if(child.nodeType==3) {
@@ -168,33 +143,36 @@
 
 /* ------------- transitions ------------- */
 
-Effect.Transitions = {}
+Effect.Transitions = {
+  linear: Prototype.K,
+  sinoidal: function(pos) {
+    return (-Math.cos(pos*Math.PI)/2) + 0.5;
+  },
+  reverse: function(pos) {
+    return 1-pos;
+  },
+  flicker: function(pos) {
+    return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+  },
+  wobble: function(pos) {
+    return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+  },
+  pulse: function(pos, pulses) { 
+    pulses = pulses || 5; 
+    return (
+      Math.round((pos % (1/pulses)) * pulses) == 0 ? 
+            ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) : 
+        1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2))
+      );
+  },
+  none: function(pos) {
+    return 0;
+  },
+  full: function(pos) {
+    return 1;
+  }
+};
 
-Effect.Transitions.linear = Prototype.K;
-
-Effect.Transitions.sinoidal = function(pos) {
-  return (-Math.cos(pos*Math.PI)/2) + 0.5;
-}
-Effect.Transitions.reverse  = function(pos) {
-  return 1-pos;
-}
-Effect.Transitions.flicker = function(pos) {
-  return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
-}
-Effect.Transitions.wobble = function(pos) {
-  return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
-}
-Effect.Transitions.pulse = function(pos) {
-  return (Math.floor(pos*10) % 2 == 0 ? 
-    (pos*10-Math.floor(pos*10)) : 1-(pos*10-Math.floor(pos*10)));
-}
-Effect.Transitions.none = function(pos) {
-  return 0;
-}
-Effect.Transitions.full = function(pos) {
-  return 1;
-}
-
 /* ------------- core effects ------------- */
 
 Effect.ScopedQueue = Class.create();
@@ -220,6 +198,9 @@
             e.finishOn += effect.finishOn;
           });
         break;
+      case 'with-last':
+        timestamp = this.effects.pluck('startOn').max() || timestamp;
+        break;
       case 'end':
         // start effect after last queued effect has finished
         timestamp = this.effects.pluck('finishOn').max() || timestamp;
@@ -233,7 +214,7 @@
       this.effects.push(effect);
     
     if(!this.interval) 
-      this.interval = setInterval(this.loop.bind(this), 40);
+      this.interval = setInterval(this.loop.bind(this), 15);
   },
   remove: function(effect) {
     this.effects = this.effects.reject(function(e) { return e==effect });
@@ -244,7 +225,8 @@
   },
   loop: function() {
     var timePos = new Date().getTime();
-    this.effects.invoke('loop', timePos);
+    for(var i=0, len=this.effects.length;i<len;i++) 
+      if(this.effects[i]) this.effects[i].loop(timePos);
   }
 });
 
@@ -264,7 +246,7 @@
 Effect.DefaultOptions = {
   transition: Effect.Transitions.sinoidal,
   duration:   1.0,   // seconds
-  fps:        25.0,  // max. 25fps due to Effect.Queue implementation
+  fps:        60.0,  // max. 60fps due to Effect.Queue implementation
   sync:       false, // true for combining
   from:       0.0,
   to:         1.0,
@@ -332,7 +314,10 @@
     if(this.options[eventName]) this.options[eventName](this);
   },
   inspect: function() {
-    return '#<Effect:' + $H(this).inspect() + ',options:' + $H(this.options).inspect() + '>';
+    var data = $H();
+    for(property in this)
+      if(typeof this[property] != 'function') data[property] = this[property];
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
   }
 }
 
@@ -356,6 +341,17 @@
   }
 });
 
+Effect.Event = Class.create();
+Object.extend(Object.extend(Effect.Event.prototype, Effect.Base.prototype), {
+  initialize: function() {
+    var options = Object.extend({
+      duration: 0
+    }, arguments[0] || {});
+    this.start(options);
+  },
+  update: Prototype.emptyFunction
+});
+
 Effect.Opacity = Class.create();
 Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
   initialize: function(element) {
@@ -469,7 +465,7 @@
     this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
   },
   finish: function(position) {
-    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+    if(this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
   },
   setDimensions: function(height, width) {
     var d = {};
@@ -502,9 +498,11 @@
     // Prevent executing on elements not in the layout flow
     if(this.element.getStyle('display')=='none') { this.cancel(); return; }
     // Disable background image during the effect
-    this.oldStyle = {
-      backgroundImage: this.element.getStyle('background-image') };
-    this.element.setStyle({backgroundImage: 'none'});
+    this.oldStyle = {};
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
     if(!this.options.endcolor)
       this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
     if(!this.options.restorecolor)
@@ -559,8 +557,7 @@
   to:   0.0,
   afterFinishInternal: function(effect) { 
     if(effect.options.to!=0) return;
-    effect.element.hide();
-    effect.element.setStyle({opacity: oldOpacity}); 
+    effect.element.hide().setStyle({opacity: oldOpacity}); 
   }}, arguments[1] || {});
   return new Effect.Opacity(element,options);
 }
@@ -575,8 +572,7 @@
     effect.element.forceRerendering();
   },
   beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from);
-    effect.element.show(); 
+    effect.element.setOpacity(effect.options.from).show(); 
   }}, arguments[1] || {});
   return new Effect.Opacity(element,options);
 }
@@ -600,8 +596,7 @@
         Position.absolutize(effect.effects[0].element)
       },
       afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide();
-         effect.effects[0].element.setStyle(oldStyle); }
+         effect.effects[0].element.hide().setStyle(oldStyle); }
      }, arguments[1] || {})
    );
 }
@@ -614,8 +609,7 @@
       scaleX: false, 
       restoreAfterFinish: true,
       afterFinishInternal: function(effect) {
-        effect.element.hide();
-        effect.element.undoClipping();
+        effect.element.hide().undoClipping();
       } 
     }, arguments[1] || {})
   );
@@ -631,9 +625,7 @@
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
     restoreAfterFinish: true,
     afterSetup: function(effect) {
-      effect.element.makeClipping();
-      effect.element.setStyle({height: '0px'});
-      effect.element.show(); 
+      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
     },  
     afterFinishInternal: function(effect) {
       effect.element.undoClipping();
@@ -653,14 +645,10 @@
         duration: 0.3, scaleFromCenter: true,
         scaleX: false, scaleContent: false, restoreAfterFinish: true,
         beforeSetup: function(effect) { 
-          effect.element.makePositioned();
-          effect.element.makeClipping();
+          effect.element.makePositioned().makeClipping();
         },
         afterFinishInternal: function(effect) {
-          effect.element.hide();
-          effect.element.undoClipping();
-          effect.element.undoPositioned();
-          effect.element.setStyle({opacity: oldOpacity});
+          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
         }
       })
     }
@@ -682,9 +670,7 @@
           effect.effects[0].element.makePositioned(); 
         },
         afterFinishInternal: function(effect) {
-          effect.effects[0].element.hide();
-          effect.effects[0].element.undoPositioned();
-          effect.effects[0].element.setStyle(oldStyle);
+          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
         } 
       }, arguments[1] || {}));
 }
@@ -706,16 +692,14 @@
       { x:  40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
     new Effect.Move(effect.element,
       { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
-        effect.element.undoPositioned();
-        effect.element.setStyle(oldStyle);
+        effect.element.undoPositioned().setStyle(oldStyle);
   }}) }}) }}) }}) }}) }});
 }
 
 Effect.SlideDown = function(element) {
-  element = $(element);
-  element.cleanWhitespace();
+  element = $(element).cleanWhitespace();
   // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  var oldInnerBottom = element.down().getStyle('bottom');
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, 100, Object.extend({ 
     scaleContent: false, 
@@ -725,34 +709,24 @@
     restoreAfterFinish: true,
     afterSetup: function(effect) {
       effect.element.makePositioned();
-      effect.element.firstChild.makePositioned();
+      effect.element.down().makePositioned();
       if(window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping();
-      effect.element.setStyle({height: '0px'});
-      effect.element.show(); },
+      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
+    },
     afterUpdateInternal: function(effect) {
-      effect.element.firstChild.setStyle({bottom:
+      effect.element.down().setStyle({bottom:
         (effect.dims[0] - effect.element.clientHeight) + 'px' }); 
     },
     afterFinishInternal: function(effect) {
-      effect.element.undoClipping(); 
-      // IE will crash if child is undoPositioned first
-      if(/MSIE/.test(navigator.userAgent) && !window.opera){
-        effect.element.undoPositioned();
-        effect.element.firstChild.undoPositioned();
-      }else{
-        effect.element.firstChild.undoPositioned();
-        effect.element.undoPositioned();
-      }
-      effect.element.firstChild.setStyle({bottom: oldInnerBottom}); }
+      effect.element.undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
     }, arguments[1] || {})
   );
 }
 
 Effect.SlideUp = function(element) {
-  element = $(element);
-  element.cleanWhitespace();
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  element = $(element).cleanWhitespace();
+  var oldInnerBottom = element.down().getStyle('bottom');
   return new Effect.Scale(element, window.opera ? 0 : 1,
    Object.extend({ scaleContent: false, 
     scaleX: false, 
@@ -761,32 +735,32 @@
     restoreAfterFinish: true,
     beforeStartInternal: function(effect) {
       effect.element.makePositioned();
-      effect.element.firstChild.makePositioned();
+      effect.element.down().makePositioned();
       if(window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping();
-      effect.element.show(); },  
+      effect.element.makeClipping().show();
+    },  
     afterUpdateInternal: function(effect) {
-      effect.element.firstChild.setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' }); },
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
     afterFinishInternal: function(effect) {
-      effect.element.hide();
-      effect.element.undoClipping();
-      effect.element.firstChild.undoPositioned();
-      effect.element.undoPositioned();
-      effect.element.setStyle({bottom: oldInnerBottom}); }
+      effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom});
+      effect.element.down().undoPositioned();
+    }
    }, arguments[1] || {})
   );
 }
 
 // Bug in opera makes the TD containing this element expand for a instance after finish 
 Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, 
-    { restoreAfterFinish: true,
-      beforeSetup: function(effect) {
-        effect.element.makeClipping(effect.element); },  
-      afterFinishInternal: function(effect) {
-        effect.element.hide(effect.element); 
-        effect.element.undoClipping(effect.element); }
+  return new Effect.Scale(element, window.opera ? 1 : 0, { 
+    restoreAfterFinish: true,
+    beforeSetup: function(effect) {
+      effect.element.makeClipping(); 
+    },  
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping(); 
+    }
   });
 }
 
@@ -842,9 +816,7 @@
     y: initialMoveY,
     duration: 0.01, 
     beforeSetup: function(effect) {
-      effect.element.hide();
-      effect.element.makeClipping();
-      effect.element.makePositioned();
+      effect.element.hide().makeClipping().makePositioned();
     },
     afterFinishInternal: function(effect) {
       new Effect.Parallel(
@@ -855,13 +827,10 @@
             sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
         ], Object.extend({
              beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'});
-               effect.effects[0].element.show(); 
+               effect.effects[0].element.setStyle({height: '0px'}).show(); 
              },
              afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping();
-               effect.effects[0].element.undoPositioned();
-               effect.effects[0].element.setStyle(oldStyle); 
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); 
              }
            }, options)
       )
@@ -915,13 +884,10 @@
       new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
     ], Object.extend({            
          beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned();
-           effect.effects[0].element.makeClipping(); },
+           effect.effects[0].element.makePositioned().makeClipping(); 
+         },
          afterFinishInternal: function(effect) {
-           effect.effects[0].element.hide();
-           effect.effects[0].element.undoClipping();
-           effect.effects[0].element.undoPositioned();
-           effect.effects[0].element.setStyle(oldStyle); }
+           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
        }, options)
   );
 }
@@ -931,10 +897,10 @@
   var options    = arguments[1] || {};
   var oldOpacity = element.getInlineOpacity();
   var transition = options.transition || Effect.Transitions.sinoidal;
-  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos)) };
+  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
   reverser.bind(transition);
   return new Effect.Opacity(element, 
-    Object.extend(Object.extend({  duration: 3.0, from: 0,
+    Object.extend(Object.extend({  duration: 2.0, from: 0,
       afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
     }, options), {transition: reverser}));
 }
@@ -946,7 +912,7 @@
     left: element.style.left,
     width: element.style.width,
     height: element.style.height };
-  Element.makeClipping(element);
+  element.makeClipping();
   return new Effect.Scale(element, 5, Object.extend({   
     scaleContent: false,
     scaleX: false,
@@ -955,15 +921,162 @@
       scaleContent: false, 
       scaleY: false,
       afterFinishInternal: function(effect) {
-        effect.element.hide();
-        effect.element.undoClipping(); 
-        effect.element.setStyle(oldStyle);
+        effect.element.hide().undoClipping().setStyle(oldStyle);
       } });
   }}, arguments[1] || {}));
 };
 
+Effect.Morph = Class.create();
+Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), {
+  initialize: function(element) {
+    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      style: {}
+    }, arguments[1] || {});
+    if (typeof options.style == 'string') {
+      if(options.style.indexOf(':') == -1) {
+        var cssText = '', selector = '.' + options.style;
+        $A(document.styleSheets).reverse().each(function(styleSheet) {
+          if (styleSheet.cssRules) cssRules = styleSheet.cssRules;
+          else if (styleSheet.rules) cssRules = styleSheet.rules;
+          $A(cssRules).reverse().each(function(rule) {
+            if (selector == rule.selectorText) {
+              cssText = rule.style.cssText;
+              throw $break;
+            }
+          });
+          if (cssText) throw $break;
+        });
+        this.style = cssText.parseStyle();
+        options.afterFinishInternal = function(effect){
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            if(transform.style != 'opacity')
+              effect.element.style[transform.style.camelize()] = '';
+          });
+        }
+      } else this.style = options.style.parseStyle();
+    } else this.style = $H(options.style)
+    this.start(options);
+  },
+  setup: function(){
+    function parseColor(color){
+      if(!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      color = color.parseColor();
+      return $R(0,2).map(function(i){
+        return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
+      });
+    }
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0].underscore().dasherize(), value = pair[1], unit = null;
+
+      if(value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if(property == 'opacity') {
+        value = parseFloat(value);
+        if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if(Element.CSS_LENGTH.test(value)) 
+        var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/),
+          value = parseFloat(components[1]), unit = (components.length == 3) ? components[2] : null;
+
+      var originalValue = this.element.getStyle(property);
+      return $H({ 
+        style: property, 
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      });
+    }.bind(this)).reject(function(transform){
+      return (
+        (transform.originalValue == transform.targetValue) ||
+        (
+          transform.unit != 'color' &&
+          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
+        )
+      )
+    });
+  },
+  update: function(position) {
+    var style = $H(), value = null;
+    this.transforms.each(function(transform){
+      value = transform.unit=='color' ?
+        $R(0,2).inject('#',function(m,v,i){
+          return m+(Math.round(transform.originalValue[i]+
+            (transform.targetValue[i] - transform.originalValue[i])*position)).toColorPart() }) : 
+        transform.originalValue + Math.round(
+          ((transform.targetValue - transform.originalValue) * position) * 1000)/1000 + transform.unit;
+      style[transform.style] = value;
+    });
+    this.element.setStyle(style);
+  }
+});
+
+Effect.Transform = Class.create();
+Object.extend(Effect.Transform.prototype, {
+  initialize: function(tracks){
+    this.tracks  = [];
+    this.options = arguments[1] || {};
+    this.addTracks(tracks);
+  },
+  addTracks: function(tracks){
+    tracks.each(function(track){
+      var data = $H(track).values().first();
+      this.tracks.push($H({
+        ids:     $H(track).keys().first(),
+        effect:  Effect.Morph,
+        options: { style: data }
+      }));
+    }.bind(this));
+    return this;
+  },
+  play: function(){
+    return new Effect.Parallel(
+      this.tracks.map(function(track){
+        var elements = [$(track.ids) || $$(track.ids)].flatten();
+        return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) });
+      }).flatten(),
+      this.options
+    );
+  }
+});
+
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
+  
+Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+
+String.prototype.parseStyle = function(){
+  var element = Element.extend(document.createElement('div'));
+  element.innerHTML = '<div style="' + this + '"></div>';
+  var style = element.down().style, styleRules = $H();
+  
+  Element.CSS_PROPERTIES.each(function(property){
+    if(style[property]) styleRules[property] = style[property]; 
+  });
+  if(/MSIE/.test(navigator.userAgent) && !window.opera && this.indexOf('opacity') > -1) {
+    styleRules.opacity = this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1];
+  }
+  return styleRules;
+};
+
+Element.morph = function(element, style) {
+  new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {}));
+  return element;
+};
+
 ['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom',
- 'collectTextNodes','collectTextNodesIgnoreClass','childrenWithClassName'].each( 
+ 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each( 
   function(f) { Element.Methods[f] = Element[f]; }
 );
 

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/event.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/event.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/event.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,247 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*
-* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
-*/
-
-var o_el_regionA = new Array();
-var o_el_regionB = new Array();
-
-/**
- AJAX Send function. Assembles post data, and handles process
- **/
-function sendData(action, windowId, fromPos, fromRegion, toPos, toRegion)
-{
-   var options = {
-      method: 'post',
-      postBody: 'action=' + action + '&windowId=' + windowId + '&fromPos=' + fromPos + '&fromRegion=' + fromRegion + '&toPos=' + toPos + '&toRegion=' + toRegion,
-      onSuccess: function(t)
-      {
-//         a = document.getElementById("ReqProgressIndicator");
-//         document.body.removeChild(a);
-      },
-      onSuccess: function(t)
-      {
-//         a = document.getElementById("ReqProgressIndicator");
-//         document.body.removeChild(a);
-      },
-      on404: function(t)
-      {
-//         a = document.getElementById("ReqProgressIndicator");
-//         document.body.removeChild(a);
-         alert('Error 404: location "' + t.statusText + '" was not found.');
-      },
-      onFailure: function(t)
-      {
-//         a = document.getElementById("ReqProgressIndicator");
-//         document.body.removeChild(a);
-         alert('Error ' + t.status + ' -- ' + t.statusText);
-      },
-      onLoading: function(t)
-      {
-      }
-   }
-
-   new Ajax.Request(remote_server_url, options);
-
-/*
-   a = document.createElement("div");
-   a.id = "ReqProgressIndicator";
-   a.style.position = "absolute";
-   a.style.left = "50%";
-   a.style.bottom = "50%";
-   a.style.width = "200px";
-   a.style.height = "20px"
-   a.style.verticalAlign = "bottom";
-   a.style.display = '';
-   a.innerHTML = "<img style='VERTICAL-ALIGN:bottom' src='images/roller.gif'>";
-   document.body.appendChild(a);
-*/
-}
-
-/**
- Class that tracks window movement and updates DOM on move end.
- **/
-try
-{
-   var WindowMoveObserver = Class.create();
-   WindowMoveObserver.prototype =
-   {
-      initialize: function(element)
-      {
-         this.element = $(element);
-      },
-      onStart: function()
-      {
-      },
-      onEnd: function()
-      {
-         var children = this.element.childNodes;
-         for(var i = 0; i < children.length; i = i + 1)
-         {
-            if(Draggables.activeDraggable.element == children[i])
-            {
-               fromPos = findWindowPos(children[i]);
-               fromRegion = findWindowRegion(children[i]);
-
-               //alert("Moved: " + thischild.id + " from: " + fromRegion  + " pos: " + fromPos);
-               //alert("Moved: " + thischild.id + " to: " + this.element.id + " pos: " + i);
-
-               // window moved, update DOM
-               updateDOM();
-
-               // send Data
-               sendData('windowmove', children[i].id, fromPos, fromRegion, i, this.element.id);
-               break;
-               // or FF continues looping.
-            }
-         }
-      }
-   }
-}
-catch(e)
-{
-   alert(e);
-}
-
-/**
- Creates sortables (drag/drop windows), attach observers and initialize the DOM
- **/
-try
-{
-   Sortable.create("regionA", {dropOnEmpty:true,handle:'handle',tag:'div',containment:["regionA","regionB"],constraint:false, ghosting: false,
-      onChange: function(el)
-      {
-      },
-      onUpdate: function (el)
-      {
-      }
-   });
-
-   Sortable.create("regionB", {dropOnEmpty:true,handle:'handle',tag:'div',containment:["regionA","regionB"],constraint:false, ghosting: false,
-      onChange: function(el)
-      {
-      },
-      onUpdate: function (el)
-      {
-      }
-   });
-
-   // attach observers to regions
-   Draggables.addObserver(new WindowMoveObserver($('regionA')));
-   Draggables.addObserver(new WindowMoveObserver($('regionB')));
-
-   // initialize DOM
-   updateDOM();
-}
-catch(e)
-{
-   alert(e);
-}
-
-/**
- Update th DOM order in our global array. Later used to compare move from/to
- **/
-function updateDOM()
-{
-   try
-   {
-      // reset to 0
-      o_el_regionA = new Array();
-      o_el_regionB = new Array();
-
-      var regionA = this.document.getElementById("regionA");
-      for(var i = 0; i < regionA.childNodes.length; i = i + 1)
-      {
-         o_el_regionA[i] = regionA.childNodes[i];
-      }
-      var regionB = this.document.getElementById("regionB");
-      for(var i = 0; i < regionB.childNodes.length; i = i + 1)
-      {
-         o_el_regionB[i] = regionB.childNodes[i];
-      }
-      //alert("New A: " + o_el_regionA.length + " New B: " + o_el_regionB.length);
-   }
-   catch(e)
-   {
-      alert("Error updateDOM: " + e);
-   }
-}
-
-/**
- Returns theoriginal Window position for a given window element
- **/
-function findWindowPos(element)
-{
-   for(var i = 0; i < o_el_regionA.length; i = i + 1)
-   {
-      currelement = o_el_regionA[i];
-      if(element == currelement)
-      {
-         return i;
-      }
-   }
-   for(var i = 0; i < o_el_regionB.length; i = i + 1)
-   {
-      currelement = o_el_regionB[i];
-      if(element = currelement)
-      {
-         return i;
-      }
-   }
-}
-
-/**
- Returns the original region where a window resided.
- **/
-function findWindowRegion(element)
-{
-   for(var i = 0; i < o_el_regionA.length; i = i + 1)
-   {
-      currelement = o_el_regionA[i];
-      if(element == currelement)
-      {
-         return "regionA";
-      }
-   }
-   for(var i = 0; i < o_el_regionB.length; i = i + 1)
-   {
-      currelement = o_el_regionB[i];
-      if(element = currelement)
-      {
-         return "regionB";
-      }
-   }
-}
-
-/**
- Removes window from page and calls server-side
- **/
-function removeWindow(elementId)
-{
-   var effectElement = document.getElementById(elementId)
-   new Effect.BlindUp(effectElement);
-
-   //removeElement(effectElement);
-
-   sendData('windowremove', elementId);
-}
-

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/prototype.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/prototype.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/prototype.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,5 +1,5 @@
-/*  Prototype JavaScript framework, version 1.5.0_rc1
- *  (c) 2005 Sam Stephenson <sam at conio.net>
+/*  Prototype JavaScript framework, version 1.5.0
+ *  (c) 2005-2007 Sam Stephenson
  *
  *  Prototype is freely distributable under the terms of an MIT-style license.
  *  For details, see the Prototype web site: http://prototype.conio.net/
@@ -7,11 +7,14 @@
 /*--------------------------------------------------------------------------*/
 
 var Prototype = {
-  Version: '1.5.0_rc1',
+  Version: '1.5.0',
+  BrowserFeatures: {
+    XPath: !!document.evaluate
+  },
+
   ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
-
   emptyFunction: function() {},
-  K: function(x) {return x}
+  K: function(x) { return x }
 }
 
 var Class = {
@@ -34,8 +37,8 @@
 Object.extend(Object, {
   inspect: function(object) {
     try {
-      if (object == undefined) return 'undefined';
-      if (object == null) return 'null';
+      if (object === undefined) return 'undefined';
+      if (object === null) return 'null';
       return object.inspect ? object.inspect() : object.toString();
     } catch (e) {
       if (e instanceof RangeError) return '...';
@@ -97,7 +100,7 @@
   these: function() {
     var returnValue;
 
-    for (var i = 0; i < arguments.length; i++) {
+    for (var i = 0, length = arguments.length; i < length; i++) {
       var lambda = arguments[i];
       try {
         returnValue = lambda();
@@ -142,6 +145,10 @@
     }
   }
 }
+String.interpret = function(value){
+  return value == null ? '' : String(value);
+}
+
 Object.extend(String.prototype, {
   gsub: function(pattern, replacement) {
     var result = '', source = this, match;
@@ -150,7 +157,7 @@
     while (source.length > 0) {
       if (match = source.match(pattern)) {
         result += source.slice(0, match.index);
-        result += (replacement(match) || '').toString();
+        result += String.interpret(replacement(match));
         source  = source.slice(match.index + match[0].length);
       } else {
         result += source, source = '';
@@ -215,16 +222,28 @@
   unescapeHTML: function() {
     var div = document.createElement('div');
     div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
   },
 
-  toQueryParams: function() {
-    var pairs = this.match(/^\??(.*)$/)[1].split('&');
-    return pairs.inject({}, function(params, pairString) {
-      var pair  = pairString.split('=');
-      var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
-      params[decodeURIComponent(pair[0])] = value;
-      return params;
+  toQueryParams: function(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return {};
+
+    return match[1].split(separator || '&').inject({}, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var name = decodeURIComponent(pair[0]);
+        var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
+
+        if (hash[name] !== undefined) {
+          if (hash[name].constructor != Array)
+            hash[name] = [hash[name]];
+          if (value) hash[name].push(value);
+        }
+        else hash[name] = value;
+      }
+      return hash;
     });
   },
 
@@ -232,22 +251,37 @@
     return this.split('');
   },
 
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
+
   camelize: function() {
-    var oStringList = this.split('-');
-    if (oStringList.length == 1) return oStringList[0];
+    var parts = this.split('-'), len = parts.length;
+    if (len == 1) return parts[0];
 
-    var camelizedString = this.indexOf('-') == 0
-      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
-      : oStringList[0];
+    var camelized = this.charAt(0) == '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
 
-    for (var i = 1, len = oStringList.length; i < len; i++) {
-      var s = oStringList[i];
-      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
-    }
+    for (var i = 1; i < len; i++)
+      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
 
-    return camelizedString;
+    return camelized;
   },
 
+  capitalize: function(){
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+
   inspect: function(useDoubleQuotes) {
     var escapedString = this.replace(/\\/g, '\\\\');
     if (useDoubleQuotes)
@@ -277,7 +311,7 @@
     return this.template.gsub(this.pattern, function(match) {
       var before = match[1];
       if (before == '\\') return match[2];
-      return before + (object[match[3]] || '').toString();
+      return before + String.interpret(object[match[3]]);
     });
   }
 }
@@ -299,8 +333,16 @@
     } catch (e) {
       if (e != $break) throw e;
     }
+    return this;
   },
 
+  eachSlice: function(number, iterator) {
+    var index = -number, slices = [], array = this.toArray();
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.map(iterator);
+  },
+
   all: function(iterator) {
     var result = true;
     this.each(function(value, index) {
@@ -322,12 +364,12 @@
   collect: function(iterator) {
     var results = [];
     this.each(function(value, index) {
-      results.push(iterator(value, index));
+      results.push((iterator || Prototype.K)(value, index));
     });
     return results;
   },
 
-  detect: function (iterator) {
+  detect: function(iterator) {
     var result;
     this.each(function(value, index) {
       if (iterator(value, index)) {
@@ -368,6 +410,14 @@
     return found;
   },
 
+  inGroupsOf: function(number, fillWith) {
+    fillWith = fillWith === undefined ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
+
   inject: function(memo, iterator) {
     this.each(function(value, index) {
       memo = iterator(memo, value, index);
@@ -377,7 +427,7 @@
 
   invoke: function(method) {
     var args = $A(arguments).slice(1);
-    return this.collect(function(value) {
+    return this.map(function(value) {
       return value[method].apply(value, args);
     });
   },
@@ -429,7 +479,7 @@
   },
 
   sortBy: function(iterator) {
-    return this.collect(function(value, index) {
+    return this.map(function(value, index) {
       return {value: value, criteria: iterator(value, index)};
     }).sort(function(left, right) {
       var a = left.criteria, b = right.criteria;
@@ -438,7 +488,7 @@
   },
 
   toArray: function() {
-    return this.collect(Prototype.K);
+    return this.map();
   },
 
   zip: function() {
@@ -452,6 +502,10 @@
     });
   },
 
+  size: function() {
+    return this.toArray().length;
+  },
+
   inspect: function() {
     return '#<Enumerable:' + this.toArray().inspect() + '>';
   }
@@ -470,7 +524,7 @@
     return iterable.toArray();
   } else {
     var results = [];
-    for (var i = 0; i < iterable.length; i++)
+    for (var i = 0, length = iterable.length; i < length; i++)
       results.push(iterable[i]);
     return results;
   }
@@ -483,7 +537,7 @@
 
 Object.extend(Array.prototype, {
   _each: function(iterator) {
-    for (var i = 0; i < this.length; i++)
+    for (var i = 0, length = this.length; i < length; i++)
       iterator(this[i]);
   },
 
@@ -502,7 +556,7 @@
 
   compact: function() {
     return this.select(function(value) {
-      return value != undefined || value != null;
+      return value != null;
     });
   },
 
@@ -521,7 +575,7 @@
   },
 
   indexOf: function(object) {
-    for (var i = 0; i < this.length; i++)
+    for (var i = 0, length = this.length; i < length; i++)
       if (this[i] == object) return i;
     return -1;
   },
@@ -540,15 +594,78 @@
     });
   },
 
+  clone: function() {
+    return [].concat(this);
+  },
+
+  size: function() {
+    return this.length;
+  },
+
   inspect: function() {
     return '[' + this.map(Object.inspect).join(', ') + ']';
   }
 });
-var Hash = {
+
+Array.prototype.toArray = Array.prototype.clone;
+
+function $w(string){
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+
+if(window.opera){
+  Array.prototype.concat = function(){
+    var array = [];
+    for(var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      if(arguments[i].constructor == Array) {
+        for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  }
+}
+var Hash = function(obj) {
+  Object.extend(this, obj || {});
+};
+
+Object.extend(Hash, {
+  toQueryString: function(obj) {
+    var parts = [];
+
+	  this.prototype._each.call(obj, function(pair) {
+      if (!pair.key) return;
+
+      if (pair.value && pair.value.constructor == Array) {
+        var values = pair.value.compact();
+        if (values.length < 2) pair.value = values.reduce();
+        else {
+        	key = encodeURIComponent(pair.key);
+          values.each(function(value) {
+            value = value != undefined ? encodeURIComponent(value) : '';
+            parts.push(key + '=' + encodeURIComponent(value));
+          });
+          return;
+        }
+      }
+      if (pair.value == undefined) pair[1] = '';
+      parts.push(pair.map(encodeURIComponent).join('='));
+	  });
+
+    return parts.join('&');
+  }
+});
+
+Object.extend(Hash.prototype, Enumerable);
+Object.extend(Hash.prototype, {
   _each: function(iterator) {
     for (var key in this) {
       var value = this[key];
-      if (typeof value == 'function') continue;
+      if (value && value == Hash.prototype[key]) continue;
 
       var pair = [key, value];
       pair.key = key;
@@ -566,16 +683,30 @@
   },
 
   merge: function(hash) {
-    return $H(hash).inject($H(this), function(mergedHash, pair) {
+    return $H(hash).inject(this, function(mergedHash, pair) {
       mergedHash[pair.key] = pair.value;
       return mergedHash;
     });
   },
 
+  remove: function() {
+    var result;
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      var value = this[arguments[i]];
+      if (value !== undefined){
+        if (result === undefined) result = value;
+        else {
+          if (result.constructor != Array) result = [result];
+          result.push(value)
+        }
+      }
+      delete this[arguments[i]];
+    }
+    return result;
+  },
+
   toQueryString: function() {
-    return this.map(function(pair) {
-      return pair.map(encodeURIComponent).join('=');
-    }).join('&');
+    return Hash.toQueryString(this);
   },
 
   inspect: function() {
@@ -583,14 +714,12 @@
       return pair.map(Object.inspect).join(': ');
     }).join(', ') + '}>';
   }
-}
+});
 
 function $H(object) {
-  var hash = Object.extend({}, object || {});
-  Object.extend(hash, Enumerable);
-  Object.extend(hash, Hash);
-  return hash;
-}
+  if (object && object.constructor == Hash) return object;
+  return new Hash(object);
+};
 ObjectRange = Class.create();
 Object.extend(ObjectRange.prototype, Enumerable);
 Object.extend(ObjectRange.prototype, {
@@ -640,18 +769,18 @@
     this.responders._each(iterator);
   },
 
-  register: function(responderToAdd) {
-    if (!this.include(responderToAdd))
-      this.responders.push(responderToAdd);
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
   },
 
-  unregister: function(responderToRemove) {
-    this.responders = this.responders.without(responderToRemove);
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
   },
 
   dispatch: function(callback, request, transport, json) {
     this.each(function(responder) {
-      if (responder[callback] && typeof responder[callback] == 'function') {
+      if (typeof responder[callback] == 'function') {
         try {
           responder[callback].apply(responder, [request, transport, json]);
         } catch (e) {}
@@ -666,7 +795,6 @@
   onCreate: function() {
     Ajax.activeRequestCount++;
   },
-
   onComplete: function() {
     Ajax.activeRequestCount--;
   }
@@ -679,19 +807,14 @@
       method:       'post',
       asynchronous: true,
       contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
       parameters:   ''
     }
     Object.extend(this.options, options || {});
-  },
 
-  responseIsSuccess: function() {
-    return this.transport.status == undefined
-        || this.transport.status == 0
-        || (this.transport.status >= 200 && this.transport.status < 300);
-  },
-
-  responseIsFailure: function() {
-    return !this.responseIsSuccess();
+    this.options.method = this.options.method.toLowerCase();
+    if (typeof this.options.parameters == 'string')
+      this.options.parameters = this.options.parameters.toQueryParams();
   }
 }
 
@@ -700,6 +823,8 @@
   ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
 
 Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  _complete: false,
+
   initialize: function(url, options) {
     this.transport = Ajax.getTransport();
     this.setOptions(options);
@@ -707,23 +832,27 @@
   },
 
   request: function(url) {
-    var parameters = this.options.parameters || '';
-    if (parameters.length > 0) parameters += '&_=';
+    this.url = url;
+    this.method = this.options.method;
+    var params = this.options.parameters;
 
-    /* Simulate other verbs over post */
-    if (this.options.method != 'get' && this.options.method != 'post') {
-      parameters += (parameters.length > 0 ? '&' : '') + '_method=' + this.options.method;
-      this.options.method = 'post';
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] = this.method;
+      this.method = 'post';
     }
 
+    params = Hash.toQueryString(params);
+    if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_='
+
+    // when GET, append parameters to URL
+    if (this.method == 'get' && params)
+      this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params;
+
     try {
-      this.url = url;
-      if (this.options.method == 'get' && parameters.length > 0)
-        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
-
       Ajax.Responders.dispatch('onCreate', this, this.transport);
 
-      this.transport.open(this.options.method, this.url,
+      this.transport.open(this.method.toUpperCase(), this.url,
         this.options.asynchronous);
 
       if (this.options.asynchronous)
@@ -732,97 +861,119 @@
       this.transport.onreadystatechange = this.onStateChange.bind(this);
       this.setRequestHeaders();
 
-      var body = this.options.postBody ? this.options.postBody : parameters;
-      this.transport.send(this.options.method == 'post' ? body : null);
+      var body = this.method == 'post' ? (this.options.postBody || params) : null;
 
+      this.transport.send(body);
+
       /* Force Firefox to handle ready state 4 for synchronous requests */
       if (!this.options.asynchronous && this.transport.overrideMimeType)
         this.onStateChange();
 
-    } catch (e) {
+    }
+    catch (e) {
       this.dispatchException(e);
     }
   },
 
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+
   setRequestHeaders: function() {
-    var requestHeaders =
-      ['X-Requested-With', 'XMLHttpRequest',
-       'X-Prototype-Version', Prototype.Version,
-       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
 
-    if (this.options.method == 'post') {
-      requestHeaders.push('Content-type', this.options.contentType);
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
 
-      /* Force "Connection: close" for Mozilla browsers to work around
-       * a bug where XMLHttpReqeuest sends an incorrect Content-length
-       * header. See Mozilla Bugzilla #246651.
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
        */
-      if (this.transport.overrideMimeType)
-        requestHeaders.push('Connection', 'close');
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
     }
 
-    if (this.options.requestHeaders)
-      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+    // user-defined headers
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
 
-    for (var i = 0; i < requestHeaders.length; i += 2)
-      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
-  },
+      if (typeof extras.push == 'function')
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
 
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState != 1)
-      this.respondToReadyState(this.transport.readyState);
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
   },
 
-  header: function(name) {
-    try {
-      return this.transport.getResponseHeader(name);
-    } catch (e) {}
+  success: function() {
+    return !this.transport.status
+        || (this.transport.status >= 200 && this.transport.status < 300);
   },
 
-  evalJSON: function() {
-    try {
-      return eval('(' + this.header('X-JSON') + ')');
-    } catch (e) {}
-  },
-
-  evalResponse: function() {
-    try {
-      return eval(this.transport.responseText);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
   respondToReadyState: function(readyState) {
-    var event = Ajax.Request.Events[readyState];
+    var state = Ajax.Request.Events[readyState];
     var transport = this.transport, json = this.evalJSON();
 
-    if (event == 'Complete') {
+    if (state == 'Complete') {
       try {
+        this._complete = true;
         (this.options['on' + this.transport.status]
-         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
          || Prototype.emptyFunction)(transport, json);
       } catch (e) {
         this.dispatchException(e);
       }
 
-      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
-        this.evalResponse();
+      if ((this.getHeader('Content-type') || 'text/javascript').strip().
+        match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
+          this.evalResponse();
     }
 
     try {
-      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + event, this, transport, json);
+      (this.options['on' + state] || Prototype.emptyFunction)(transport, json);
+      Ajax.Responders.dispatch('on' + state, this, transport, json);
     } catch (e) {
       this.dispatchException(e);
     }
 
-    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
-    if (event == 'Complete')
+    if (state == 'Complete') {
+      // avoid memory leak in MSIE: clean up
       this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
   },
 
+  getHeader: function(name) {
+    try {
+      return this.transport.getResponseHeader(name);
+    } catch (e) { return null }
+  },
+
+  evalJSON: function() {
+    try {
+      var json = this.getHeader('X-JSON');
+      return json ? eval('(' + json + ')') : null;
+    } catch (e) { return null }
+  },
+
+  evalResponse: function() {
+    try {
+      return eval(this.transport.responseText);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
   dispatchException: function(exception) {
     (this.options.onException || Prototype.emptyFunction)(this, exception);
     Ajax.Responders.dispatch('onException', this, exception);
@@ -833,41 +984,37 @@
 
 Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
   initialize: function(container, url, options) {
-    this.containers = {
-      success: container.success ? $(container.success) : $(container),
-      failure: container.failure ? $(container.failure) :
-        (container.success ? null : $(container))
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
     }
 
     this.transport = Ajax.getTransport();
     this.setOptions(options);
 
     var onComplete = this.options.onComplete || Prototype.emptyFunction;
-    this.options.onComplete = (function(transport, object) {
+    this.options.onComplete = (function(transport, param) {
       this.updateContent();
-      onComplete(transport, object);
+      onComplete(transport, param);
     }).bind(this);
 
     this.request(url);
   },
 
   updateContent: function() {
-    var receiver = this.responseIsSuccess() ?
-      this.containers.success : this.containers.failure;
+    var receiver = this.container[this.success() ? 'success' : 'failure'];
     var response = this.transport.responseText;
 
-    if (!this.options.evalScripts)
-      response = response.stripScripts();
+    if (!this.options.evalScripts) response = response.stripScripts();
 
-    if (receiver) {
-      if (this.options.insertion) {
+    if (receiver = $(receiver)) {
+      if (this.options.insertion)
         new this.options.insertion(receiver, response);
-      } else {
-        Element.update(receiver, response);
-      }
+      else
+        receiver.update(response);
     }
 
-    if (this.responseIsSuccess()) {
+    if (this.success()) {
       if (this.onComplete)
         setTimeout(this.onComplete.bind(this), 10);
     }
@@ -916,25 +1063,43 @@
     this.updater = new Ajax.Updater(this.container, this.url, this.options);
   }
 });
-function $() {
-  var results = [], element;
-  for (var i = 0; i < arguments.length; i++) {
-    element = arguments[i];
-    if (typeof element == 'string')
-      element = document.getElementById(element);
-    results.push(Element.extend(element));
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
   }
-  return results.reduce();
+  if (typeof element == 'string')
+    element = document.getElementById(element);
+  return Element.extend(element);
 }
 
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(query.snapshotItem(i));
+    return results;
+  };
+}
+
 document.getElementsByClassName = function(className, parentElement) {
-  var children = ($(parentElement) || document.body).getElementsByTagName('*');
-  return $A(children).inject([], function(elements, child) {
-    if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
-      elements.push(Element.extend(child));
+  if (Prototype.BrowserFeatures.XPath) {
+    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
+    return document._getElementsByXPath(q, parentElement);
+  } else {
+    var children = ($(parentElement) || document.body).getElementsByTagName('*');
+    var elements = [], child;
+    for (var i = 0, length = children.length; i < length; i++) {
+      child = children[i];
+      if (Element.hasClassName(child, className))
+        elements.push(Element.extend(child));
+    }
     return elements;
-  });
-}
+  }
+};
 
 /*--------------------------------------------------------------------------*/
 
@@ -942,8 +1107,7 @@
   var Element = new Object();
 
 Element.extend = function(element) {
-  if (!element) return;
-  if (_nativeExtensions || element.nodeType == 3) return element;
+  if (!element || _nativeExtensions || element.nodeType == 3) return element;
 
   if (!element._extended && element.tagName && element != window) {
     var methods = Object.clone(Element.Methods), cache = Element.extend.cache;
@@ -953,16 +1117,18 @@
     if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName))
       Object.extend(methods, Form.Element.Methods);
 
+    Object.extend(methods, Element.Methods.Simulated);
+
     for (var property in methods) {
       var value = methods[property];
-      if (typeof value == 'function')
+      if (typeof value == 'function' && !(property in element))
         element[property] = cache.findOrStore(value);
     }
   }
 
   element._extended = true;
   return element;
-}
+};
 
 Element.extend.cache = {
   findOrStore: function(value) {
@@ -970,7 +1136,7 @@
       return value.apply(null, [this].concat($A(arguments)));
     }
   }
-}
+};
 
 Element.Methods = {
   visible: function(element) {
@@ -1000,6 +1166,7 @@
   },
 
   update: function(element, html) {
+    html = typeof html == 'undefined' ? '' : html.toString();
     $(element).innerHTML = html.stripScripts();
     setTimeout(function() {html.evalScripts()}, 10);
     return element;
@@ -1007,6 +1174,7 @@
 
   replace: function(element, html) {
     element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
     if (element.outerHTML) {
       element.outerHTML = html.stripScripts();
     } else {
@@ -1044,10 +1212,16 @@
   },
 
   descendants: function(element) {
-    element = $(element);
-    return $A(element.getElementsByTagName('*'));
+    return $A($(element).getElementsByTagName('*'));
   },
 
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+
   previousSiblings: function(element) {
     return $(element).recursivelyCollect('previousSibling');
   },
@@ -1062,10 +1236,9 @@
   },
 
   match: function(element, selector) {
-    element = $(element);
     if (typeof selector == 'string')
       selector = new Selector(selector);
-    return selector.match(element);
+    return selector.match($(element));
   },
 
   up: function(element, expression, index) {
@@ -1090,22 +1263,41 @@
   },
 
   getElementsByClassName: function(element, className) {
-    element = $(element);
     return document.getElementsByClassName(className, element);
   },
 
-  getHeight: function(element) {
+  readAttribute: function(element, name) {
     element = $(element);
-    return element.offsetHeight;
+    if (document.all && !window.opera) {
+      var t = Element._attributeTranslations;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name])  name = t.names[name];
+      var attribute = element.attributes[name];
+      if(attribute) return attribute.nodeValue;
+    }
+    return element.getAttribute(name);
   },
 
+  getHeight: function(element) {
+    return $(element).getDimensions().height;
+  },
+
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
+  },
+
   classNames: function(element) {
     return new Element.ClassNames(element);
   },
 
   hasClassName: function(element, className) {
     if (!(element = $(element))) return;
-    return Element.classNames(element).include(className);
+    var elementClassName = element.className;
+    if (elementClassName.length == 0) return false;
+    if (elementClassName == className ||
+        elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      return true;
+    return false;
   },
 
   addClassName: function(element, className) {
@@ -1120,6 +1312,12 @@
     return element;
   },
 
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
+    return element;
+  },
+
   observe: function() {
     Event.observe.apply(Event, arguments);
     return $A(arguments).first();
@@ -1147,7 +1345,7 @@
     return $(element).innerHTML.match(/^\s*$/);
   },
 
-  childOf: function(element, ancestor) {
+  descendantOf: function(element, ancestor) {
     element = $(element), ancestor = $(ancestor);
     while (element = element.parentNode)
       if (element == ancestor) return true;
@@ -1156,40 +1354,69 @@
 
   scrollTo: function(element) {
     element = $(element);
-    var x = element.x ? element.x : element.offsetLeft,
-        y = element.y ? element.y : element.offsetTop;
-    window.scrollTo(x, y);
+    var pos = Position.cumulativeOffset(element);
+    window.scrollTo(pos[0], pos[1]);
     return element;
   },
 
   getStyle: function(element, style) {
     element = $(element);
-    var value = element.style[style.camelize()];
+    if (['float','cssFloat'].include(style))
+      style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat');
+    style = style.camelize();
+    var value = element.style[style];
     if (!value) {
       if (document.defaultView && document.defaultView.getComputedStyle) {
         var css = document.defaultView.getComputedStyle(element, null);
-        value = css ? css.getPropertyValue(style) : null;
+        value = css ? css[style] : null;
       } else if (element.currentStyle) {
-        value = element.currentStyle[style.camelize()];
+        value = element.currentStyle[style];
       }
     }
 
+    if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
+      value = element['offset'+style.capitalize()] + 'px';
+
     if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
       if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-
+    if(style == 'opacity') {
+      if(value) return parseFloat(value);
+      if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if(value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
     return value == 'auto' ? null : value;
   },
 
   setStyle: function(element, style) {
     element = $(element);
-    for (var name in style)
-      element.style[name.camelize()] = style[name];
+    for (var name in style) {
+      var value = style[name];
+      if(name == 'opacity') {
+        if (value == 1) {
+          value = (/Gecko/.test(navigator.userAgent) &&
+            !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0;
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+        } else if(value === '') {
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+        } else {
+          if(value < 0.00001) value = 0;
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
+              'alpha(opacity='+value*100+')';
+        }
+      } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat';
+      element.style[name.camelize()] = value;
+    }
     return element;
   },
 
   getDimensions: function(element) {
     element = $(element);
-    if (Element.getStyle(element, 'display') != 'none')
+    var display = $(element).getStyle('display');
+    if (display != 'none' && display != null) // Safari bug
       return {width: element.offsetWidth, height: element.offsetHeight};
 
     // All *Width and *Height properties give 0 on elements with display none,
@@ -1197,12 +1424,13 @@
     var els = element.style;
     var originalVisibility = els.visibility;
     var originalPosition = els.position;
+    var originalDisplay = els.display;
     els.visibility = 'hidden';
     els.position = 'absolute';
-    els.display = '';
+    els.display = 'block';
     var originalWidth = element.clientWidth;
     var originalHeight = element.clientHeight;
-    els.display = 'none';
+    els.display = originalDisplay;
     els.position = originalPosition;
     els.visibility = originalVisibility;
     return {width: originalWidth, height: originalHeight};
@@ -1239,7 +1467,7 @@
 
   makeClipping: function(element) {
     element = $(element);
-    if (element._overflow) return;
+    if (element._overflow) return element;
     element._overflow = element.style.overflow || 'auto';
     if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
       element.style.overflow = 'hidden';
@@ -1248,19 +1476,73 @@
 
   undoClipping: function(element) {
     element = $(element);
-    if (!element._overflow) return;
+    if (!element._overflow) return element;
     element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
     element._overflow = null;
     return element;
   }
-}
+};
 
+Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
+
+Element._attributeTranslations = {};
+
+Element._attributeTranslations.names = {
+  colspan:   "colSpan",
+  rowspan:   "rowSpan",
+  valign:    "vAlign",
+  datetime:  "dateTime",
+  accesskey: "accessKey",
+  tabindex:  "tabIndex",
+  enctype:   "encType",
+  maxlength: "maxLength",
+  readonly:  "readOnly",
+  longdesc:  "longDesc"
+};
+
+Element._attributeTranslations.values = {
+  _getAttr: function(element, attribute) {
+    return element.getAttribute(attribute, 2);
+  },
+
+  _flag: function(element, attribute) {
+    return $(element).hasAttribute(attribute) ? attribute : null;
+  },
+
+  style: function(element) {
+    return element.style.cssText.toLowerCase();
+  },
+
+  title: function(element) {
+    var node = element.getAttributeNode('title');
+    return node.specified ? node.nodeValue : null;
+  }
+};
+
+Object.extend(Element._attributeTranslations.values, {
+  href: Element._attributeTranslations.values._getAttr,
+  src:  Element._attributeTranslations.values._getAttr,
+  disabled: Element._attributeTranslations.values._flag,
+  checked:  Element._attributeTranslations.values._flag,
+  readonly: Element._attributeTranslations.values._flag,
+  multiple: Element._attributeTranslations.values._flag
+});
+
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    var t = Element._attributeTranslations;
+    attribute = t.names[attribute] || attribute;
+    return $(element).getAttributeNode(attribute).specified;
+  }
+};
+
 // IE is missing .innerHTML support for TABLE-related elements
-if(document.all){
+if (document.all && !window.opera){
   Element.Methods.update = function(element, html) {
     element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
     var tagName = element.tagName.toUpperCase();
-    if (['THEAD','TBODY','TR','TD'].indexOf(tagName) > -1) {
+    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
       var div = document.createElement('div');
       switch (tagName) {
         case 'THEAD':
@@ -1289,34 +1571,36 @@
     setTimeout(function() {html.evalScripts()}, 10);
     return element;
   }
-}
+};
 
 Object.extend(Element, Element.Methods);
 
 var _nativeExtensions = false;
 
-if (!window.HTMLElement && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
-  /* Emulate HTMLElement, HTMLFormElement, HTMLInputElement, HTMLTextAreaElement,
-     and HTMLSelectElement in Safari */
+if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
   ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) {
-    var klass = window['HTML' + tag + 'Element'] = {};
+    var className = 'HTML' + tag + 'Element';
+    if(window[className]) return;
+    var klass = window[className] = {};
     klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__;
   });
-}
 
 Element.addMethods = function(methods) {
   Object.extend(Element.Methods, methods || {});
 
-  function copy(methods, destination) {
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
     var cache = Element.extend.cache;
     for (var property in methods) {
       var value = methods[property];
-      destination[property] = cache.findOrStore(value);
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = cache.findOrStore(value);
     }
   }
 
   if (typeof HTMLElement != 'undefined') {
     copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
     copy(Form.Methods, HTMLFormElement.prototype);
     [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) {
       copy(Form.Element.Methods, klass.prototype);
@@ -1343,8 +1627,8 @@
       try {
         this.element.insertAdjacentHTML(this.adjacency, this.content);
       } catch (e) {
-        var tagName = this.element.tagName.toLowerCase();
-        if (tagName == 'tbody' || tagName == 'tr') {
+        var tagName = this.element.tagName.toUpperCase();
+        if (['TBODY', 'TR'].include(tagName)) {
           this.insertContent(this.contentFromAnonymousTable());
         } else {
           throw e;
@@ -1443,20 +1727,18 @@
 
   add: function(classNameToAdd) {
     if (this.include(classNameToAdd)) return;
-    this.set(this.toArray().concat(classNameToAdd).join(' '));
+    this.set($A(this).concat(classNameToAdd).join(' '));
   },
 
   remove: function(classNameToRemove) {
     if (!this.include(classNameToRemove)) return;
-    this.set(this.select(function(className) {
-      return className != classNameToRemove;
-    }).join(' '));
+    this.set($A(this).without(classNameToRemove).join(' '));
   },
 
   toString: function() {
-    return this.toArray().join(' ');
+    return $A(this).join(' ');
   }
-}
+};
 
 Object.extend(Element.ClassNames.prototype, Enumerable);
 var Selector = Class.create();
@@ -1503,15 +1785,15 @@
     if (params.wildcard)
       conditions.push('true');
     if (clause = params.id)
-      conditions.push('element.id == ' + clause.inspect());
+      conditions.push('element.readAttribute("id") == ' + clause.inspect());
     if (clause = params.tagName)
       conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
     if ((clause = params.classNames).length > 0)
-      for (var i = 0; i < clause.length; i++)
-        conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
+      for (var i = 0, length = clause.length; i < length; i++)
+        conditions.push('element.hasClassName(' + clause[i].inspect() + ')');
     if (clause = params.attributes) {
       clause.each(function(attribute) {
-        var value = 'element.getAttribute(' + attribute.name.inspect() + ')';
+        var value = 'element.readAttribute(' + attribute.name.inspect() + ')';
         var splitValueBy = function(delimiter) {
           return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
         }
@@ -1524,7 +1806,7 @@
                           ); break;
           case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
           case '':
-          case undefined: conditions.push(value + ' != null'); break;
+          case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break;
           default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
         }
       });
@@ -1535,6 +1817,7 @@
 
   compileMatcher: function() {
     this.match = new Function('element', 'if (!element.tagName) return false; \
+      element = $(element); \
       return ' + this.buildMatchExpression());
   },
 
@@ -1549,7 +1832,7 @@
     scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
 
     var results = [];
-    for (var i = 0; i < scope.length; i++)
+    for (var i = 0, length = scope.length; i < length; i++)
       if (this.match(element = scope[i]))
         results.push(Element.extend(element));
 
@@ -1564,7 +1847,7 @@
 Object.extend(Selector, {
   matchElements: function(elements, expression) {
     var selector = new Selector(expression);
-    return elements.select(selector.match.bind(selector));
+    return elements.select(selector.match.bind(selector)).map(Element.extend);
   },
 
   findElement: function(elements, expression, index) {
@@ -1574,7 +1857,7 @@
 
   findChildElements: function(element, expressions) {
     return expressions.map(function(expression) {
-      return expression.strip().split(/\s+/).inject([null], function(results, expr) {
+      return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) {
         var selector = new Selector(expr);
         return results.inject([], function(elements, result) {
           return elements.concat(selector.findElements(result || element));
@@ -1591,49 +1874,53 @@
   reset: function(form) {
     $(form).reset();
     return form;
+  },
+
+  serializeElements: function(elements, getHash) {
+    var data = elements.inject({}, function(result, element) {
+      if (!element.disabled && element.name) {
+        var key = element.name, value = $(element).getValue();
+        if (value != undefined) {
+          if (result[key]) {
+            if (result[key].constructor != Array) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+
+    return getHash ? data : Hash.toQueryString(data);
   }
 };
 
 Form.Methods = {
-  serialize: function(form) {
-    var elements = Form.getElements($(form));
-    var queryComponents = new Array();
-
-    for (var i = 0; i < elements.length; i++) {
-      var queryComponent = Form.Element.serialize(elements[i]);
-      if (queryComponent)
-        queryComponents.push(queryComponent);
-    }
-
-    return queryComponents.join('&');
+  serialize: function(form, getHash) {
+    return Form.serializeElements(Form.getElements(form), getHash);
   },
 
   getElements: function(form) {
-    form = $(form);
-    var elements = new Array();
-
-    for (var tagName in Form.Element.Serializers) {
-      var tagElements = form.getElementsByTagName(tagName);
-      for (var j = 0; j < tagElements.length; j++)
-        elements.push(tagElements[j]);
-    }
-    return elements;
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
   },
 
   getInputs: function(form, typeName, name) {
     form = $(form);
     var inputs = form.getElementsByTagName('input');
 
-    if (!typeName && !name)
-      return inputs;
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
 
-    var matchingInputs = new Array();
-    for (var i = 0; i < inputs.length; i++) {
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
       var input = inputs[i];
-      if ((typeName && input.type != typeName) ||
-          (name && input.name != name))
+      if ((typeName && input.type != typeName) || (name && input.name != name))
         continue;
-      matchingInputs.push(input);
+      matchingInputs.push(Element.extend(input));
     }
 
     return matchingInputs;
@@ -1641,27 +1928,23 @@
 
   disable: function(form) {
     form = $(form);
-    var elements = Form.getElements(form);
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
+    form.getElements().each(function(element) {
       element.blur();
       element.disabled = 'true';
-    }
+    });
     return form;
   },
 
   enable: function(form) {
     form = $(form);
-    var elements = Form.getElements(form);
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
+    form.getElements().each(function(element) {
       element.disabled = '';
-    }
+    });
     return form;
   },
 
   findFirstElement: function(form) {
-    return Form.getElements(form).find(function(element) {
+    return $(form).getElements().find(function(element) {
       return element.type != 'hidden' && !element.disabled &&
         ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
     });
@@ -1669,7 +1952,7 @@
 
   focusFirstElement: function(form) {
     form = $(form);
-    Field.activate(Form.findFirstElement(form));
+    form.findFirstElement().activate();
     return form;
   }
 }
@@ -1693,29 +1976,21 @@
 Form.Element.Methods = {
   serialize: function(element) {
     element = $(element);
-    var method = element.tagName.toLowerCase();
-    var parameter = Form.Element.Serializers[method](element);
-
-    if (parameter) {
-      var key = encodeURIComponent(parameter[0]);
-      if (key.length == 0) return;
-
-      if (parameter[1].constructor != Array)
-        parameter[1] = [parameter[1]];
-
-      return parameter[1].map(function(value) {
-        return key + '=' + encodeURIComponent(value);
-      }).join('&');
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = {};
+        pair[element.name] = value;
+        return Hash.toQueryString(pair);
+      }
     }
+    return '';
   },
 
   getValue: function(element) {
     element = $(element);
     var method = element.tagName.toLowerCase();
-    var parameter = Form.Element.Serializers[method](element);
-
-    if (parameter)
-      return parameter[1];
+    return Form.Element.Serializers[method](element);
   },
 
   clear: function(element) {
@@ -1730,27 +2005,29 @@
   activate: function(element) {
     element = $(element);
     element.focus();
-    if (element.select)
+    if (element.select && ( element.tagName.toLowerCase() != 'input' ||
+      !['button', 'reset', 'submit'].include(element.type) ) )
       element.select();
     return element;
   },
 
   disable: function(element) {
     element = $(element);
-    element.disabled = '';
+    element.disabled = true;
     return element;
   },
 
   enable: function(element) {
     element = $(element);
     element.blur();
-    element.disabled = 'true';
+    element.disabled = false;
     return element;
   }
 }
 
 Object.extend(Form.Element, Form.Element.Methods);
 var Field = Form.Element;
+var $F = Form.Element.getValue;
 
 /*--------------------------------------------------------------------------*/
 
@@ -1763,49 +2040,45 @@
       default:
         return Form.Element.Serializers.textarea(element);
     }
-    return false;
   },
 
   inputSelector: function(element) {
-    if (element.checked)
-      return [element.name, element.value];
+    return element.checked ? element.value : null;
   },
 
   textarea: function(element) {
-    return [element.name, element.value];
+    return element.value;
   },
 
   select: function(element) {
-    return Form.Element.Serializers[element.type == 'select-one' ?
+    return this[element.type == 'select-one' ?
       'selectOne' : 'selectMany'](element);
   },
 
   selectOne: function(element) {
-    var value = '', opt, index = element.selectedIndex;
-    if (index >= 0) {
-      opt = element.options[index];
-      value = opt.value || opt.text;
-    }
-    return [element.name, value];
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
   },
 
   selectMany: function(element) {
-    var value = [];
-    for (var i = 0; i < element.length; i++) {
+    var values, length = element.length;
+    if (!length) return null;
+
+    for (var i = 0, values = []; i < length; i++) {
       var opt = element.options[i];
-      if (opt.selected)
-        value.push(opt.value || opt.text);
+      if (opt.selected) values.push(this.optionValue(opt));
     }
-    return [element.name, value];
+    return values;
+  },
+
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
   }
 }
 
 /*--------------------------------------------------------------------------*/
 
-var $F = Form.Element.getValue;
-
-/*--------------------------------------------------------------------------*/
-
 Abstract.TimedObserver = function() {}
 Abstract.TimedObserver.prototype = {
   initialize: function(element, frequency, callback) {
@@ -1823,7 +2096,9 @@
 
   onTimerEvent: function() {
     var value = this.getValue();
-    if (this.lastValue != value) {
+    var changed = ('string' == typeof this.lastValue && 'string' == typeof value
+      ? this.lastValue != value : String(this.lastValue) != String(value));
+    if (changed) {
       this.callback(this.element, value);
       this.lastValue = value;
     }
@@ -1868,9 +2143,7 @@
   },
 
   registerFormCallbacks: function() {
-    var elements = Form.getElements(this.element);
-    for (var i = 0; i < elements.length; i++)
-      this.registerCallback(elements[i]);
+    Form.getElements(this.element).each(this.registerCallback.bind(this));
   },
 
   registerCallback: function(element) {
@@ -1974,7 +2247,7 @@
 
   unloadCache: function() {
     if (!Event.observers) return;
-    for (var i = 0; i < Event.observers.length; i++) {
+    for (var i = 0, length = Event.observers.length; i < length; i++) {
       Event.stopObserving.apply(this, Event.observers[i]);
       Event.observers[i][0] = null;
     }
@@ -2061,7 +2334,8 @@
       valueL += element.offsetLeft || 0;
       element = element.offsetParent;
       if (element) {
-        p = Element.getStyle(element, 'position');
+        if(element.tagName=='BODY') break;
+        var p = Element.getStyle(element, 'position');
         if (p == 'relative' || p == 'absolute') break;
       }
     } while (element);
@@ -2197,10 +2471,10 @@
     element._originalHeight = element.style.height;
 
     element.style.position = 'absolute';
-    element.style.top    = top + 'px';;
-    element.style.left   = left + 'px';;
-    element.style.width  = width + 'px';;
-    element.style.height = height + 'px';;
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
   },
 
   relativize: function(element) {

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/scriptaculous.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/scriptaculous.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/scriptaculous.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,6 +1,6 @@
-// script.aculo.us scriptaculous.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
+// script.aculo.us scriptaculous.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
 
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -20,9 +20,11 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
 var Scriptaculous = {
-  Version: '1.6.4',
+  Version: '1.7.0',
   require: function(libraryName) {
     // inserting via DOM fails in Safari 2.0, so brute force approach
     document.write('<script type="text/javascript" src="'+libraryName+'"></script>');

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/slider.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/slider.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/slider.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,27 +1,9 @@
-// script.aculo.us slider.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
+// script.aculo.us slider.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
 
-// Copyright (c) 2005 Marty Haught, Thomas Fuchs 
+// Copyright (c) 2005, 2006 Marty Haught, Thomas Fuchs 
 //
-// See http://script.aculo.us for more info
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
 if(!Control) var Control = {};
 Control.Slider = Class.create();
@@ -241,14 +223,16 @@
           // find the handle (prevents issues with Safari)
           while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
             handle = handle.parentNode;
-        
-          this.activeHandle    = handle;
-          this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
-          this.updateStyles();
-        
-          var offsets  = Position.cumulativeOffset(this.activeHandle);
-          this.offsetX = (pointer[0] - offsets[0]);
-          this.offsetY = (pointer[1] - offsets[1]);
+            
+          if(this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+            
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
         }
       }
       Event.stop(event);

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/unittest.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/unittest.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/js/portal/unittest.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,552 +1,564 @@
-// script.aculo.us unittest.js v1.6.4, Wed Sep 06 11:30:58 CEST 2006
-
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005 Jon Tirsen (http://www.tirsen.com)
-//           (c) 2005 Michael Schuerig (http://www.schuerig.de/michael/)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-// experimental, Firefox-only
-Event.simulateMouse = function(element, eventName) {
-  var options = Object.extend({
-    pointerX: 0,
-    pointerY: 0,
-    buttons: 0
-  }, arguments[2] || {});
-  var oEvent = document.createEvent("MouseEvents");
-  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
-    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
-    false, false, false, false, 0, $(element));
-  
-  if(this.mark) Element.remove(this.mark);
-  this.mark = document.createElement('div');
-  this.mark.appendChild(document.createTextNode(" "));
-  document.body.appendChild(this.mark);
-  this.mark.style.position = 'absolute';
-  this.mark.style.top = options.pointerY + "px";
-  this.mark.style.left = options.pointerX + "px";
-  this.mark.style.width = "5px";
-  this.mark.style.height = "5px;";
-  this.mark.style.borderTop = "1px solid red;"
-  this.mark.style.borderLeft = "1px solid red;"
-  
-  if(this.step)
-    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
-  
-  $(element).dispatchEvent(oEvent);
-};
-
-// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
-// You need to downgrade to 1.0.4 for now to get this working
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
-Event.simulateKey = function(element, eventName) {
-  var options = Object.extend({
-    ctrlKey: false,
-    altKey: false,
-    shiftKey: false,
-    metaKey: false,
-    keyCode: 0,
-    charCode: 0
-  }, arguments[2] || {});
-
-  var oEvent = document.createEvent("KeyEvents");
-  oEvent.initKeyEvent(eventName, true, true, window, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-    options.keyCode, options.charCode );
-  $(element).dispatchEvent(oEvent);
-};
-
-Event.simulateKeys = function(element, command) {
-  for(var i=0; i<command.length; i++) {
-    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
-  }
-};
-
-var Test = {}
-Test.Unit = {};
-
-// security exception workaround
-Test.Unit.inspect = Object.inspect;
-
-Test.Unit.Logger = Class.create();
-Test.Unit.Logger.prototype = {
-  initialize: function(log) {
-    this.log = $(log);
-    if (this.log) {
-      this._createLogTable();
-    }
-  },
-  start: function(testName) {
-    if (!this.log) return;
-    this.testName = testName;
-    this.lastLogLine = document.createElement('tr');
-    this.statusCell = document.createElement('td');
-    this.nameCell = document.createElement('td');
-    this.nameCell.appendChild(document.createTextNode(testName));
-    this.messageCell = document.createElement('td');
-    this.lastLogLine.appendChild(this.statusCell);
-    this.lastLogLine.appendChild(this.nameCell);
-    this.lastLogLine.appendChild(this.messageCell);
-    this.loglines.appendChild(this.lastLogLine);
-  },
-  finish: function(status, summary) {
-    if (!this.log) return;
-    this.lastLogLine.className = status;
-    this.statusCell.innerHTML = status;
-    this.messageCell.innerHTML = this._toHTML(summary);
-  },
-  message: function(message) {
-    if (!this.log) return;
-    this.messageCell.innerHTML = this._toHTML(message);
-  },
-  summary: function(summary) {
-    if (!this.log) return;
-    this.logsummary.innerHTML = this._toHTML(summary);
-  },
-  _createLogTable: function() {
-    this.log.innerHTML =
-    '<div id="logsummary"></div>' +
-    '<table id="logtable">' +
-    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
-    '<tbody id="loglines"></tbody>' +
-    '</table>';
-    this.logsummary = $('logsummary')
-    this.loglines = $('loglines');
-  },
-  _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"<br/>");
-  }
-}
-
-Test.Unit.Runner = Class.create();
-Test.Unit.Runner.prototype = {
-  initialize: function(testcases) {
-    this.options = Object.extend({
-      testLog: 'testlog'
-    }, arguments[1] || {});
-    this.options.resultsURL = this.parseResultsURLQueryParameter();
-    if (this.options.testLog) {
-      this.options.testLog = $(this.options.testLog) || null;
-    }
-    if(this.options.tests) {
-      this.tests = [];
-      for(var i = 0; i < this.options.tests.length; i++) {
-        if(/^test/.test(this.options.tests[i])) {
-          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
-        }
-      }
-    } else {
-      if (this.options.test) {
-        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
-      } else {
-        this.tests = [];
-        for(var testcase in testcases) {
-          if(/^test/.test(testcase)) {
-            this.tests.push(
-               new Test.Unit.Testcase(
-                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
-                 testcases[testcase], testcases["setup"], testcases["teardown"]
-               ));
-          }
-        }
-      }
-    }
-    this.currentTest = 0;
-    this.logger = new Test.Unit.Logger(this.options.testLog);
-    setTimeout(this.runTests.bind(this), 1000);
-  },
-  parseResultsURLQueryParameter: function() {
-    return window.location.search.parseQuery()["resultsURL"];
-  },
-  // Returns:
-  //  "ERROR" if there was an error,
-  //  "FAILURE" if there was a failure, or
-  //  "SUCCESS" if there was neither
-  getResult: function() {
-    var hasFailure = false;
-    for(var i=0;i<this.tests.length;i++) {
-      if (this.tests[i].errors > 0) {
-        return "ERROR";
-      }
-      if (this.tests[i].failures > 0) {
-        hasFailure = true;
-      }
-    }
-    if (hasFailure) {
-      return "FAILURE";
-    } else {
-      return "SUCCESS";
-    }
-  },
-  postResults: function() {
-    if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
-        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
-    }
-  },
-  runTests: function() {
-    var test = this.tests[this.currentTest];
-    if (!test) {
-      // finished!
-      this.postResults();
-      this.logger.summary(this.summary());
-      return;
-    }
-    if(!test.isWaiting) {
-      this.logger.start(test.name);
-    }
-    test.run();
-    if(test.isWaiting) {
-      this.logger.message("Waiting for " + test.timeToWait + "ms");
-      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
-    } else {
-      this.logger.finish(test.status(), test.summary());
-      this.currentTest++;
-      // tail recursive, hopefully the browser will skip the stackframe
-      this.runTests();
-    }
-  },
-  summary: function() {
-    var assertions = 0;
-    var failures = 0;
-    var errors = 0;
-    var messages = [];
-    for(var i=0;i<this.tests.length;i++) {
-      assertions +=   this.tests[i].assertions;
-      failures   +=   this.tests[i].failures;
-      errors     +=   this.tests[i].errors;
-    }
-    return (
-      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
-      failures   + " failures, " +
-      errors     + " errors");
-  }
-}
-
-Test.Unit.Assertions = Class.create();
-Test.Unit.Assertions.prototype = {
-  initialize: function() {
-    this.assertions = 0;
-    this.failures   = 0;
-    this.errors     = 0;
-    this.messages   = [];
-  },
-  summary: function() {
-    return (
-      this.assertions + " assertions, " + 
-      this.failures   + " failures, " +
-      this.errors     + " errors" + "\n" +
-      this.messages.join("\n"));
-  },
-  pass: function() {
-    this.assertions++;
-  },
-  fail: function(message) {
-    this.failures++;
-    this.messages.push("Failure: " + message);
-  },
-  info: function(message) {
-    this.messages.push("Info: " + message);
-  },
-  error: function(error) {
-    this.errors++;
-    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
-  },
-  status: function() {
-    if (this.failures > 0) return 'failed';
-    if (this.errors > 0) return 'error';
-    return 'passed';
-  },
-  assert: function(expression) {
-    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
-    try { expression ? this.pass() : 
-      this.fail(message); }
-    catch(e) { this.error(e); }
-  },
-  assertEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEqual";
-    try { (expected == actual) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertEnumEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEnumEqual";
-    try { $A(expected).length == $A(actual).length && 
-      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
-          ', actual ' + Test.Unit.inspect(actual)); }
-    catch(e) { this.error(e); }
-  },
-  assertNotEqual: function(expected, actual) {
-    var message = arguments[2] || "assertNotEqual";
-    try { (expected != actual) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertIdentical"; 
-    try { (expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNotIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertNotIdentical"; 
-    try { !(expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNull: function(obj) {
-    var message = arguments[1] || 'assertNull'
-    try { (obj==null) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertMatch: function(expected, actual) {
-    var message = arguments[2] || 'assertMatch';
-    var regex = new RegExp(expected);
-    try { (regex.exec(actual)) ? this.pass() :
-      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertHidden: function(element) {
-    var message = arguments[1] || 'assertHidden';
-    this.assertEqual("none", element.style.display, message);
-  },
-  assertNotNull: function(object) {
-    var message = arguments[1] || 'assertNotNull';
-    this.assert(object != null, message);
-  },
-  assertType: function(expected, actual) {
-    var message = arguments[2] || 'assertType';
-    try { 
-      (actual.constructor == expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertNotOfType: function(expected, actual) {
-    var message = arguments[2] || 'assertNotOfType';
-    try { 
-      (actual.constructor != expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertInstanceOf';
-    try { 
-      (actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was not an instance of the expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertNotInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertNotInstanceOf';
-    try { 
-      !(actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertRespondsTo: function(method, obj) {
-    var message = arguments[2] || 'assertRespondsTo';
-    try {
-      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
-      this.fail(message + ": object doesn't respond to [" + method + "]"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsTrue: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsTrue';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      m() ? this.pass() : 
-      this.fail(message + ": method returned false"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsFalse: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsFalse';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      !m() ? this.pass() : 
-      this.fail(message + ": method returned true"); }
-    catch(e) { this.error(e); }
-  },
-  assertRaise: function(exceptionName, method) {
-    var message = arguments[2] || 'assertRaise';
-    try { 
-      method();
-      this.fail(message + ": exception expected but none was raised"); }
-    catch(e) {
-      (e.name==exceptionName) ? this.pass() : this.error(e); 
-    }
-  },
-  assertElementsMatch: function() {
-    var expressions = $A(arguments), elements = $A(expressions.shift());
-    if (elements.length != expressions.length) {
-      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
-      return false;
-    }
-    elements.zip(expressions).all(function(pair, index) {
-      var element = $(pair.first()), expression = pair.last();
-      if (element.match(expression)) return true;
-      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
-    }.bind(this)) && this.pass();
-  },
-  assertElementMatches: function(element, expression) {
-    this.assertElementsMatch([element], expression);
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  },
-  _isVisible: function(element) {
-    element = $(element);
-    if(!element.parentNode) return true;
-    this.assertNotNull(element);
-    if(element.style && Element.getStyle(element, 'display') == 'none')
-      return false;
-    
-    return this._isVisible(element.parentNode);
-  },
-  assertNotVisible: function(element) {
-    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
-  },
-  assertVisible: function(element) {
-    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  }
-}
-
-Test.Unit.Testcase = Class.create();
-Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
-  initialize: function(name, test, setup, teardown) {
-    Test.Unit.Assertions.prototype.initialize.bind(this)();
-    this.name           = name;
-    
-    if(typeof test == 'string') {
-      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
-      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
-      this.test = function() {
-        eval('with(this){'+test+'}');
-      }
-    } else {
-      this.test = test || function() {};
-    }
-    
-    this.setup          = setup || function() {};
-    this.teardown       = teardown || function() {};
-    this.isWaiting      = false;
-    this.timeToWait     = 1000;
-  },
-  wait: function(time, nextPart) {
-    this.isWaiting = true;
-    this.test = nextPart;
-    this.timeToWait = time;
-  },
-  run: function() {
-    try {
-      try {
-        if (!this.isWaiting) this.setup.bind(this)();
-        this.isWaiting = false;
-        this.test.bind(this)();
-      } finally {
-        if(!this.isWaiting) {
-          this.teardown.bind(this)();
-        }
-      }
-    }
-    catch(e) { this.error(e); }
-  }
-});
-
-// *EXPERIMENTAL* BDD-style testing to please non-technical folk
-// This draws many ideas from RSpec http://rspec.rubyforge.org/
-
-Test.setupBDDExtensionMethods = function(){
-  var METHODMAP = {
-    shouldEqual:     'assertEqual',
-    shouldNotEqual:  'assertNotEqual',
-    shouldEqualEnum: 'assertEnumEqual',
-    shouldBeA:       'assertType',
-    shouldNotBeA:    'assertNotOfType',
-    shouldBeAn:      'assertType',
-    shouldNotBeAn:   'assertNotOfType',
-    shouldBeNull:    'assertNull',
-    shouldNotBeNull: 'assertNotNull',
-    
-    shouldBe:        'assertReturnsTrue',
-    shouldNotBe:     'assertReturnsFalse',
-    shouldRespondTo: 'assertRespondsTo'
-  };
-  Test.BDDMethods = {};
-  for(m in METHODMAP) {
-    Test.BDDMethods[m] = eval(
-      'function(){'+
-      'var args = $A(arguments);'+
-      'var scope = args.shift();'+
-      'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }');
-  }
-  [Array.prototype, String.prototype, Number.prototype].each(
-    function(p){ Object.extend(p, Test.BDDMethods) }
-  );
-}
-
-Test.context = function(name, spec, log){
-  Test.setupBDDExtensionMethods();
-  
-  var compiledSpec = {};
-  var titles = {};
-  for(specName in spec) {
-    switch(specName){
-      case "setup":
-      case "teardown":
-        compiledSpec[specName] = spec[specName];
-        break;
-      default:
-        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
-        var body = spec[specName].toString().split('\n').slice(1);
-        if(/^\{/.test(body[0])) body = body.slice(1);
-        body.pop();
-        body = body.map(function(statement){ 
-          return statement.strip()
-        });
-        compiledSpec[testName] = body.join('\n');
-        titles[testName] = specName;
-    }
-  }
-  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
+// script.aculo.us unittest.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005, 2006 Michael Schuerig (http://www.schuerig.de/michael/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// experimental, Firefox-only
+Event.simulateMouse = function(element, eventName) {
+  var options = Object.extend({
+    pointerX: 0,
+    pointerY: 0,
+    buttons:  0,
+    ctrlKey:  false,
+    altKey:   false,
+    shiftKey: false,
+    metaKey:  false
+  }, arguments[2] || {});
+  var oEvent = document.createEvent("MouseEvents");
+  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
+    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
+  
+  if(this.mark) Element.remove(this.mark);
+  this.mark = document.createElement('div');
+  this.mark.appendChild(document.createTextNode(" "));
+  document.body.appendChild(this.mark);
+  this.mark.style.position = 'absolute';
+  this.mark.style.top = options.pointerY + "px";
+  this.mark.style.left = options.pointerX + "px";
+  this.mark.style.width = "5px";
+  this.mark.style.height = "5px;";
+  this.mark.style.borderTop = "1px solid red;"
+  this.mark.style.borderLeft = "1px solid red;"
+  
+  if(this.step)
+    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
+  
+  $(element).dispatchEvent(oEvent);
+};
+
+// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
+// You need to downgrade to 1.0.4 for now to get this working
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
+Event.simulateKey = function(element, eventName) {
+  var options = Object.extend({
+    ctrlKey: false,
+    altKey: false,
+    shiftKey: false,
+    metaKey: false,
+    keyCode: 0,
+    charCode: 0
+  }, arguments[2] || {});
+
+  var oEvent = document.createEvent("KeyEvents");
+  oEvent.initKeyEvent(eventName, true, true, window, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
+    options.keyCode, options.charCode );
+  $(element).dispatchEvent(oEvent);
+};
+
+Event.simulateKeys = function(element, command) {
+  for(var i=0; i<command.length; i++) {
+    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
+  }
+};
+
+var Test = {}
+Test.Unit = {};
+
+// security exception workaround
+Test.Unit.inspect = Object.inspect;
+
+Test.Unit.Logger = Class.create();
+Test.Unit.Logger.prototype = {
+  initialize: function(log) {
+    this.log = $(log);
+    if (this.log) {
+      this._createLogTable();
+    }
+  },
+  start: function(testName) {
+    if (!this.log) return;
+    this.testName = testName;
+    this.lastLogLine = document.createElement('tr');
+    this.statusCell = document.createElement('td');
+    this.nameCell = document.createElement('td');
+    this.nameCell.className = "nameCell";
+    this.nameCell.appendChild(document.createTextNode(testName));
+    this.messageCell = document.createElement('td');
+    this.lastLogLine.appendChild(this.statusCell);
+    this.lastLogLine.appendChild(this.nameCell);
+    this.lastLogLine.appendChild(this.messageCell);
+    this.loglines.appendChild(this.lastLogLine);
+  },
+  finish: function(status, summary) {
+    if (!this.log) return;
+    this.lastLogLine.className = status;
+    this.statusCell.innerHTML = status;
+    this.messageCell.innerHTML = this._toHTML(summary);
+    this.addLinksToResults();
+  },
+  message: function(message) {
+    if (!this.log) return;
+    this.messageCell.innerHTML = this._toHTML(message);
+  },
+  summary: function(summary) {
+    if (!this.log) return;
+    this.logsummary.innerHTML = this._toHTML(summary);
+  },
+  _createLogTable: function() {
+    this.log.innerHTML =
+    '<div id="logsummary"></div>' +
+    '<table id="logtable">' +
+    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
+    '<tbody id="loglines"></tbody>' +
+    '</table>';
+    this.logsummary = $('logsummary')
+    this.loglines = $('loglines');
+  },
+  _toHTML: function(txt) {
+    return txt.escapeHTML().replace(/\n/g,"<br/>");
+  },
+  addLinksToResults: function(){ 
+    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run only this test"
+      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
+    });
+    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run all tests"
+      Event.observe(td, 'click', function(){ window.location.search = "";});
+    });
+  }
+}
+
+Test.Unit.Runner = Class.create();
+Test.Unit.Runner.prototype = {
+  initialize: function(testcases) {
+    this.options = Object.extend({
+      testLog: 'testlog'
+    }, arguments[1] || {});
+    this.options.resultsURL = this.parseResultsURLQueryParameter();
+    this.options.tests      = this.parseTestsQueryParameter();
+    if (this.options.testLog) {
+      this.options.testLog = $(this.options.testLog) || null;
+    }
+    if(this.options.tests) {
+      this.tests = [];
+      for(var i = 0; i < this.options.tests.length; i++) {
+        if(/^test/.test(this.options.tests[i])) {
+          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
+        }
+      }
+    } else {
+      if (this.options.test) {
+        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
+      } else {
+        this.tests = [];
+        for(var testcase in testcases) {
+          if(/^test/.test(testcase)) {
+            this.tests.push(
+               new Test.Unit.Testcase(
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
+                 testcases[testcase], testcases["setup"], testcases["teardown"]
+               ));
+          }
+        }
+      }
+    }
+    this.currentTest = 0;
+    this.logger = new Test.Unit.Logger(this.options.testLog);
+    setTimeout(this.runTests.bind(this), 1000);
+  },
+  parseResultsURLQueryParameter: function() {
+    return window.location.search.parseQuery()["resultsURL"];
+  },
+  parseTestsQueryParameter: function(){
+    if (window.location.search.parseQuery()["tests"]){
+        return window.location.search.parseQuery()["tests"].split(',');
+    };
+  },
+  // Returns:
+  //  "ERROR" if there was an error,
+  //  "FAILURE" if there was a failure, or
+  //  "SUCCESS" if there was neither
+  getResult: function() {
+    var hasFailure = false;
+    for(var i=0;i<this.tests.length;i++) {
+      if (this.tests[i].errors > 0) {
+        return "ERROR";
+      }
+      if (this.tests[i].failures > 0) {
+        hasFailure = true;
+      }
+    }
+    if (hasFailure) {
+      return "FAILURE";
+    } else {
+      return "SUCCESS";
+    }
+  },
+  postResults: function() {
+    if (this.options.resultsURL) {
+      new Ajax.Request(this.options.resultsURL, 
+        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
+    }
+  },
+  runTests: function() {
+    var test = this.tests[this.currentTest];
+    if (!test) {
+      // finished!
+      this.postResults();
+      this.logger.summary(this.summary());
+      return;
+    }
+    if(!test.isWaiting) {
+      this.logger.start(test.name);
+    }
+    test.run();
+    if(test.isWaiting) {
+      this.logger.message("Waiting for " + test.timeToWait + "ms");
+      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
+    } else {
+      this.logger.finish(test.status(), test.summary());
+      this.currentTest++;
+      // tail recursive, hopefully the browser will skip the stackframe
+      this.runTests();
+    }
+  },
+  summary: function() {
+    var assertions = 0;
+    var failures = 0;
+    var errors = 0;
+    var messages = [];
+    for(var i=0;i<this.tests.length;i++) {
+      assertions +=   this.tests[i].assertions;
+      failures   +=   this.tests[i].failures;
+      errors     +=   this.tests[i].errors;
+    }
+    return (
+      (this.options.context ? this.options.context + ': ': '') + 
+      this.tests.length + " tests, " + 
+      assertions + " assertions, " + 
+      failures   + " failures, " +
+      errors     + " errors");
+  }
+}
+
+Test.Unit.Assertions = Class.create();
+Test.Unit.Assertions.prototype = {
+  initialize: function() {
+    this.assertions = 0;
+    this.failures   = 0;
+    this.errors     = 0;
+    this.messages   = [];
+  },
+  summary: function() {
+    return (
+      this.assertions + " assertions, " + 
+      this.failures   + " failures, " +
+      this.errors     + " errors" + "\n" +
+      this.messages.join("\n"));
+  },
+  pass: function() {
+    this.assertions++;
+  },
+  fail: function(message) {
+    this.failures++;
+    this.messages.push("Failure: " + message);
+  },
+  info: function(message) {
+    this.messages.push("Info: " + message);
+  },
+  error: function(error) {
+    this.errors++;
+    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
+  },
+  status: function() {
+    if (this.failures > 0) return 'failed';
+    if (this.errors > 0) return 'error';
+    return 'passed';
+  },
+  assert: function(expression) {
+    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
+    try { expression ? this.pass() : 
+      this.fail(message); }
+    catch(e) { this.error(e); }
+  },
+  assertEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEqual";
+    try { (expected == actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInspect: function(expected, actual) {
+    var message = arguments[2] || "assertInspect";
+    try { (expected == actual.inspect()) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertEnumEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEnumEqual";
+    try { $A(expected).length == $A(actual).length && 
+      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
+        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
+          ', actual ' + Test.Unit.inspect(actual)); }
+    catch(e) { this.error(e); }
+  },
+  assertNotEqual: function(expected, actual) {
+    var message = arguments[2] || "assertNotEqual";
+    try { (expected != actual) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertIdentical"; 
+    try { (expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNotIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertNotIdentical"; 
+    try { !(expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNull: function(obj) {
+    var message = arguments[1] || 'assertNull'
+    try { (obj==null) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertMatch: function(expected, actual) {
+    var message = arguments[2] || 'assertMatch';
+    var regex = new RegExp(expected);
+    try { (regex.exec(actual)) ? this.pass() :
+      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertHidden: function(element) {
+    var message = arguments[1] || 'assertHidden';
+    this.assertEqual("none", element.style.display, message);
+  },
+  assertNotNull: function(object) {
+    var message = arguments[1] || 'assertNotNull';
+    this.assert(object != null, message);
+  },
+  assertType: function(expected, actual) {
+    var message = arguments[2] || 'assertType';
+    try { 
+      (actual.constructor == expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotOfType: function(expected, actual) {
+    var message = arguments[2] || 'assertNotOfType';
+    try { 
+      (actual.constructor != expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertInstanceOf';
+    try { 
+      (actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was not an instance of the expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertNotInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertNotInstanceOf';
+    try { 
+      !(actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was an instance of the not expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertRespondsTo: function(method, obj) {
+    var message = arguments[2] || 'assertRespondsTo';
+    try {
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
+      this.fail(message + ": object doesn't respond to [" + method + "]"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsTrue: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsTrue';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      m() ? this.pass() : 
+      this.fail(message + ": method returned false"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsFalse: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsFalse';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      !m() ? this.pass() : 
+      this.fail(message + ": method returned true"); }
+    catch(e) { this.error(e); }
+  },
+  assertRaise: function(exceptionName, method) {
+    var message = arguments[2] || 'assertRaise';
+    try { 
+      method();
+      this.fail(message + ": exception expected but none was raised"); }
+    catch(e) {
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
+    }
+  },
+  assertElementsMatch: function() {
+    var expressions = $A(arguments), elements = $A(expressions.shift());
+    if (elements.length != expressions.length) {
+      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
+      return false;
+    }
+    elements.zip(expressions).all(function(pair, index) {
+      var element = $(pair.first()), expression = pair.last();
+      if (element.match(expression)) return true;
+      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
+    }.bind(this)) && this.pass();
+  },
+  assertElementMatches: function(element, expression) {
+    this.assertElementsMatch([element], expression);
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  },
+  _isVisible: function(element) {
+    element = $(element);
+    if(!element.parentNode) return true;
+    this.assertNotNull(element);
+    if(element.style && Element.getStyle(element, 'display') == 'none')
+      return false;
+    
+    return this._isVisible(element.parentNode);
+  },
+  assertNotVisible: function(element) {
+    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
+  },
+  assertVisible: function(element) {
+    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  }
+}
+
+Test.Unit.Testcase = Class.create();
+Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
+  initialize: function(name, test, setup, teardown) {
+    Test.Unit.Assertions.prototype.initialize.bind(this)();
+    this.name           = name;
+    
+    if(typeof test == 'string') {
+      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
+      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
+      this.test = function() {
+        eval('with(this){'+test+'}');
+      }
+    } else {
+      this.test = test || function() {};
+    }
+    
+    this.setup          = setup || function() {};
+    this.teardown       = teardown || function() {};
+    this.isWaiting      = false;
+    this.timeToWait     = 1000;
+  },
+  wait: function(time, nextPart) {
+    this.isWaiting = true;
+    this.test = nextPart;
+    this.timeToWait = time;
+  },
+  run: function() {
+    try {
+      try {
+        if (!this.isWaiting) this.setup.bind(this)();
+        this.isWaiting = false;
+        this.test.bind(this)();
+      } finally {
+        if(!this.isWaiting) {
+          this.teardown.bind(this)();
+        }
+      }
+    }
+    catch(e) { this.error(e); }
+  }
+});
+
+// *EXPERIMENTAL* BDD-style testing to please non-technical folk
+// This draws many ideas from RSpec http://rspec.rubyforge.org/
+
+Test.setupBDDExtensionMethods = function(){
+  var METHODMAP = {
+    shouldEqual:     'assertEqual',
+    shouldNotEqual:  'assertNotEqual',
+    shouldEqualEnum: 'assertEnumEqual',
+    shouldBeA:       'assertType',
+    shouldNotBeA:    'assertNotOfType',
+    shouldBeAn:      'assertType',
+    shouldNotBeAn:   'assertNotOfType',
+    shouldBeNull:    'assertNull',
+    shouldNotBeNull: 'assertNotNull',
+    
+    shouldBe:        'assertReturnsTrue',
+    shouldNotBe:     'assertReturnsFalse',
+    shouldRespondTo: 'assertRespondsTo'
+  };
+  Test.BDDMethods = {};
+  for(m in METHODMAP) {
+    Test.BDDMethods[m] = eval(
+      'function(){'+
+      'var args = $A(arguments);'+
+      'var scope = args.shift();'+
+      'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }');
+  }
+  [Array.prototype, String.prototype, Number.prototype].each(
+    function(p){ Object.extend(p, Test.BDDMethods) }
+  );
+}
+
+Test.context = function(name, spec, log){
+  Test.setupBDDExtensionMethods();
+  
+  var compiledSpec = {};
+  var titles = {};
+  for(specName in spec) {
+    switch(specName){
+      case "setup":
+      case "teardown":
+        compiledSpec[specName] = spec[specName];
+        break;
+      default:
+        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
+        var body = spec[specName].toString().split('\n').slice(1);
+        if(/^\{/.test(body[0])) body = body.slice(1);
+        body.pop();
+        body = body.map(function(statement){ 
+          return statement.strip()
+        });
+        compiledSpec[testName] = body.join('\n');
+        titles[testName] = specName;
+    }
+  }
+  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
 };
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -220,7 +220,7 @@
    -->
 
    <mbean
-      code="org.jboss.portal.core.cms.CMSObjectCommandFactory"
+      code="org.jboss.portal.core.cms.CMSObjectCommandFactoryService"
       name="portal:commandFactory=CMSObject"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -662,61 +662,21 @@
          optional-attribute-name="StackFactory">portal:service=InterceptorStackFactory,type=Server</depends>
    </mbean>
 
-   <!-- Content editor integration -->
-   <mbean
-      code="org.jboss.portal.core.cms.content.CMSContentEditor"
-      name="portal:service=ContentEditor,type=cms"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentEditorRegistry</depends>
-      <depends
-         optional-attribute-name="CMS"
-         proxy-type="attribute">portal:service=CMS</depends>
-      <attribute name="ContentType">cms</attribute>
-   </mbean>         
-
-   <mbean
-      code="org.jboss.portal.core.cms.content.CMSFaceletContentEditor"
-      name="portal:service=ContentEditor,type=cms2"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="ContentType">cms</attribute>
-      <attribute name="FaceletPath">content/editor.xhtml</attribute>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentEditorRegistry2</depends>
-      <depends
-         optional-attribute-name="CMS"
-         proxy-type="attribute">portal:service=CMS</depends>
-   </mbean>
-
    <!-- Content renderer integration -->
    <mbean
-      code="org.jboss.portal.core.cms.content.CMSContentRenderer"
+      code="org.jboss.portal.core.cms.content.InternalCMSContentProvider"
       name="portal:service=ContentRenderer,type=cms"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <attribute name="ContentType">cms</attribute>
+      <attribute name="DecorateContent">false</attribute>
+      <attribute name="PortletInstanceName">CMSPortletInstance</attribute>
       <depends
          optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentRendererRegistry</depends>
-   </mbean>
-
-   <!-- Content handler integration -->
-   <mbean
-      code="org.jboss.portal.core.cms.content.CMSContentHandler"
-      name="portal:service=ContentHandler,type=cms"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <attribute name="ContentType">cms</attribute>
+         optional-attribute-name="CommandFactory"
+         proxy-type="attribute">portal:commandFactory=CMSObject</depends>
    </mbean>
 </server>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-cms-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-core-cms-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -22,10 +22,10 @@
 ################################################################################
 
 # CMS ADMIN PORTLET
-TITLE_HEAD=Administraci�n de CMS
+TITLE_HEAD=Administraci?n de CMS
 TITLE_BROWSE=Explorador de directorios
 TITLE_DELETECONFIRM=Confirmar el borrado
-TITLE_CREATECOLLCONFIRM=Confirmar la creaci�n de directorio
+TITLE_CREATECOLLCONFIRM=Confirmar la creaci?n de directorio
 TITLE_COPYCONFIRM=Confirmar la copia del recurso
 TITLE_MOVECONFIRM=Confirmar el movimiento del recurso
 TITLE_VIEWFILE=Viendo las propiedades del fichero
@@ -33,4 +33,4 @@
 TITLE_CREATE=Crear fichero
 TITLE_UPLOAD=Subir fichero
 
-CMS_SEARCH=B�squeda
+CMS_SEARCH=B?squeda

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -23,10 +23,10 @@
 
 ## CMS ADMIN PORTLET
 TITLE_HEAD=CMS Admin
-TITLE_BROWSE=Navegador de Diret�rios
+TITLE_BROWSE=Navegador de Diret?rios
 TITLE_FILEBROWSE=Navegador de Arquivos
-TITLE_DELETECONFIRM=Confirmar remo��o
-TITLE_CREATECOLLCONFIRM=Confirmar cria��o de diret�rio
+TITLE_DELETECONFIRM=Confirmar remo??o
+TITLE_CREATECOLLCONFIRM=Confirmar cria??o de diret?rio
 TITLE_COPYCONFIRM=Confirm Resource Copy
 TITLE_MOVECONFIRM=Confirm Resource Move
 TITLE_VIEWFILE=Visualizando Propriedades de Arquivo
@@ -35,13 +35,13 @@
 TITLE_UPLOAD=Enviar Arquivo
 
 CMS_SEARCH=Pesquisar
-CMS_MENU=Menu de A��es
-CMS_ACTION=A��o
+CMS_MENU=Menu de A??es
+CMS_ACTION=A??o
 CMS_NAME=Nome
 CMS_TYPE=Tipo
 CMS_CREATED=Criado
 CMS_MODIFIED=Modificado
-CMS_DESCRIPTION=Descri��o
+CMS_DESCRIPTION=Descri??o
 CMS_VIEW=Visualizar
 CMS_COPY=Copiar
 CMS_MOVE=Mover
@@ -54,27 +54,27 @@
 CMS_UPLOAD=Enviar
 CMS_MODIFY=Modificar
 CMS_CREATEFOLDER=Criar Pasta
-CMS_CREATEFILE=Criar Diret�rio
+CMS_CREATEFILE=Criar Diret?rio
 CMS_UPLOADARCHIVE=Enviar Arquivo
-CMS_BACKTOBROWSER=Voltar ao Navegador de Diret�rios
+CMS_BACKTOBROWSER=Voltar ao Navegador de Diret?rios
 
-CMS_CREATEFILEINDIR=Criando Arquivo em Diret�rio
+CMS_CREATEFILEINDIR=Criando Arquivo em Diret?rio
 CMS_FILENAME=Nome do Arquivo
-CMS_TITLE=T�tulo
-CMS_LANGUAGE=L�ngua
+CMS_TITLE=T?tulo
+CMS_LANGUAGE=L?ngua
 
-CMS_DELETEPATH=Confirmar remo��o de
-CMS_DELETEWARN1=ATEN��O\! Voc� n�o poderar desfazer estas altera��es\!
-CMS_DELETEWARN2=Voc� tem certeza que deseja remover\?
+CMS_DELETEPATH=Confirmar remo??o de
+CMS_DELETEWARN1=ATEN??O\! Voc? n?o poderar desfazer estas altera??es\!
+CMS_DELETEWARN2=Voc? tem certeza que deseja remover\?
 
 CMS_DESTINATION=Destino
 CMS_SOURCE=Fonte
 
 CMS_EDITING=Editando Arquivo
 CMS_LIVE=Tornar \"Ativo\"
-CMS_VERSION=Vers�o
+CMS_VERSION=Vers?o
 
-CMS_LIVEVERSION=Vers�o \"Ativa\"
+CMS_LIVEVERSION=Vers?o \"Ativa\"
 CMS_SIZE=Tamanho
 
 CMS_CONTENT_DIR=Content Directory

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,123 +0,0 @@
-<%@ page import="org.jboss.portal.cms.model.File" %>
-<%@ page import="org.jboss.portal.cms.model.Folder" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
-<%@ page import="java.text.Format" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.StringTokenizer" %>
-<%@ page import="javax.portlet.PortletURL" %>
-<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored="false" %>
-
-<portlet:defineObjects/>
-
-<%
-   String sCurrPath = (String)request.getAttribute("currpath");
-   List folders = (List)request.getAttribute("folders");
-   List files = (List)request.getAttribute("files");
-   String uri = (String)renderRequest.getParameter("content.uri");
-   PortletURL url = renderResponse.createRenderURL();
-   url.setParameter("op", CMSAdminConstants.OP_MAIN);
-   url.setParameter("path", "/");
-%>
-
-<!-- Currently browsing -->
-Browsing: <a href="<%= url %>">Home</a>
-<%
-   StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
-   String sPathBuilder = "";
-   while (parser.hasMoreTokens())
-   {
-      String sPathChunk = parser.nextToken();
-      sPathBuilder += "/" + sPathChunk;
-      if (parser.hasMoreTokens())
-      {
-         url.setParameter("path", sPathBuilder);
-%>
->&nbsp;<a href="<%= url %>"><%= sPathChunk %>
-</a>
-<%
-}
-else
-{
-%>
->&nbsp;<%= sPathChunk %>
-<%
-      }
-   }
-%>
-
-<br/><br/>
-
-<%
-
-   if (folders.size() > 0 || files.size() > 0)
-   {
-
-%>
-
-<table width="100%" border="0" cellspacing="2" cellpadding="2">
-<tr>
-   <td class="portlet-section-header">${n:i18n("CMS_NAME")}</td>
-</tr>
-
-<%
-   if (folders.size() > 0)
-   {
-      for (int i = 0; i < folders.size(); i++)
-      {
-         Folder folder = (Folder)folders.get(i);
-         url.setParameter("path", folder.getBasePath());
-%>
-<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
-   <td><img
-      src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif"
-      alt="${n:i18n("CMS_FOLDER")}"
-      border="0">&nbsp;<a href="<%= url %>"><%=
-   folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %>
-   </a>
-   </td>
-</tr>
-<%
-      }
-   }
-   if (files.size() > 0)
-   {
-      for (int j = 0; j < files.size(); j++)
-      {
-         File file = (File)files.get(j);
-
-         PortletURL metaURL = renderResponse.createActionURL();
-         metaURL.setParameter("content.uri", file.getBasePath());
-         metaURL.setParameter("path", sCurrPath);
-         metaURL.setParameter("content.action.select", "select");
-
-         if ((uri!=null) && (uri.equals(file.getBasePath())))
-         {
-            out.println("<tr class=\"portlet-section-selected\">");
-         }
-         else
-         {
-            out.println("<tr onmouseover=\"this.className='portlet-section-alternate';\" onmouseout=\"this.className='portlet-section-body';\">");
-         }
-%>
-<tr>
-   <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif"
-            alt="${n:i18n("CMS_FILE")}"
-            border="0">&nbsp;<a href="<%= metaURL %>"><%=
-   file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %>
-   </a>
-   </td>
-</tr>
-<%
-      }
-   }
-%>
-</table>
-<%
-
-   }
-
-%>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,123 @@
+<%@ page import="org.jboss.portal.cms.model.File" %>
+<%@ page import="org.jboss.portal.cms.model.Folder" %>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page import="java.text.Format" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.StringTokenizer" %>
+<%@ page import="javax.portlet.PortletURL" %>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<%
+   String sCurrPath = (String)request.getAttribute("currpath");
+   List folders = (List)request.getAttribute("folders");
+   List files = (List)request.getAttribute("files");
+   String uri = (String)renderRequest.getParameter("content.uri");
+   PortletURL url = renderResponse.createRenderURL();
+   url.setParameter("op", CMSAdminConstants.OP_MAIN);
+   url.setParameter("path", "/");
+%>
+
+<!-- Currently browsing -->
+Browsing: <a href="<%= url %>">Home</a>
+<%
+   StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
+   String sPathBuilder = "";
+   while (parser.hasMoreTokens())
+   {
+      String sPathChunk = parser.nextToken();
+      sPathBuilder += "/" + sPathChunk;
+      if (parser.hasMoreTokens())
+      {
+         url.setParameter("path", sPathBuilder);
+%>
+>&nbsp;<a href="<%= url %>"><%= sPathChunk %>
+</a>
+<%
+}
+else
+{
+%>
+>&nbsp;<%= sPathChunk %>
+<%
+      }
+   }
+%>
+
+<br/><br/>
+
+<%
+
+   if (folders.size() > 0 || files.size() > 0)
+   {
+
+%>
+
+<table width="100%" border="0" cellspacing="2" cellpadding="2">
+<tr>
+   <td class="portlet-section-header">${n:i18n("CMS_NAME")}</td>
+</tr>
+
+<%
+   if (folders.size() > 0)
+   {
+      for (int i = 0; i < folders.size(); i++)
+      {
+         Folder folder = (Folder)folders.get(i);
+         url.setParameter("path", folder.getBasePath());
+%>
+<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
+   <td><img
+      src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif"
+      alt="${n:i18n("CMS_FOLDER")}"
+      border="0">&nbsp;<a href="<%= url %>"><%=
+   folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %>
+   </a>
+   </td>
+</tr>
+<%
+      }
+   }
+   if (files.size() > 0)
+   {
+      for (int j = 0; j < files.size(); j++)
+      {
+         File file = (File)files.get(j);
+
+         PortletURL metaURL = renderResponse.createActionURL();
+         metaURL.setParameter("content.uri", file.getBasePath());
+         metaURL.setParameter("path", sCurrPath);
+         metaURL.setParameter("content.action.select", "select");
+
+         if ((uri!=null) && (uri.equals(file.getBasePath())))
+         {
+            out.println("<tr class=\"portlet-section-selected\">");
+         }
+         else
+         {
+            out.println("<tr onmouseover=\"this.className='portlet-section-alternate';\" onmouseout=\"this.className='portlet-section-body';\">");
+         }
+%>
+<tr>
+   <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif"
+            alt="${n:i18n("CMS_FILE")}"
+            border="0">&nbsp;<a href="<%= metaURL %>"><%=
+   file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %>
+   </a>
+   </td>
+</tr>
+<%
+      }
+   }
+%>
+</table>
+<%
+
+   }
+
+%>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -68,4 +68,24 @@
          <title>CMS Administration</title>
       </portlet-info>
    </portlet>
+   
+   <portlet>
+      <description>CMS Content Editor</description>
+      <portlet-name>CMSContentEditorPortlet</portlet-name>
+      <display-name>CMS Content Editor</display-name>
+
+      <portlet-class>org.jboss.portal.core.cms.ui.admin.CMSContentEditorPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <supported-locale>en</supported-locale>
+      <supported-locale>fr</supported-locale>
+      <supported-locale>es</supported-locale>
+      <resource-bundle>Resource</resource-bundle>
+      <portlet-info>
+         <title>CMS Content Type</title>
+      </portlet-info>
+   </portlet>
+   
 </portlet-app>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-workflow.sar/portal-workflow-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -177,6 +177,8 @@
 
 NAMENOTAVAILABLE=N/A
 
+MODIFIED_PROFILE=Your profile has been modified, the portal will be running with your former profile until you log back in.
+
 # Registration
 REGISTER_NOT_LOGGED_IN=You are currently not logged in.
 REGISTER_REGISTER=You can create an account.
@@ -303,12 +305,6 @@
 ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
 ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
 
-VALIDATIONEMAIL_1=A user with this email address has registered on our site.
-VALIDATIONEMAIL_2=Please keep this email for your records. Your account information is as follows
-VALIDATIONEMAIL_3=Your account is currently inactive. You cannot use it until you visit the following link
-VALIDATIONEMAIL_4=If you did not register for membership on our site, no further action is required.
-VALIDATIONEMAIL_5=Regards,\nThe staff.
-
 PERMISSION_PICKPORTLET=Portlet Permissions Administration
 PERMISSION_PERMISSIONS=Permissions to modify
 PERMISSION_TOP=Select a Component to Modify

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -21,35 +21,35 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
 
-_ASREGISTERED=�No tiene una cuenta todav�a? Puede crear <a href\="">una</a>.
+_ASREGISTERED=?No tiene una cuenta todav?a? Puede crear <a href\="">una</a>.
 _BLOCKNICKNAME=Usuario
 _BLOCKPASSWORD=Clave
 
 
 
-MessageOrder=�rden de Mensajes
+MessageOrder=?rden de Mensajes
 Ascending=Ascendente
 Descending=Descendente
 
-AIM=AIM Direcci�n
-ICQ=ICQ N�mero
-YIM=YIM N�mero
+AIM=AIM Direcci?n
+ICQ=ICQ N?mero
+YIM=YIM N?mero
 MSNM=MSN Messenger
 
-YourAIM=Su direcci�n AIM
-YourICQ=Su n�mero ICQ
-YourYIM=Su n�mero YIM
+YourAIM=Su direcci?n AIM
+YourICQ=Su n?mero ICQ
+YourYIM=Su n?mero YIM
 YourMSNM=Su Messenger MSN
 
 MyEmail=Mi e-mail
-MyHomePage=Mi p�gina de inicio
+MyHomePage=Mi p?gina de inicio
 
 Question=Pregunta secreta
 Answer=Respuesta secreta
 Location=Residencia
 Occupation=Puesto
 Interests=Intereses
-ExtraInfo=Informaci�n extra
+ExtraInfo=Informaci?n extra
 YourLocation=Su residencia
 YourOccupation=Su puesto
 YourInterests=Sus intereses
@@ -59,63 +59,63 @@
 Register=Registro.
 
 UserExist=Ese usuario ya existe
-ToChangeInfo=para cambiar tu informaci�n
-EmailVerify=�Enlace de activaci�n enviado! Comprueba tu correo y pincha en en enlace de activaci�n para activar tu cuenta.
-AccountActivated=�Cuenta activada!
+ToChangeInfo=para cambiar tu informaci?n
+EmailVerify=?Enlace de activaci?n enviado! Comprueba tu correo y pincha en en enlace de activaci?n para activar tu cuenta.
+AccountActivated=?Cuenta activada!
 UnableActivate=Imposible validar el nuevo usuario.
-LoggingYou=Autenticando, \�espere\!
-YouAreLoggedOut=\�Ahora ya est�s autenticado\!
-PassDifferent=Las claves son diferentes. Tienen que ser id�nticas.
+LoggingYou=Autenticando, \?espere\!
+YouAreLoggedOut=\?Ahora ya est?s autenticado\!
+PassDifferent=Las claves son diferentes. Tienen que ser id?nticas.
 YourPassMustBe=Lo sentimos, su clave debe ser por lo menos de
 CharLong=caracteres
-UserNotExist=\�El usuario no existe\!
-UserRegLogin=Registro de usuario/autenticaci�n
-SelectOption=por favor, elija una opci�n del men� siguiente\:
+UserNotExist=\?El usuario no existe\!
+UserRegLogin=Registro de usuario/autenticaci?n
+SelectOption=por favor, elija una opci?n del men? siguiente\:
 RetrievePass=Recuperar la clave perdida.
 RegNewUser=Registro de un nuevo usuario
 PasswordAgain=Confirme su clave
 Email=E-mail
 Options=Opciones
-AllowEmailView=Permitir a otros usuarios ver mi direcci�n de e-mail
-AsRegUser=Como usuario registrado, usted podr�\:
+AllowEmailView=Permitir a otros usuarios ver mi direcci?n de e-mail
+AsRegUser=Como usuario registrado, usted podr?\:
 AsReg6=Elegir diferentes estilos
 AsReg5=Personalizar los comentarios
-AsReg4=Elegir cu�ntos objetos nuevos mostrar en la p�gina de inicio
-AsReg3=Tener un buz�n personal en la p�gina de inicio
+AsReg4=Elegir cu?ntos objetos nuevos mostrar en la p?gina de inicio
+AsReg3=Tener un buz?n personal en la p?gina de inicio
 AsReg2=Enviar noticias con su usuario
 AsReg1=Responder con su usuario.
-RegisterNow=\�Reg�strese ahora\! \�Es gratis\!
-WeDontGive=No venderemos o daremos a otros su informaci�n personal.
+RegisterNow=\?Reg?strese ahora\! \?Es gratis\!
+WeDontGive=No venderemos o daremos a otros su informaci?n personal.
 WelcomeTo=Bienvenido a
 Registration=la zona de registro.
 
 Over13_1=Tengo
-Over13_2=o m�s a�os o tengo consentimiento paterno
+Over13_2=o m?s a?os o tengo consentimiento paterno
 MustBe_1=Debe tener
-MustBe_2=o m�s a�os, o tener permiso paterno para registrarse.
+MustBe_2=o m?s a?os, o tener permiso paterno para registrarse.
 Consent_1=(Pinchando en el enlace superior usted certifica que tiene<br>
-Consent_2=o m�s a�os, o que tiene permiso paterno para registrarse.)
+Consent_2=o m?s a?os, o que tiene permiso paterno para registrarse.)
 Under13_1=Tengo menos de
-Under13_2=a�os y no tengo consentimiento paterno.
+Under13_2=a?os y no tengo consentimiento paterno.
 
 Sorry=Lo sentimos.
 Click=Por favor, pinche
-Here=aqu�
-Return=para volver a la p�gina principal.
+Here=aqu?
+Return=para volver a la p?gina principal.
 UserName=Usuario
-GoBack=Atr�s
+GoBack=Atr?s
 Finish=Finalizar
-PersonalInfo=Informaci�n personal
+PersonalInfo=Informaci?n personal
 RealName=Nombre real
 Optional=(opcional)
 CanKnowAbout=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
 Language=Lenguaje
-255CharMax=(255 caracteres max. Introduzca su firma en c�digo HTML)
+255CharMax=(255 caracteres max. Introduzca su firma en c?digo HTML)
 YourAvatar=Su avatar
-YourHomePage=Su p�gina de inicio
+YourHomePage=Su p?gina de inicio
 TimeZoneOffset=Zona horaria
-EmailNotPublic=(Este correo no ser� p�blico pero es necesario.  Se usar� para enviarle su clave en caso de p�rdida)
-EmailPublic=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
+EmailNotPublic=(Este correo no ser? p?blico pero es necesario.  Se usar? para enviarle su clave en caso de p?rdida)
+EmailPublic=(Este correo ser? p?blico. Escriba lo que quiera. Prueba de Spam)
 RealEmail=E-mail real
 FakeEmail=E-mail de pega
 NewUser=Nuevo usuario
@@ -125,35 +125,35 @@
 Search=Buscar
 All=Todos
 UsersFoundFor=usuarios encontrados para
-Pages=p�ginas
+Pages=p?ginas
 UsersShown=usuarios mostrados
 Delete=Borrar
 Edit=Editar
 Ok=Aceptar
 Cancel=Cancelar
-AreYouSureToDeleteUser=�De verdad quiere borrar el usuario?
+AreYouSureToDeleteUser=?De verdad quiere borrar el usuario?
 UserDeleted=Usuario borrado
 ReturnToMemberList=Volver a la lista de miembros
 Avatar=Avatar
 AdminFunctions=Tareas administrativas
 URL=URL
-UpdateUser=Actualizaci�n de usuario
+UpdateUser=Actualizaci?n de usuario
 UserID=ID de usuario
-ForChanges=(S�lo para cambios)
+ForChanges=(S?lo para cambios)
 MemberList=Lista de miembros
 SearchTip=Sugerencia: escoja una letra, muestre todos o busque un usuario si conoce su nombre
 
-ThemeText1=Esta opci�n cambia la apariencia de todo el sitio.
-ThemeText2=Estos cambios s�lo le afectar�n a usted.
+ThemeText1=Esta opci?n cambia la apariencia de todo el sitio.
+ThemeText2=Estos cambios s?lo le afectar?n a usted.
 ThemeText3=Cada usuario puede ver el sitio con una apariencia diferente.
 SelectTheme=Elegir un estilo
-ThemeSelection=Elecci�n de estilo
+ThemeSelection=Elecci?n de estilo
 
 CannotLogin=No se puede autenticar
 
-LoginInvalidName=El nombre de usuario no es v�lido
+LoginInvalidName=El nombre de usuario no es v?lido
 LoginNoSuchUser=el nombre de usuario no existe
-LoginBadPassword=su contrase�a no coincide
+LoginBadPassword=su contrase?a no coincide
 LoginUnexpectedError=error inesperado
 LoginUserDisabled=su cuenta ha sido bloqueada. Por favor, contacte con un administrador.
 
@@ -161,7 +161,7 @@
 Disable=Desactivar
 StatusChanged=El estado del usuario ha sido cambiado
 
-NotAuth=Usted no est� autorizado para realizar esta operaci�n
+NotAuth=Usted no est? autorizado para realizar esta operaci?n
 
 REMEMBERME=Recordarme
 LOGIN=Login
@@ -172,7 +172,7 @@
 OPTIONAL=Opcional
 REQUIRED=Obligatorio
 
-255MAX=(Firma de 255 caract�res max)
+255MAX=(Firma de 255 caract?res max)
 
 NAMENOTAVAILABLE=N/A
 
@@ -183,28 +183,28 @@
 REGISTER_NEWUSER=Registro de nuevo usuario
 REGISTER_PASSWORDAGAIN=Confirme su clave
 REGISTER_REALEMAIL=E-mail real
-REGISTER_EMAILNOTPUBLIC=(Este correo no ser� p�blico pero es necesario.  Se usar� para enviarle su clave en caso de p�rdida)
+REGISTER_EMAILNOTPUBLIC=(Este correo no ser? p?blico pero es necesario.  Se usar? para enviarle su clave en caso de p?rdida)
 REGISTER_FAKEEMAIL=E-mail de pega
-REGISTER_EMAILPUBLIC=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
-REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no est� vac�o, el e-mail real s�lo se usar� para enviarle notificaciones
+REGISTER_EMAILPUBLIC=(Este correo ser? p?blico. Escriba lo que quiera. Prueba de Spam)
+REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no est? vac?o, el e-mail real s?lo se usar? para enviarle notificaciones
 REGISTER_QUESTION=Pregunta secreta
 REGISTER_ANSWER=Respuesta secreta
-REGISTER_ASREGUSER=Como usuario registrado, usted podr�:
+REGISTER_ASREGUSER=Como usuario registrado, usted podr?:
 REGISTER_ASREG6=Elegir diferentes estilos
 REGISTER_ASREG5=Personalizar los comentarios
-REGISTER_ASREG4=Elegir cu�ntos objetos nuevos mostrar en la p�gina de inicio
-REGISTER_ASREG3=Tener un buz�n personal en la p�gina de inicio
+REGISTER_ASREG4=Elegir cu?ntos objetos nuevos mostrar en la p?gina de inicio
+REGISTER_ASREG3=Tener un buz?n personal en la p?gina de inicio
 REGISTER_ASREG2=Enviar noticias con su usuario
 REGISTER_ASREG1=Responder con su usuario.
-REGISTER_REGISTERNOW=�Reg�strese ahora! �Es gratis!
-REGISTER_WEDONTGIVE=No venderemos o daremos a otros su informaci�n personal.
+REGISTER_REGISTERNOW=?Reg?strese ahora! ?Es gratis!
+REGISTER_WEDONTGIVE=No venderemos o daremos a otros su informaci?n personal.
 REGISTER_ALREADYHAVEACCOUNT=Usted ya tiene una cuenta:
 REGISTER_SIGNIN=Entrar
 REGISTER_GIVENNAME=Nombre
 REGISTER_FAMILYNAME=Apellido
-REGISTER_PERSONALINFO=Informaci�n personal
-REGISTER_VIEWREALEMAIL=Permitir a otros usuarios ver mi direcci�n de e-mail real
-REGISTER_HOMEPAGE=Direcci�n de su pagina personal
+REGISTER_PERSONALINFO=Informaci?n personal
+REGISTER_VIEWREALEMAIL=Permitir a otros usuarios ver mi direcci?n de e-mail real
+REGISTER_HOMEPAGE=Direcci?n de su pagina personal
 REGISTER_TIMEZONEOFFSET=Zona horaria
 REGISTER_THEME=Estilo
 REGISTER_DEFAULT_THEME=Site Default
@@ -218,26 +218,26 @@
 REGISTER_OCCUPATION=Puesto
 REGISTER_INTERESTS=Intereses
 REGISTER_SIGNATURE=Firma
-REGISTER_EXTRAINFO=Informaci�n adicional
+REGISTER_EXTRAINFO=Informaci?n adicional
 REGISTER_CANKNOWABOUT=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
 REGISTER_SAVECHANGES=Guardar cambios
-REGISTER_CONFIRMATIONEMAIL=email de confirmaci�n
+REGISTER_CONFIRMATIONEMAIL=email de confirmaci?n
 
-REGISTER_SHOWMENU=Volver al men� de usuario
+REGISTER_SHOWMENU=Volver al men? de usuario
 
-REGISTER_ERROR_INVALIDUSERNAME=El usuario no es v�lido
+REGISTER_ERROR_INVALIDUSERNAME=El usuario no es v?lido
 REGISTER_ERROR_EXISTINGUSERNAME=Este usuario ya existe
-REGISTER_ERROR_INVALIDPASSWORD1=La clave no es v�lida
-REGISTER_ERROR_INVALIDPASSWORD2=La clave no es v�lida
+REGISTER_ERROR_INVALIDPASSWORD1=La clave no es v?lida
+REGISTER_ERROR_INVALIDPASSWORD2=La clave no es v?lida
 REGISTER_ERROR_PASSWORDMISMATCH=Las Claves no coincide
-REGISTER_ERROR_INVALIDREALEMAIL=La direcci�n de E-mail no es v�lida
+REGISTER_ERROR_INVALIDREALEMAIL=La direcci?n de E-mail no es v?lida
 
 MENU_LOGOUT=Desconectarse
 MENU_EDITPROFILE=Editar su perfil
 MENU_LISTUSERS=Listar todos los usuarios
 
 LIST_FILTERS=Aplicar filtros a la lista
-LIST_USERSPERPAGE=N�mero de usuarios por p�gina
+LIST_USERSPERPAGE=N?mero de usuarios por p?gina
 LIST_USERNAMECONTAINS=Usuario contiene
 LIST_FULLNAME=Nombre completo
 LIST_USERNAME=Nombre de usuario
@@ -249,8 +249,8 @@
 LIST_ACTIONDELETEUSER=Borrar el usario
 FILTER=Filtro
 
-NEXTPAGE=P�gina siguiente
-PREVIOUSPAGE=P�gina anterior
+NEXTPAGE=P?gina siguiente
+PREVIOUSPAGE=P?gina anterior
 
 ASSIGNROLES=Asignar roles
 ROLESAVAILABLE=Roles disponibles
@@ -273,7 +273,7 @@
 ROLE_DELETE=Borrar el rol elegido
 ROLE_DELETED=El rol ha sido borrado
 ROLE_EDIT_MEMBERS=Editar miembros del rol
-ROLE_MAINLIST=Volver a edici�n de roles
+ROLE_MAINLIST=Volver a edici?n de roles
 
 ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Ya existe un rol con ese nombre para mostrar
 ROLE_ERROR_NAMEALREADYEXISTS=Ya existe un rol con ese nombre
@@ -286,17 +286,11 @@
 MENU_EDITROLE=Editar un rol existente
 MENU_EDITROLEMEMBERS=Editar los miembros de un rol
 
-VALIDATIONEMAIL_1=Un usuario con esta direcci�n de email se ha registado en nuestro sitio.
-VALIDATIONEMAIL_2=Por favor, mantenga este correo para su registro. La informaci�n de su cuenta es la siguiente
-VALIDATIONEMAIL_3=Su cuenta est� actualmente inactiva. No puede usarla hasta que visite el siguiente enlace
-VALIDATIONEMAIL_4=Si no se ha registrado como miembro en nuestro sitio, no es necesario que haga nada m�s.
-VALIDATIONEMAIL_5=Saludos,\nEl personal.
-
-PERMISSION_PICKPORTLET=Permisos de administraci�n de portlets
-PERMISSION_PERMISSIONS=Permisos para modificaci�n
+PERMISSION_PICKPORTLET=Permisos de administraci?n de portlets
+PERMISSION_PERMISSIONS=Permisos para modificaci?n
 PERMISSION_TOP=Elegir un componente para modificar
 PERMISSION_FINERGRAIN=Elegir un sub-componente para definir sus permisos
-PERMISSION_MODIFYROLES=A�adir/Borrar roles
+PERMISSION_MODIFYROLES=A?adir/Borrar roles
 PERMISSION_MODIFYINGROLES=Modificar roles para
 PERMISSION_DOMAIN=Dominio
 PERMISSION_DOMAIN_MOD=Modificar el dominio

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -254,11 +254,6 @@
 MENU_CREATEROLE=Creer nouveau role
 MENU_EDITROLE=Editer un role existant
 
-VALIDATIONEMAIL_1=Un utilisateur s'est enregistre avec cette adresse email.
-VALIDATIONEMAIL_2=Merci de garder cet email. Vos informations sont les suivantes
-VALIDATIONEMAIL_3=Votre compte est desactive pour le moment. Vous en pouvez pas l'utiliser tant que vous n'aurez pas clique sur le lien suivant
-VALIDATIONEMAIL_4=Si vous n'avez pas demande a etre membre, ne faite rien.
-VALIDATIONEMAIL_5=Cordialement.
 TITLE_FILEBROWSE=Explorateur de fichier
 _ASREGISTERED=Vous n'avez pas de compte? vous pouvez en cr\u00E9er <a href\="">un</a>.
 Question=Question secr\u00E8te

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -21,8 +21,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
 
-_ASREGISTERED=Ainda n�o possu� uma conta? Voc� pode <a href\="">criar uma</a>.
-_BLOCKNICKNAME=Usu�rio
+_ASREGISTERED=Ainda n?o possu? uma conta? Voc? pode <a href\="">criar uma</a>.
+_BLOCKNICKNAME=Usu?rio
 _BLOCKPASSWORD=Senha
 
 MessageOrder=Ordem
@@ -45,214 +45,214 @@
 Question=Pergunta secreta
 Answer=Resposta secreta
 Location=Localidade
-Occupation=Profiss�o
+Occupation=Profiss?o
 Interests=Interesses
-ExtraInfo=Informa��o Extra
+ExtraInfo=Informa??o Extra
 YourLocation=Sua localidade
-YourOccupation=Sua profiss�o
+YourOccupation=Sua profiss?o
 YourInterests=Seus interesses
 Signature=Assinatura
 
 LoginSite=Entrar.
 Register=Registrar.
 
-UserExist=Usu�rio j� existe
+UserExist=Usu?rio j? existe
 ToChangeInfo=para mudar seus dados
-EmailVerify=Endere�o de ativa��o enviado! Verifique seu email e clique no link de ativa��o para ativar sua conta.
+EmailVerify=Endere?o de ativa??o enviado! Verifique seu email e clique no link de ativa??o para ativar sua conta.
 AccountActivated=Conta ativada com sucesso!
-UnableActivate=N�o foi possivel v�lidar usu�rio.
+UnableActivate=N?o foi possivel v?lidar usu?rio.
 LoggingYou=Entrando, aguarde\!
-YouAreLoggedOut=Voc� n�o est� deslogado\!
-PassDifferent=As senhas s�o diferentes. Devem ser id�nticas.
+YouAreLoggedOut=Voc? n?o est? deslogado\!
+PassDifferent=As senhas s?o diferentes. Devem ser id?nticas.
 YourPassMustBe=Desculpe, sua senha deve ter pelo menos
-CharLong=d�gitos
-UserNotExist=Usu�rio n�o encontrado\!
+CharLong=d?gitos
+UserNotExist=Usu?rio n?o encontrado\!
 UserRegLogin=User registration/login
-SelectOption=Selecione uma op��o do menu abaixo\:
+SelectOption=Selecione uma op??o do menu abaixo\:
 RetrievePass=Recuperar senha.
 RegNewUser=New user registration
 PasswordAgain=Confirme sua senha
 Email=E-mail
-Options=Op��es
-AllowEmailView=Permitir outros usu�rios visualizarem meu endere�o e-mail
-AsRegUser=Como usu�rio registrado voc� pode\:
+Options=Op??es
+AllowEmailView=Permitir outros usu?rios visualizarem meu endere?o e-mail
+AsRegUser=Como usu?rio registrado voc? pode\:
 AsReg6=Selecionar temas diferentes
-AsReg5=Personalizar os coment�rios
-AsReg4=Seleciona quantos items devem ser mostrados na p�gina principal
+AsReg5=Personalizar os coment?rios
+AsReg4=Seleciona quantos items devem ser mostrados na p?gina principal
 AsReg3=
-AsReg2=Enviar not�cias com seu nome de usu�rio
-AsReg1=Postar coment�rios com seu nome de usu�rio
-RegisterNow=Registre agora\! � de gra�a\!
-WeDontGive=N�s n�o vendemos/distribu�mos suas informa��es pessoais.
-WelcomeTo=Bem-vido �
-Registration=�rea de registro.
+AsReg2=Enviar not?cias com seu nome de usu?rio
+AsReg1=Postar coment?rios com seu nome de usu?rio
+RegisterNow=Registre agora\! ? de gra?a\!
+WeDontGive=N?s n?o vendemos/distribu?mos suas informa??es pessoais.
+WelcomeTo=Bem-vido ?
+Registration=?rea de registro.
 
 Over13_1=Eu sou
-Over13_2=de maior ou tenho consentimento de respons�veis
-MustBe_1=Voc� deve ser
-MustBe_2=de maior, ou permiss�o de respons�veis para me registrar aqui.
-Consent_1=(Ao clicar no link acima voc� garante que voc� �<br>
-Consent_2=de maior, ou possu� permiss�o de respons�veis para se registrar.)
+Over13_2=de maior ou tenho consentimento de respons?veis
+MustBe_1=Voc? deve ser
+MustBe_2=de maior, ou permiss?o de respons?veis para me registrar aqui.
+Consent_1=(Ao clicar no link acima voc? garante que voc? ?<br>
+Consent_2=de maior, ou possu? permiss?o de respons?veis para se registrar.)
 Under13_1=Eu sou de menor
-Under13_2=e n�o tenho permiss�o de respons�veis.
+Under13_2=e n?o tenho permiss?o de respons?veis.
 
 Sorry=Desculpe.
 Click=Por favor, clique
 Here=aqui
-Return=para retornar � p�gina principal.
-UserName=Usu�rio
+Return=para retornar ? p?gina principal.
+UserName=Usu?rio
 GoBack=Voltar
 Finish=Terminar
-PersonalInfo=Informa��o Pessoal
+PersonalInfo=Informa??o Pessoal
 RealName=Nome Real
 Optional=(opcional)
-CanKnowAbout=(255 letras no m�x. Digite o que voc� gostaria que os outros soubessem sobre voc�)
-Language=L�ngua
-255CharMax=(255 letras no m�x. Digite sua assinatura com c�digos HMTL)
+CanKnowAbout=(255 letras no m?x. Digite o que voc? gostaria que os outros soubessem sobre voc?)
+Language=L?ngua
+255CharMax=(255 letras no m?x. Digite sua assinatura com c?digos HMTL)
 YourAvatar=Seu avatar
 YourHomePage=Seu website
-TimeZoneOffset=Fuso hor�rio
-EmailNotPublic=(Esse email n�o ser� mostrado, mas � necess�rio. Ser� usado para enviar sua senha em caso de perda.)
-EmailPublic=(Esse email ser� mostrado. Entre o que desejar.)
+TimeZoneOffset=Fuso hor?rio
+EmailNotPublic=(Esse email n?o ser? mostrado, mas ? necess?rio. Ser? usado para enviar sua senha em caso de perda.)
+EmailPublic=(Esse email ser? mostrado. Entre o que desejar.)
 RealEmail=E-mail real
 FakeEmail=E-mail falso
-Required=(necess�rio)
-NewUser=Novo usu�rio
-SaveChanges=Salvar Mudan�as
-SaveChange=Salvar Mudan�a
-TypeNewPassword=(digite uma senha nova duas vezes para alter�-la)
+Required=(necess?rio)
+NewUser=Novo usu?rio
+SaveChanges=Salvar Mudan?as
+SaveChange=Salvar Mudan?a
+TypeNewPassword=(digite uma senha nova duas vezes para alter?-la)
 Search=Procurar
 All=Todos
-UsersFoundFor=usu�rios encontrados para
-Pages=p�ginas
-UsersShown=usu�rios mostrados
+UsersFoundFor=usu?rios encontrados para
+Pages=p?ginas
+UsersShown=usu?rios mostrados
 Delete=Remover
 Edit=Editar
 Ok=Ok
 Cancel=Cancelar
-AreYouSureToDeleteUser=Voc� tem certeza que deseja remover o usu�rio?
-UserDeleted=Usu�rio removido
-ReturnToMemberList=Voltar � lista de usu�rios
+AreYouSureToDeleteUser=Voc? tem certeza que deseja remover o usu?rio?
+UserDeleted=Usu?rio removido
+ReturnToMemberList=Voltar ? lista de usu?rios
 Avatar=Avatar
-AdminFunctions=Opera��es Admin
+AdminFunctions=Opera??es Admin
 URL=URL
-UpdateUser=Atualizar usu�rio
-UserID=ID do Usu�rio
-ForChanges=(Para altera��es apenas)
+UpdateUser=Atualizar usu?rio
+UserID=ID do Usu?rio
+ForChanges=(Para altera??es apenas)
 MemberList=Lista de membros
-SearchTip=Dica: escolha uma letra, mostre todos ou procure por um usu�rio se voc� sabe seu nome.
+SearchTip=Dica: escolha uma letra, mostre todos ou procure por um usu?rio se voc? sabe seu nome.
 
-ThemeText1=Essa op��o vai alterar o visual de todo o site.
-ThemeText2=Essas mudan�as ser�o v�lidas apenas para voc�.
-ThemeText3=Cada usu�rio pode ver o site com um tema diferente.
+ThemeText1=Essa op??o vai alterar o visual de todo o site.
+ThemeText2=Essas mudan?as ser?o v?lidas apenas para voc?.
+ThemeText3=Cada usu?rio pode ver o site com um tema diferente.
 SelectTheme=Selecione um tema
-ThemeSelection=Sele��o de Tema
+ThemeSelection=Sele??o de Tema
 
-CannotLogin=N�o foi poss�vel efetuar o login
+CannotLogin=N?o foi poss?vel efetuar o login
 
-LoginInvalidName=o nome do usu�rio n�o � v�lido
-LoginNoSuchUser=o nome do usu�rio n�o existe
-LoginBadPassword=sua senha n�o est� correta
+LoginInvalidName=o nome do usu?rio n?o ? v?lido
+LoginNoSuchUser=o nome do usu?rio n?o existe
+LoginBadPassword=sua senha n?o est? correta
 LoginUnexpectedError=unexpected error
 LoginUserDisabled=sua conta foi bloqueada. Favor entrar em contato com o administrador.
 
 Enable=Habilitar
 Disable=Desabilitar
-StatusChanged=O estatus do usu�rio foi alterado com sucesso
+StatusChanged=O estatus do usu?rio foi alterado com sucesso
 
-NotAuth=Voc� n�o tem permiss�o para realizar essa opera��o
+NotAuth=Voc? n?o tem permiss?o para realizar essa opera??o
 
 # Used by JBoss Portal
 
 REMEMBERME=Lembre-me
 LOGIN=Login
-USERNAME=Usu�rio
+USERNAME=Usu?rio
 PASSWORD=Senha
-USERLOGIN=Login de Usu�rio
+USERLOGIN=Login de Usu?rio
 
 OPTIONAL=Opcional
 REQUIRED=Requerido
 
-255MAX=(M�ximo de 255 caracteres)
+255MAX=(M?ximo de 255 caracteres)
 
 NAMENOTAVAILABLE=N/A
 
 #Registration
-REGISTER_REGISTER=N�o possu� conta ainda? Voc� pode
+REGISTER_REGISTER=N?o possu? conta ainda? Voc? pode
 REGISTER_REGISTER_LINK=criar uma\!
-REGISTER_NEWUSER=Registro de novo usu�rio
+REGISTER_NEWUSER=Registro de novo usu?rio
 REGISTER_PASSWORDAGAIN=Confirme sua senha
 REGISTER_REALEMAIL=E-mail real
-REGISTER_EMAILNOTPUBLIC=(Esse email n�o ser� mostrado, mas � necess�rio. Ser� usado para enviar sua senha em caso de perda.)
+REGISTER_EMAILNOTPUBLIC=(Esse email n?o ser? mostrado, mas ? necess?rio. Ser? usado para enviar sua senha em caso de perda.)
 REGISTER_FAKEEMAIL=E-mail falso
-REGISTER_EMAILPUBLIC=(Esse email ser� mostrado. Entre o que desejar.)
-REGISTER_FAKEEMAIL_EXPLAIN=Se este campo n�o estiver vazio, o email real ser� utilizado apenas para enviar notifica��es
+REGISTER_EMAILPUBLIC=(Esse email ser? mostrado. Entre o que desejar.)
+REGISTER_FAKEEMAIL_EXPLAIN=Se este campo n?o estiver vazio, o email real ser? utilizado apenas para enviar notifica??es
 REGISTER_QUESTION=Pergunta secreta
 REGISTER_ANSWER=Resposta secreta
-REGISTER_ASREGUSER=Como usu�rio registrado voc� pode:
+REGISTER_ASREGUSER=Como usu?rio registrado voc? pode:
 REGISTER_ASREG6=Selecione temas diferentes
-REGISTER_ASREG5=Personalizar os coment�rios
-REGISTER_ASREG4=Selecionar quantos items ser�o mostrados na p�gina inicial
-REGISTER_ASREG3=Possuir uma janela pessoal na p�gina inicial
-REGISTER_ASREG2=Enviar not�cias com o seu nome
-REGISTER_ASREG1=Postar coment�rios com o seu nome
-REGISTER_REGISTERNOW=Registre agora, � gr�tis!
-REGISTER_WEDONTGIVE=N�s n�o vendemos/distribuimos suas informa��es pessoais.
-REGISTER_ALREADYHAVEACCOUNT=Se voce j� possu� uma conta:
+REGISTER_ASREG5=Personalizar os coment?rios
+REGISTER_ASREG4=Selecionar quantos items ser?o mostrados na p?gina inicial
+REGISTER_ASREG3=Possuir uma janela pessoal na p?gina inicial
+REGISTER_ASREG2=Enviar not?cias com o seu nome
+REGISTER_ASREG1=Postar coment?rios com o seu nome
+REGISTER_REGISTERNOW=Registre agora, ? gr?tis!
+REGISTER_WEDONTGIVE=N?s n?o vendemos/distribuimos suas informa??es pessoais.
+REGISTER_ALREADYHAVEACCOUNT=Se voce j? possu? uma conta:
 REGISTER_SIGNIN=Entrar
 REGISTER_GIVENNAME=Primeiro nome
-REGISTER_FAMILYNAME=�ltimo nome
-REGISTER_PERSONALINFO=Informa��es Pessoais
-REGISTER_VIEWREALEMAIL=Permitir que outros usu�rios vejam meu email verdadeiro
-REGISTER_HOMEPAGE=Endere�o de seu site pessoal
-REGISTER_TIMEZONEOFFSET=Fuso hor�rio
+REGISTER_FAMILYNAME=?ltimo nome
+REGISTER_PERSONALINFO=Informa??es Pessoais
+REGISTER_VIEWREALEMAIL=Permitir que outros usu?rios vejam meu email verdadeiro
+REGISTER_HOMEPAGE=Endere?o de seu site pessoal
+REGISTER_TIMEZONEOFFSET=Fuso hor?rio
 REGISTER_ICQ=ICQ
 REGISTER_AIM=AIM
 REGISTER_YIM=Yahoo
 REGISTER_MSNM=MSN
 REGISTER_SKYPE=Skype
 REGISTER_LOCATION=Localidade
-REGISTER_LANGUAGE=L�ngua preferida
+REGISTER_LANGUAGE=L?ngua preferida
 REGISTER_OCCUPATION=Trabalho
 REGISTER_INTERESTS=Interesses
 REGISTER_SIGNATURE=Assinatura
-REGISTER_EXTRAINFO=Informa��es extras
-REGISTER_CANKNOWABOUT=(255 letras no m�x. Digite o que voc� gostaria que os outros soubessem sobre voc�)
-REGISTER_SAVECHANGES=Salvar atualiza��es
-REGISTER_CONFIRMATIONEMAIL=Email de confirma��o
+REGISTER_EXTRAINFO=Informa??es extras
+REGISTER_CANKNOWABOUT=(255 letras no m?x. Digite o que voc? gostaria que os outros soubessem sobre voc?)
+REGISTER_SAVECHANGES=Salvar atualiza??es
+REGISTER_CONFIRMATIONEMAIL=Email de confirma??o
 
-REGISTER_SHOWMENU=Voltar ao menu de usu�rio
+REGISTER_SHOWMENU=Voltar ao menu de usu?rio
 
-REGISTER_ERROR_INVALIDUSERNAME=Usu�rio inv�lido
-REGISTER_ERROR_EXISTINGUSERNAME=Esse usu�rio j� est� em uso
-REGISTER_ERROR_INVALIDPASSWORD1=Senha inv�lida
-REGISTER_ERROR_INVALIDPASSWORD2=Senha inv�lida
-REGISTER_ERROR_PASSWORDMISMATCH=Senhas n�o conferem
-REGISTER_ERROR_INVALIDREALEMAIL=Email inv�lido
+REGISTER_ERROR_INVALIDUSERNAME=Usu?rio inv?lido
+REGISTER_ERROR_EXISTINGUSERNAME=Esse usu?rio j? est? em uso
+REGISTER_ERROR_INVALIDPASSWORD1=Senha inv?lida
+REGISTER_ERROR_INVALIDPASSWORD2=Senha inv?lida
+REGISTER_ERROR_PASSWORDMISMATCH=Senhas n?o conferem
+REGISTER_ERROR_INVALIDREALEMAIL=Email inv?lido
 
 
 MENU_LOGOUT=Sair
 MENU_EDITPROFILE=Editar seu perfil
-MENU_LISTUSERS=Listar todos os usu�rios
+MENU_LISTUSERS=Listar todos os usu?rios
 
 LIST_FILTERS=Aplicar filtro
-LIST_USERSPERPAGE=Usu�rios por p�gina
-LIST_USERNAMECONTAINS=Nome cont�m
+LIST_USERSPERPAGE=Usu?rios por p?gina
+LIST_USERNAMECONTAINS=Nome cont?m
 LIST_FULLNAME=Nome completo
-LIST_USERNAME=Usu�rio
+LIST_USERNAME=Usu?rio
 LIST_ROLES=Grupos
-LIST_ACTIONS=A��es
+LIST_ACTIONS=A??es
 LIST_ACTIONSSHOWPROFILE=Perfil
 LIST_ACTIONADDROLESTOUSER=Grupos
 LIST_ACTIONEDITROLES=Editar Grupos
 FILTER=Filtro
 
-NEXTPAGE=Pr�xima p�gina
-PREVIOUSPAGE=P�gina anterior
+NEXTPAGE=Pr?xima p?gina
+PREVIOUSPAGE=P?gina anterior
 
 ASSIGNROLES=Atribuir grupo
-ROLESAVAILABLE=Grupos dispon�veis
-EDITROLESFORUSER=Editar grupos do usu�rio
+ROLESAVAILABLE=Grupos dispon?veis
+EDITROLESFORUSER=Editar grupos do usu?rio
 
 
 ROLE_THEREARE=Existem
@@ -261,8 +261,8 @@
 ROLE_ROLEDEFINED=grupo definido
 
 ROLE_NAME=Nome do novo grupo
-ROLE_DISPLAYNAME=Nome vis�vel do grupo
-ROLE_NEWDISPLAYNAME=Novo nome vis�vel do grupo
+ROLE_DISPLAYNAME=Nome vis?vel do grupo
+ROLE_NEWDISPLAYNAME=Novo nome vis?vel do grupo
 ROLE_SELECTONETOMODIFY= Selecione o grupo para alterar
 ROLE_SELECTONETODELETE= Selecione o grupo para remover
 ROLE_CREATE=Criar grupo
@@ -273,27 +273,21 @@
 ROLE_EDIT_MEMBERS=Editar membros do grupo
 ROLE_MAINLIST=Voltar
 
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=J� existe um grupo com esse nome (vis�vel)
-ROLE_ERROR_NAMEALREADYEXISTS=J� existe um grupo com esse nome
-ROLE_ERROR_NAMEEMPTY=O nome n�o pode ser vazio
-ROLE_ERROR_DISPLAYNAMEEMPTY=O nome vis�vel nao pode ser vazio
-ROLE_ERROR_DELETE_FAILED=N�o � poss�vel remover o grupo
-ROLE_EDIT_USER=Editando usu�rios do grupo
+ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=J? existe um grupo com esse nome (vis?vel)
+ROLE_ERROR_NAMEALREADYEXISTS=J? existe um grupo com esse nome
+ROLE_ERROR_NAMEEMPTY=O nome n?o pode ser vazio
+ROLE_ERROR_DISPLAYNAMEEMPTY=O nome vis?vel nao pode ser vazio
+ROLE_ERROR_DELETE_FAILED=N?o ? poss?vel remover o grupo
+ROLE_EDIT_USER=Editando usu?rios do grupo
 
 MENU_CREATEROLE=Criar novo grupo
 MENU_EDITROLE=Editar grupo
 MENU_EDITROLEMEMBERS=Editar membros do grupo
 
-VALIDATIONEMAIL_1=Um usu�rio com este endere�o de email j� existe em nosso sistema.
-VALIDATIONEMAIL_2=Mantenha esse email salvo. As informa��es de sua conta est�o a seguir
-VALIDATIONEMAIL_3=Sua conta esta atualmente inativa. Voc� n�o pode utiliz�-la at� visitar o link
-VALIDATIONEMAIL_4=Se voc� n�o se cadastrar em nosso site, nenhuma outra a��o � necess�ria.
-VALIDATIONEMAIL_5=Atenciosamente,\nA Ger�ncia.
-
-PERMISSION_PICKPORTLET=Administra��o de Permiss�es de Portlet
-PERMISSION_PERMISSIONS=Permiss�es para modificar
+PERMISSION_PICKPORTLET=Administra??o de Permiss?es de Portlet
+PERMISSION_PERMISSIONS=Permiss?es para modificar
 PERMISSION_TOP=Selecione um Componente para Modificar
-PERMISSION_FINERGRAIN=Selecione um sub-componente para definir suar permiss�es
+PERMISSION_FINERGRAIN=Selecione um sub-componente para definir suar permiss?es
 PERMISSION_MODIFYROLES=Adicionar/Remover roles
 PERMISSION_MODIFYINGROLES=Modificando roles para
 PERMISSION_DOMAIN=Dominio

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,15 +0,0 @@
-Hello,
-
-you tried to create an account on ${emailDomain} 
-
-The user information are written here for your convenience:
-Username: ${username}
-Password: ${password}
-
-At this time, your account is not activated and you will need to access the following URL to be able to login.
-${activationLink}
-
-If you didn't ask to create an account, we apologize and no further action is required.
-
-Best regards,
-${emailDomain}

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate.tpl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,15 @@
+Hello,
+
+you tried to create an account on ${emailDomain} 
+
+The user information are written here for your convenience:
+Username: ${username}
+Password: ${password}
+
+At this time, your account is not activated and you will need to access the following URL to be able to login.
+${activationLink}
+
+If you didn't ask to create an account, we apologize and no further action is required.
+
+Best regards,
+${emailDomain}

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,15 +0,0 @@
-Bonjour
-
-vous avez cr???? un compte sur ${emailDomain} 
-
-Voici les informations de connexion relatives a ce compte:
-Identifiant: ${username}
-Mot de passe: ${password}
-
-Votre compte n'est pas actif pour le moment et vous devez vous rendre ?? l'adresse suivante pour l'activer.
-${activationLink}
-
-Si vous n'avez pas cr???? de compte, nous vous prions de bien vouloir nous excuser et vous pouvez simplement ignorer cet email.
-
-Cordialement,
-${emailDomain}

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,15 @@
+Bonjour
+
+vous avez cr???? un compte sur ${emailDomain} 
+
+Voici les informations de connexion relatives a ce compte:
+Identifiant: ${username}
+Mot de passe: ${password}
+
+Votre compte n'est pas actif pour le moment et vous devez vous rendre ?? l'adresse suivante pour l'activer.
+${activationLink}
+
+Si vous n'avez pas cr???? de compte, nous vous prions de bien vouloir nous excuser et vous pouvez simplement ignorer cet email.
+
+Cordialement,
+${emailDomain}

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -58,10 +58,15 @@
       </transaction>
    </portlet>
    <portlet>
-      <portlet-name>ConfiguratorPortlet</portlet-name>
+      <portlet-name>PortletContentEditorPortlet</portlet-name>
       <transaction>
-         <trans-attribute>Required</trans-attribute>
+         <trans-attribute>RequiresNew</trans-attribute>
       </transaction>
+<!--
+      <header-content>
+         <link rel="stylesheet" type="text/css" href="/style.css" title="" media="screen"/>
+      </header-content>
+-->
    </portlet>
 
    <!-- Service injected in the portlet context. -->
@@ -125,9 +130,4 @@
       <service-class>org.jboss.portal.portlet.federation.FederatingPortletInvoker</service-class>
       <service-ref>:service=PortletInvoker,type=Federating</service-ref>
    </service>
-   <service>
-      <service-name>ContentEditorRegistry</service-name>
-      <service-class>org.jboss.portal.core.portlet.dashboard.ContentEditorRegistry</service-class>
-      <service-ref>:service=ContentEditorRegistry</service-ref>
-   </service>
 </portlet-app>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/help.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/help.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/help.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,34 +0,0 @@
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<portlet:defineObjects/>
-<p>This portlet manages portlet instances and windows.
-The combox box helps you to choose a deployed web application
-that contains portlet components.</p>
-
-<div align="center"><img border="1" src="<%= renderRequest.getContextPath() %>/images/admin/pic1.png"/></div>
-
-<p>Once a web application is chosen you can then look at all the component
-it contains and choose one by clicking on its component name.</p>
-
-<div align="center"><img border="1" src="<%= renderRequest.getContextPath() %>/images/admin/pic2.png"/></div>
-
-<p>Then you have a table that contains all the running instances
-of the selected component. You can :
-<ul><li>create one instance by filling the
-form. You mut pay attention to the fact that you cannot give to the
-instance a name that already exist in the selected portal.</li>
-<li>remove a running instance.</li>
-<li>click on a running instance to look at its associated windows.</li>
-</ul></p>
-
-<div align="center"><img border="1" src="<%= renderRequest.getContextPath() %>/images/admin/pic3.png"/></div>
-
-<p>Last but not least you see all the windows for a given instance component.
-You can :
-<ul>
-<li>remove a window</li>
-<li>create a new window by giving it a name, choosing a place on the screen
-with the combo box ans choose an height. You must pay attentien that the height
-must be a valid number like 0,1,2,....
-</ul></p>
-
-<div align="center"><img border="1" src="<%= renderRequest.getContextPath() %>/images/admin/pic4.png"/></div>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/index.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/index.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,270 +0,0 @@
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page import="java.util.Iterator,
-                 org.jboss.portal.theme.page.RegionNames,
-                 org.jboss.portal.server.PortalServer,
-                 org.jboss.portal.server.Application,
-                 org.jboss.portal.server.Component,
-                 org.jboss.portal.server.Instance,
-                 org.jboss.portal.server.Portal,
-                 org.jboss.portal.server.Window,
-                 org.jboss.portal.theme.page.RegionNames"%>
-<portlet:defineObjects/>
-<%
-      String targetAppName = renderRequest.getParameter("application");
-      String targetCompName = renderRequest.getParameter("component");
-      String targetInstanceName = renderRequest.getParameter("instance");
-      String targetPortalName = renderRequest.getParameter("portal");
-
-      PortalServer container = (PortalServer)renderRequest.getAttribute("CONTAINER");
-
-      Portal targetPortal = null;
-      Application targetApp = null;
-      Component targetComp = null;
-      Instance targetInstanceMD = null;
-%>
-<form method="post" action="<portlet:renderURL/>"/>
-   <select name="application" class="inputbox" size="1">
-      <option value=""></option>
-<%
-      for (Iterator i = container.getApplications().iterator();i.hasNext();)
-      {
-         Application app = (Application)i.next();
-         String appName = app.getName();
-         boolean selected = appName.equals(targetAppName);
-         if (selected)
-         {
-            targetApp = app;
-         }
-%>
-      <option value="<%= appName %>" <%= selected ? " selected=\"selected\"" : "" %>><%=appName%></option>
-<%
-}
-%>
-   </select>
-   <input type="submit" value="infos"/>
-</form>
-<%
-   if (targetApp != null)
-   {
-%>
-<form method="post" action="<portlet:actionURL>
-                               <portlet:param name="application" value="<%= targetApp.getName() %>"/>
-                               <portlet:param name="add" value="instance"/>
-                            </portlet:actionURL>"/>
-<table border="1" cellspacing="0" cellpadding="2">
-   <tr>
-      <th>Component</th>
-      <th>Expiration cache</th>
-      <th>Action</th>
-   </tr>
-<%
-      for (Iterator j = targetApp.getComponents().iterator();j.hasNext();)
-      {
-         Component comp = (Component)j.next();
-         Integer expirationCache = comp.getExpirationCache();
-         if (comp.getName().equals(targetCompName))
-         {
-            targetComp = comp;
-         }
-%>
-   <tr>
-      <td>
-         <a href="<portlet:renderURL>
-                     <portlet:param name="application" value="<%= targetApp.getName() %>"/>
-                     <portlet:param name="component" value="<%= comp.getName() %>"/>
-                  </portlet:renderURL>"><%=comp.getName()%>
-         </a>
-      </td>
-      <td>
-         <%=expirationCache != null ? expirationCache.toString() : "-"%>
-      </td>
-      <td>
-         <input type="submit" name="<%= comp.getName() %>" value="create"/>
-      </td>
-   </tr>
-<%
-}
-%>
-   <tr>
-      <td colspan="3">
-         instance name
-         <input type="text" name="instance" width="32"/>
-      </td>
-   </tr>
-   <tr>
-      <td colspan="3">
-         target portal :
-         <select name="portal">
-<%
-      for (Iterator j = container.getPortals().iterator();j.hasNext();)
-      {
-         Portal portal = (Portal)j.next();
-%>
-            <option name="<%= portal.getName() %>"><%=portal.getName()%></option>
-<%
-}
-%>
-         </select>
-      </td>
-   </tr>
-</table>
-</form>
-<%
-}
-%>
-
-<hr height="1"/>
-
-<form method="post" action="<portlet:actionURL>
-                               <portlet:param name="add" value="portal"/>
-                            </portlet:actionURL>">
-<table border="1" cellspacing="0" cellpadding="2">
-   <tr>
-      <th>portal</th>
-      <th>action</th>
-   </tr>
-<%
-      for (Iterator i = container.getPortals().iterator();i.hasNext();)
-      {
-         Portal portal = (Portal)i.next();
-         String portalName = portal.getName();
-         boolean selected = portalName.equals(targetPortalName);
-         if (selected)
-         {
-            targetPortal = portal;
-         }
-%>
-   <tr>
-      <td><a href="<portlet:renderURL >
-                      <portlet:param name="portal" value="<%= portal.getName()%>"/>
-                   </portlet:renderURL>"><%= portal.getName() %></a></td>
-      <td><a href="<portlet:actionURL >
-                      <portlet:param name="portal" value="<%= portal.getName()%>"/>
-                   </portlet:actionURL>">remove</a></td>
-   </tr>
-<%
-      }
-%>
-   <tr>
-      <td colspan="2">
-         <input type="text" name="portal" size="32"/>
-      </td>
-   </tr>
-   <tr>
-      <td colspan="2">
-         <input type="submit" value="create"/>
-      </td>
-   </tr>
-</table>
-</form>
-
-<%
-   if (targetPortal != null)
-   {
-
-%>
-<form method="post" action="<portlet:actionURL>
-                               <portlet:param name="add" value="instance"/>
-                            </portlet:actionURL>">
-<table border="1" cellspacing="0" cellpadding="2">
-   <tr>
-      <th>instance</th>
-      <th>portal</th>
-      <th>action</th>
-   </tr>
-<%
-      for (Iterator i = targetPortal.getInstances().iterator();i.hasNext();)
-      {
-         Instance instance = (Instance)i.next();
-         if (instance.getName().equals(targetInstanceName))
-         {
-            targetInstanceMD = instance;
-         }
-%>
-   <tr>
-      <td><a href="<portlet:renderURL>
-                     <portlet:param name="portal" value="<%= targetPortal.getName() %>"/>
-                     <portlet:param name="instance" value="<%= instance.getName() %>"/>
-                  </portlet:renderURL>">
-         <%= instance.getName() %></a>
-      </td>
-      <td>
-         <%= targetPortal.getName() %>
-      </td>
-      <td><a href="<portlet:actionURL>
-                     <portlet:param name="portal" value="<%= targetPortal.getName() %>"/>
-                     <portlet:param name="instance" value="<%= instance.getName() %>"/>
-                     <portlet:param name="remove" value="instance"/>
-                  </portlet:actionURL>">remove</a>
-      </td>
-   </tr>
-   <%
-      }
-   %>
-</table>
-</form>
-<%
-      if (targetInstanceMD != null)
-      {
-%>
-<form method="post" action="<portlet:actionURL>
-                               <portlet:param name="portal" value="<%= targetPortalName %>"/>
-                               <portlet:param name="instance" value="<%= targetInstanceName %>"/>
-                               <portlet:param name="add" value="window"/>
-                            </portlet:actionURL>">
-<table border="1" cellspacing="0" cellpadding="2">
-   <tr>
-      <th>Window</th>
-      <th>&nbsp;</th>
-   </tr>
-<%
-         for (Iterator i = targetInstanceMD.getWindows().iterator();i.hasNext();)
-         {
-            Window window = (Window)i.next();
-%>
-   <tr>
-      <td><%= window.getName() %></td>
-      <td><a href="<portlet:actionURL>
-                      <portlet:param name="portal" value="<%= targetPortalName %>"/>
-                      <portlet:param name="instance" value="<%= targetInstanceName %>"/>
-                      <portlet:param name="window" value="<%= window.getName() %>"/>
-                      <portlet:param name="remove" value="window"/>
-                  </portlet:actionURL>">remove</a>
-      </td>
-   </tr>
-<%
-         }
-%>
-   <tr>
-      <td colspan="2">
-         Region :
-         <select name="region">
-            <option name="<%= RegionNames.BOTTOM %>"><%= RegionNames.BOTTOM %></option>
-            <option name="<%= RegionNames.INSET %>"><%= RegionNames.INSET %></option>
-            <option name="<%= RegionNames.LEFT %>"><%= RegionNames.LEFT %></option>
-            <option name="<%= RegionNames.RIGHT %>"><%= RegionNames.RIGHT %></option>
-            <option name="<%= RegionNames.USER_1 %>"><%= RegionNames.USER_1 %></option>
-            <option name="<%= RegionNames.USER_2 %>"><%= RegionNames.USER_2 %></option>
-         </select>
-         </select>
-      </td>
-   </tr>
-   <tr>
-      <td colspan="2">
-         Height : <input type="text" name="height"/>
-      </td>
-   </tr>
-   <tr>
-      <td colspan="2">
-         Name : <input type="text" name="window"/>
-      </td>
-   </tr>
-   <tr>
-      <td colspan="2"><input type="submit" value="add"/></td>
-   </tr>
-</table>
-</form>
-<%
-      }
-   }
-%>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/normal.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/normal.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/admin/normal.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<portlet:defineObjects/>
-<a href="<portlet:renderURL windowState="maximized" />">Applications</a>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/dashboard/editpage.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/dashboard/editpage.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/dashboard/editpage.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,330 +0,0 @@
-<%@ page import="org.jboss.portal.core.model.portal.Page" %>
-<%@ page import="org.jboss.portal.core.model.portal.Window" %>
-<%@ page import="org.jboss.portal.theme.PortalLayout" %>
-<%@ page import="org.jboss.portal.theme.PortalTheme" %>
-<%@ page import="java.util.Collection" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="java.util.TreeSet" %>
-<%@ page import="org.jboss.portal.core.model.content.ContentType" %>
-<%@ page import="java.io.PrintWriter" %>
-<%@ page import="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistry" %>
-<%@ page import="org.jboss.portal.core.portlet.dashboard.ContentEditor" %>
-<%@ page import="org.jboss.portal.core.model.content.Content" %>
-<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ page isELIgnored="false" %>
-
-<portlet:defineObjects/>
-
-<%
-   List pages = (List)request.getAttribute("pages");
-
-   Map windowMap = (Map)request.getAttribute("windowMap");
-   List regions = (List)request.getAttribute("regions");
-
-   String currentPage = (String)request.getAttribute("currentPage");
-   String currentLayout = (String)request.getAttribute("currentLayout");
-   String currentTheme = (String)request.getAttribute("currentTheme");
-
-   String errorMessage = (String)request.getAttribute("errorMsg");
-
-   Collection layouts = (Collection)request.getAttribute("layouts");
-   Collection themes = (Collection)request.getAttribute("themes");
-
-   String contentType = (String)request.getAttribute("contentType");
-%>
-
-<script type="text/javascript" language="JavaScript">
-   function assignPortlet(op, to)
-   {
-      this.document.instancesform.op.value = op;
-      this.document.instancesform.toRegion.value = to;
-   }
-
-   function unassignPortlet(op, from)
-   {
-      this.document.instancesform.op.value = op;
-      this.document.instancesform.fromRegion.value = from;
-   }
-
-   function sortPortlet(op, region)
-   {
-      this.document.instancesform.op.value = op;
-      this.document.instancesform.sortRegion.value = region;
-   }
-
-   function switchLayout(op)
-   {
-      this.document.instancesform.op.value = op;
-   }
-
-   function switchTheme(op)
-   {
-      this.document.instancesform.op.value = op;
-   }
-
-   function debug()
-   {
-      //alert("OP: '" + this.instancesForm.op.value + "' toRegion: '" + this.instancesForm.toRegion.value + "' fromRegion: '" + this.instancesForm.fromRegion.value + "' sortRegion: '" + this.instancesForm.sortRegion.value + "'");
-   }
-</script>
-
-<%
-   if (errorMessage != null)
-   {
-%>
-<div align="center">
-   <font color="red"><b><%= errorMessage %>
-   </b></font>
-</div>
-<%
-   }
-%>
-
-<table width="100%">
-<th colspan="2" class="portlet-section-header" align="center">Personal Dashboard Editor</th>
-<tr>
-   <td class="portlet-section-body" align="center">
-      <table width="100%">
-         <tr>
-            <td width="250">
-               <table class="bottombuttonbar">
-                  <tr>
-                     <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:&nbsp;
-                        <form name="createpageform" action="<portlet:actionURL><portlet:param name="op" value="newpage"></portlet:param>
-             </portlet:actionURL>" method="POST" style="padding:0;margin:0">
-                           <input type="text" class="portlet-form-input-field" name="pagename"><input type="submit"
-                                                                                                      name="save"
-                                                                                                      value="Save"
-                                                                                                      class="portlet-form-button"/>
-                        </form>
-                     </td>
-                  </tr>
-               </table>
-            </td>
-            <td align="left" valign="top">
-               Use this tool to manage the content and appearance of your dashboard pages. <br/>
-               You can control the page titles, column layouts, page themes,
-               and add,
-               order, or remove portlets.
-            </td>
-         </tr>
-      </table>
-   </td>
-</tr>
-<th colspan="2" class="portlet-section-header" align="center">Currently editing page '<%= currentPage %>'</th>
-<tr>
-   <td class="portlet-section-body" align="center">
-      <form action="<portlet:actionURL><portlet:param name="op" value="editPage"></portlet:param>
-    </portlet:actionURL>" method="POST" style="padding:0;margin:0">
-         Select: <select name="editPageSelect">
-         <%
-            for (int i = 0; i < pages.size(); i++)
-            {
-               Page onePage = (Page)pages.get(i);
-               String selected = "";
-               if (onePage.getName().equals(currentPage))
-               {
-                  selected = " selected=\"true\" ";
-               }
-         %>
-         <option <%= selected %> value="<%= onePage.getName() %>"><%= onePage.getName() %>
-         </option>
-         <%
-            }
-         %>
-      </select>
-         <input type="submit" name="submit" value="Go" class="portlet-form-button"/>
-      </form>
-
-      <br/>
-   </td>
-</tr>
-<!--<tr>
-   <td>
-      <hr/>
-   </td>
-</tr>-->
-<tr>
-<td>
-<form action="<portlet:actionURL>
-    </portlet:actionURL>" name="instancesform" method="POST" onsubmit="debug();">
-<input type="hidden" name="op" value=""/>
-<input type="hidden" name="toRegion" value=""/>
-<input type="hidden" name="fromRegion" value=""/>
-<input type="hidden" name="sortRegion" value=""/>
-<input type="hidden" name="contentType" value="<%= contentType %>"/>
-<input type="hidden" name="editPageSelect" value="<%= currentPage %>"/>
-<table width="100%">
-<tr>
-<td valign="top" width="250">
-   <table class="bottombuttonbar">
-      <tr>
-         <td valign="top">
-            <b>Theme and Layout</b>
-            <br/>
-            Apply a theme to your page, or select the number of columns for the layout.
-            <hr/>
-         </td>
-      </tr>
-      <tr>
-         <td>Choose a layout:<br/>
-            <select name="layout">
-               <%
-                  for (Iterator iterator = layouts.iterator(); iterator.hasNext();)
-                  {
-                     PortalLayout layout = (PortalLayout)iterator.next();
-                     String selected = "";
-                     if (layout.getLayoutInfo().getName().equals(currentLayout))
-                     {
-                        selected = " selected=\"true\" ";
-                     }
-               %>
-               <option <%=selected %>
-                  value="<%= layout.getLayoutInfo().getName() %>"><%= layout.getLayoutInfo().getName() %>
-               </option>
-               <%
-                  }
-               %>
-            </select>&nbsp;<input type="submit" class="portlet-form-button" name="Select" value="Select"
-                                  onclick="switchLayout('assignLayout');"/>
-         </td>
-      </tr>
-      <tr>
-         <td height="20"></td>
-      </tr>
-      <tr>
-         <td>Choose a theme:<br/>
-            <select name="theme">
-               <%
-                  for (Iterator iterator = themes.iterator(); iterator.hasNext();)
-                  {
-                     PortalTheme theme = (PortalTheme)iterator.next();
-                     String selected = "";
-                     if (theme.getThemeInfo().getName().equals(currentTheme))
-                     {
-                        selected = " selected=\"true\" ";
-                     }
-               %>
-               <option <%=selected %>
-                  value="<%= theme.getThemeInfo().getName() %>"><%= theme.getThemeInfo().getName() %>
-               </option>
-               <%
-                  }
-               %>
-            </select>&nbsp;<input type="submit" class="portlet-form-button" name="Select" value="Select"
-                                  onclick="switchTheme('assignTheme');"/>
-         </td>
-      </tr>
-      <tr>
-         <td height="20"></td>
-      </tr>
-   </table>
-</td>
-<td class="portlet-section-body" valign="top" align="right"><b>Available Content</b><br/>
-<%
-   ContentEditorRegistry registry = (ContentEditorRegistry)request.getAttribute("registry");
-%>
-<div>
-<%
-   for (Iterator i = registry.getContentTypes().iterator(); i.hasNext();)
-   {
-      ContentType ct = (ContentType)i.next();
-%>
-   <a href="<portlet:renderURL><portlet:param name="op" value="editPage"/>
-   <portlet:param name="contentType" value="<%= ct.toString() %>"/>
-   <portlet:param name="editPageSelect" value="<%= currentPage %>"/>
-    </portlet:renderURL>"><%= ct %></a>&nbsp;
-<%
-   }
-%>
-</div>
-<%
-   ContentEditor editor = null;
-   if (contentType != null)
-   {
-      editor = registry.getEditor(ContentType.create(contentType));
-   }
-   if (editor == null)
-   {
-      editor = registry.getEditor(ContentType.PORTLET);
-   }
-   PrintWriter writer = new PrintWriter(out);
-   editor.show(renderRequest, writer);
-   writer.flush();
-%>
-</td>
-<td>
-<table>
-   <%
-      for (Iterator i = regions.iterator(); i.hasNext();)
-      {
-         String region = (String)i.next();
-         TreeSet windows = (TreeSet)windowMap.get(region);
-   %>
-   <tr>
-      <td>
-         <input type="submit" class="portlet-form-button" name="&gt;" value="&gt;"
-                onclick="assignPortlet('copy','<%= region %>');"/><br/><input
-         type="submit" class="portlet-form-button" name="&lt;" value="&lt;"
-         onclick="unassignPortlet('remove','<%= region %>');"/></td>
-      <td class="portlet-section-body" valign="top">
-         <b><%= region %> Column</b><br/>
-         <select name="<%= region %>_instances" multiple="true" size="6">
-            <%
-               for (Iterator j = windows.iterator(); j.hasNext();)
-               {
-                  Window window = (Window)j.next();
-                  Content portletContent = window.getContent();
-                  if (portletContent != null)
-                  {
-            %>
-            <option value="<%= window.getName() %>"><%= portletContent.getDisplayName().getDefaultString() %>
-            </option>
-            <%
-                  }
-               }
-            %>
-         </select>
-      </td>
-      <td>
-         <input type="submit" class="portlet-form-button" name="Up" value="Up"
-                onclick="sortPortlet('up','<%= region %>');"/><br/><input
-         type="submit" class="portlet-form-button" name="Down" value="Down"
-         onclick="sortPortlet('down','<%= region %>');"/>
-      </td>
-   </tr>
-   <%
-      }
-   %>
-</table>
-</tr>
-</table>
-</form>
-</td>
-</tr>
-</table>
-<hr/>
-<%
-   if (!"default".equals(currentPage))
-   {
-%>
-<table width="100%">
-   <tr>
-      <td align="left">
-         <form action="<portlet:actionURL><portlet:param name="op" value="delete"></portlet:param>
-    </portlet:actionURL>" method="POST" style="padding:0;margin:0">
-            <input type="hidden" name="pagename" value="<%= currentPage %>"/>
-            <input type="submit" name="submit" value="Delete this Page" class="portlet-form-button"/>
-            <br/>
-            <font color="red">You cannot undo this action!</font>
-         </form>
-      </td>
-   </tr>
-</table>
-<%
-   }
-%>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,9 +0,0 @@
-<div id="login-container">
- <fieldset><legend>JBoss Portal Login</legend>
-  <form method="POST" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm">
-   <label for="username">Username:</label><input type="text" name="j_username" id="username" value=""/><br>
-   <label for="password">Password:</label><input type="password" name="j_password" id="password" value=""/><br>
-   <input type="submit" id="loginButton" name="login" value="Login"/>
-  </form>
- </fieldset>
-</div>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -6,6 +6,10 @@
 
 <table width="100%" cellpadding="2" border="0">
 
+   <n:if ctx="modifiedProfile">
+     <p class="portlet-form-label">${n:i18n("MODIFIED_PROFILE")}</p>
+   </n:if>
+
    <n:if ctx="admin">
       <tr>
          <td class="portlet-section-body">

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<portal-strategies>
-   <set name="maximizedRegion">
-      <strategy content-type="text/html">
-         <implementation>org.jboss.portal.theme.impl.strategy.MaximizingStrategyImpl</implementation>
-      </strategy>
-   </set>
-</portal-strategies>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -47,16 +47,14 @@
    </deployment>
    <deployment>
       <instance>
-         <instance-id>ConfiguratorPortletInstance</instance-id>
-         <portlet-ref>ConfiguratorPortlet</portlet-ref>
-<!--
+         <instance-id>PortletContentEditorInstance</instance-id>
+         <portlet-ref>PortletContentEditorPortlet</portlet-ref>
          <security-constraint>
             <policy-permission>
-               <role-name>User</role-name>
-               <action-name>personalize</action-name>
+               <role-name>Admin</role-name>
+               <action-name>view</action-name>
             </policy-permission>
          </security-constraint>
--->
       </instance>
    </deployment>
 </deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -40,10 +40,10 @@
       <init-param>
          <description>Subscription mode</description>
          <name>subscriptionMode</name>
+         <value>emailVerification</value>
          <!--
-         <value>emailVerification</value>
+         <value>automatic</value>
          -->
-         <value>automatic</value>
       </init-param>
       <init-param>
          <description>Domain of your website for email verification.</description>
@@ -111,16 +111,16 @@
       </portlet-info>
    </portlet>
    <portlet>
-      <description>Configurator portlet for personal dashboard</description>
-      <portlet-name>ConfiguratorPortlet</portlet-name>
-      <display-name>Dashboard Configurator Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.dashboard.Configurator</portlet-class>
+      <description>Portlet Content Editor</description>
+      <portlet-name>PortletContentEditorPortlet</portlet-name>
+      <display-name>Portlet Content Editor</display-name>
+      <portlet-class>org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet</portlet-class>
       <supports>
          <mime-type>text/html</mime-type>
          <portlet-mode>VIEW</portlet-mode>
       </supports>
       <portlet-info>
-         <title>Dashboard Portlet</title>
+         <title>Portlet Content Portlet</title>
          <keywords>management,admin</keywords>
       </portlet-info>
    </portlet>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css	2007-04-04 13:24:34 UTC (rev 10757)
@@ -168,8 +168,7 @@
    float: left;
    margin: 0px;
    padding: 0px;
-   min-width: 250px;
-   /*height: 300px;*/
+   min-width: 250px; /*height: 300px;*/
 }
 
 #regionB {
@@ -180,8 +179,7 @@
 margin: 0 0 0 30%;*/
    padding: 0px; /* test to add 3rd region in layout...*/
    width: 67%;
-   float: left;
-   /*height: 300px;*/
+   float: left; /*height: 300px;*/
 }
 
 #regionC {
@@ -229,7 +227,7 @@
    margin-top: 39px;
    min-width: 550px;
    z-index: 100; /* added for submenu hover */
-   /*position: relative;  added for submenu hover */
+/*position: relative;  added for submenu hover */
 }
 
 UL#tabsHeader li {
@@ -298,8 +296,7 @@
    background-image: url( images/tab_right_current.gif );
    background-repeat: no-repeat;
    background-position: right top;
-   padding-top: -3px;
-   /*border-bottom: 2px solid #fff;*/
+   padding-top: -3px; /*border-bottom: 2px solid #fff;*/
 }
 
 UL#tabsHeader #current a, #current a:hover {
@@ -1025,10 +1022,20 @@
    padding: 0px 5px 5px 5px;
    font-weight: bold;
    color: #656565;
-   font-size: 10px;
+   font-size: 12px;
    border-bottom: 1px solid #d5d5d5;
 }
 
+/* Table footer */
+.portlet-table-footer {
+   padding: 5px 5px 0px 5px;
+   font-weight: bold;
+   color: #656565;
+   font-size: 12px;
+   border: none;
+   border-top: 1px solid #d5d5d5;
+}
+
 /* Normal text in a table cell */
 .portlet-table-body {
 
@@ -1036,7 +1043,6 @@
 
 /* Text in every other row in the table */
 .portlet-table-alternate {
-   padding: 3px 5px;
    background-color: #E6E8E5;
    border-bottom: 1px solid #d5d5d5;
 }
@@ -1055,11 +1061,6 @@
    font-size: 12px;
 }
 
-/* Table footer */
-.portlet-table-footer {
-   font-size: 11px;
-}
-
 /* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
 .portlet-table-text {
    padding: 3px 5px;

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-management.sar/lib/portal-core-management-lib.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<server>
-
-   <!-- A sample listener -->
-   <mbean
-      code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
-      name="portal:service=ListenerService,type=test_listener"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ListenerRegistry</depends>
-      <attribute name="RegistryId">test_listener</attribute>
-      <attribute name="ListenerClassName">org.jboss.portal.core.portlet.test.event.PortletB$Listener</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
-      name="portal:service=ListenerService,type=window_listener"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ListenerRegistry</depends>
-      <attribute name="RegistryId">window_event_listener</attribute>
-      <attribute name="ListenerClassName">org.jboss.portal.core.portlet.test.event.WindowConstraintEventListener</attribute>
-   </mbean>
-
-</server>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<server>
+
+   <!-- A sample listener -->
+   <mbean
+      code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
+      name="portal:service=ListenerService,type=test_listener"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      <attribute name="RegistryId">test_listener</attribute>
+      <attribute name="ListenerClassName">org.jboss.portal.core.portlet.test.event.PortletB$Listener</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
+      name="portal:service=ListenerService,type=window_listener"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      <attribute name="RegistryId">window_event_listener</attribute>
+      <attribute name="ListenerClassName">org.jboss.portal.core.portlet.test.event.WindowConstraintEventListener</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
+      name="portal:service=ListenerService,type=user_listener"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      <attribute name="RegistryId">user_listener</attribute>
+      <attribute name="ListenerClassName">org.jboss.portal.core.portlet.test.event.PortalEventListenerLogger</attribute>
+   </mbean>
+
+</server>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/lib/portal-core-samples-lib.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/lib/portal-core-samples-lib.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/lib/portal-core-samples-lib.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,25 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat                                                 #
-# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
-# contributors as indicated by the @authors tag. See the                       #
-# copyright.txt in the distribution for a full listing of                      #
-# individual contributors.                                                     #
-#                                                                              #
-# This is free software; you can redistribute it and/or modify it              #
-# under the terms of the GNU Lesser General Public License as                  #
-# published by the Free Software Foundation; either version 2.1 of             #
-# the License, or (at your option) any later version.                          #
-#                                                                              #
-# This software is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
-# Lesser General Public License for more details.                              #
-#                                                                              #
-# You should have received a copy of the GNU Lesser General Public             #
-# License along with this software; if not, write to the Free                  #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
-################################################################################
-
-javax.portlet.preference.description.RssXml=RSS feed URL
-javax.portlet.preference.description.expires=Expiration time

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+javax.portlet.preference.description.RssXml=RSS feed URL
+javax.portlet.preference.description.expires=Expiration time

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,25 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat                                                 #
-# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
-# contributors as indicated by the @authors tag. See the                       #
-# copyright.txt in the distribution for a full listing of                      #
-# individual contributors.                                                     #
-#                                                                              #
-# This is free software; you can redistribute it and/or modify it              #
-# under the terms of the GNU Lesser General Public License as                  #
-# published by the Free Software Foundation; either version 2.1 of             #
-# the License, or (at your option) any later version.                          #
-#                                                                              #
-# This software is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
-# Lesser General Public License for more details.                              #
-#                                                                              #
-# You should have received a copy of the GNU Lesser General Public             #
-# License along with this software; if not, write to the Free                  #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
-################################################################################
-
-javax.portlet.preference.description.RssXml=URL du flux RSS
-javax.portlet.preference.description.expires=Temps d'expiration

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+javax.portlet.preference.description.RssXml=URL du flux RSS
+javax.portlet.preference.description.expires=Temps d'expiration

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE deployments PUBLIC
-   "-//JBoss Portal//DTD Portal Object 2.6//EN"
-   "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
-   
-<deployments>
-   <deployment>
-      <parent-ref>default</parent-ref>
-      <if-exists>keep</if-exists>
-      <page>
-         <page-name>News</page-name>
-         <properties>
-            <property>
-               <name>order</name>
-               <value>3</value>
-            </property>
-         </properties>
-         <window>
-            <window-name>WeatherPortletWindow</window-name>
-            <instance-ref>WeatherPortletInstance</instance-ref>
-            <region>left</region>
-            <height>0</height>
-         </window>
-         <window>
-            <window-name>NewsPortletWindow</window-name>
-            <instance-ref>NewsPortletInstance</instance-ref>
-            <region>center</region>
-            <height>0</height>
-         </window>
-         <window>
-            <window-name>NewsPortletWindow2</window-name>
-            <instance-ref>NewsPortletInstance2</instance-ref>
-            <region>center</region>
-            <height>1</height>
-         </window>
-      </page>
-   </deployment>
-   <deployment>
-      <parent-ref>default</parent-ref>
-      <if-exists>keep</if-exists>
-      <page>
-         <page-name>Test</page-name>
-         <properties>
-            <property>
-               <name>theme.ajax.object_disabled</name>
-               <value>true</value>
-            </property>
-            <property>
-               <name>order</name>
-               <value>3</value>
-            </property>
-         </properties>
-         <window>
-            <window-name>TestPortletWindow</window-name>
-            <instance-ref>TestPortletInstance</instance-ref>
-            <region>center</region>
-            <height>0</height>
-         </window>
-         <window>
-            <window-name>CatalogPortletWindow</window-name>
-            <instance-ref>CatalogPortletInstance</instance-ref>
-            <region>left</region>
-            <height>0</height>
-         </window>
-         <page>
-            <page-name>event test</page-name>
-            <listener>event_listener</listener>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>PortletAWindow</window-name>
-               <instance-ref>PortletAInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>PortletBWindow</window-name>
-               <instance-ref>PortletBInstance</instance-ref>
-               <region>center</region>
-               <height>1</height>
-            </window>
-         </page>
-         <page>
-            <page-name>page event test</page-name>
-            <listener>window_event_listener</listener>
-            <window>
-               <window-name>CatalogPortletWindow1</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>CatalogPortletWindow2</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>1</height>
-            </window>
-            <window>
-               <window-name>CatalogPortletWindow3</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>2</height>
-            </window>
-            <window>
-               <window-name>CatalogPortletWindow4</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>CatalogPortletWindow5</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>center</region>
-               <height>1</height>
-            </window>
-            <window>
-               <window-name>CatalogPortletWindow6</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>center</region>
-               <height>2</height>
-            </window>
-         </page>
-         <page>
-            <page-name>secure test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>SecuredTestPortletWindow</window-name>
-               <instance-ref>SecuredTestPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>exception test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>ExceptionPortletWindow</window-name>
-               <instance-ref>ExceptionPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>cache test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>CachedCounterPortletWindow</window-name>
-               <instance-ref>CachedCounterPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>CounterPortletWindow</window-name>
-               <instance-ref>CounterPortletInstance</instance-ref>
-               <region>center</region>
-               <height>1</height>
-            </window>
-         </page>
-         <page>
-            <page-name>session test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>PortletSessionPortletWindow</window-name>
-               <instance-ref>PortletSessionPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>missing portlet</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>MissingPortletWindow</window-name>
-               <instance-ref>MissingPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>URL portlet</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>URLPortletWindow</window-name>
-               <instance-ref>URLPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>missing instance</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>MissingInstanceWindow</window-name>
-               <instance-ref>MissingInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>charset test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>CharsetPortletWindow</window-name>
-               <instance-ref>CharsetPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>encoding test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>EncodingPortletWindow</window-name>
-               <instance-ref>EncodingPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-         <page>
-            <page-name>header test</page-name>
-            <window>
-               <window-name>CatalogPortletWindow</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
-               <region>left</region>
-               <height>0</height>
-            </window>
-            <window>
-               <window-name>HeaderContentPortletWindow</window-name>
-               <instance-ref>HeaderContentPortletInstance</instance-ref>
-               <region>center</region>
-               <height>0</height>
-            </window>
-         </page>
-      </page>
-   </deployment>
-</deployments>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE deployments PUBLIC
+   "-//JBoss Portal//DTD Portal Object 2.6//EN"
+   "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+   
+<deployments>
+   <deployment>
+      <parent-ref>default</parent-ref>
+      <if-exists>keep</if-exists>
+      <page>
+         <page-name>News</page-name>
+         <properties>
+            <property>
+               <name>order</name>
+               <value>3</value>
+            </property>
+         </properties>
+         <window>
+            <window-name>WeatherPortletWindow</window-name>
+            <instance-ref>WeatherPortletInstance</instance-ref>
+            <region>left</region>
+            <height>0</height>
+         </window>
+         <window>
+            <window-name>NewsPortletWindow</window-name>
+            <instance-ref>NewsPortletInstance</instance-ref>
+            <region>center</region>
+            <height>0</height>
+         </window>
+         <window>
+            <window-name>NewsPortletWindow2</window-name>
+            <instance-ref>NewsPortletInstance2</instance-ref>
+            <region>center</region>
+            <height>1</height>
+         </window>
+      </page>
+   </deployment>
+   <deployment>
+      <parent-ref>default</parent-ref>
+      <if-exists>keep</if-exists>
+      <page>
+         <page-name>Test</page-name>
+         <properties>
+            <property>
+               <name>theme.ajax.object_disabled</name>
+               <value>true</value>
+            </property>
+            <property>
+               <name>order</name>
+               <value>3</value>
+            </property>
+         </properties>
+         <window>
+            <window-name>TestPortletWindow</window-name>
+            <instance-ref>TestPortletInstance</instance-ref>
+            <region>center</region>
+            <height>0</height>
+         </window>
+         <window>
+            <window-name>CatalogPortletWindow</window-name>
+            <instance-ref>CatalogPortletInstance</instance-ref>
+            <region>left</region>
+            <height>0</height>
+         </window>
+         <page>
+            <page-name>event test</page-name>
+            <listener>test_listener</listener>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>PortletAWindow</window-name>
+               <instance-ref>PortletAInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>PortletBWindow</window-name>
+               <instance-ref>PortletBInstance</instance-ref>
+               <region>center</region>
+               <height>1</height>
+            </window>
+         </page>
+         <page>
+            <page-name>page event test</page-name>
+            <listener>window_event_listener</listener>
+            <window>
+               <window-name>CatalogPortletWindow1</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>CatalogPortletWindow2</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>1</height>
+            </window>
+            <window>
+               <window-name>CatalogPortletWindow3</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>2</height>
+            </window>
+            <window>
+               <window-name>CatalogPortletWindow4</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>CatalogPortletWindow5</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>center</region>
+               <height>1</height>
+            </window>
+            <window>
+               <window-name>CatalogPortletWindow6</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>center</region>
+               <height>2</height>
+            </window>
+         </page>
+         <page>
+            <page-name>secure test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>SecuredTestPortletWindow</window-name>
+               <instance-ref>SecuredTestPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>exception test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>ExceptionPortletWindow</window-name>
+               <instance-ref>ExceptionPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>cache test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>CachedCounterPortletWindow</window-name>
+               <instance-ref>CachedCounterPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>CounterPortletWindow</window-name>
+               <instance-ref>CounterPortletInstance</instance-ref>
+               <region>center</region>
+               <height>1</height>
+            </window>
+         </page>
+         <page>
+            <page-name>session test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>PortletSessionPortletWindow</window-name>
+               <instance-ref>PortletSessionPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>missing portlet</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>MissingPortletWindow</window-name>
+               <instance-ref>MissingPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>URL portlet</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>URLPortletWindow</window-name>
+               <instance-ref>URLPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>missing instance</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>MissingInstanceWindow</window-name>
+               <instance-ref>MissingInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>charset test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>CharsetPortletWindow</window-name>
+               <instance-ref>CharsetPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>encoding test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>EncodingPortletWindow</window-name>
+               <instance-ref>EncodingPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+         <page>
+            <page-name>header test</page-name>
+            <window>
+               <window-name>CatalogPortletWindow</window-name>
+               <instance-ref>CatalogPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
+               <window-name>HeaderContentPortletWindow</window-name>
+               <instance-ref>HeaderContentPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+         </page>
+      </page>
+   </deployment>
+</deployments>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,26 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<jboss-app>
-   <app-name>samples</app-name>
-</jboss-app>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-app.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-app>
+   <app-name>samples</app-name>
+</jboss-app>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,138 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE portlet-app PUBLIC
-   "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
-   "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
-
-<portlet-app>
-   <remotable>true</remotable>
-   <portlet>
-      <portlet-name>PortletSessionPortlet</portlet-name>
-      <session-config>
-         <distributed>true</distributed>
-      </session-config>
-   </portlet>
-   <portlet>
-      <portlet-name>HeaderContentPortlet</portlet-name>
-      <remotable>false</remotable>
-      <header-content>
-         <link rel="stylesheet" type="text/css" href="/portlet-styles/HeaderContent.css" media="screen"/>
-         <script type="text/javascript" src="/portlet-styles/HeaderContent.js"/>
-         <meta name="description" content="test"/>
-      </header-content>
-   </portlet>
-
-   <!--All portlets we want to expose in WSRP Producer must be mentioned here-->
-   <portlet>
-      <portlet-name>CounterPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>CachedCounterPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>ExceptionPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>PortletB</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>CharsetPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>EncodingPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>SecuredTestPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>WeatherPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>NewsPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>JSPPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>TestPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>URLPortlet</portlet-name>
-   </portlet>
-   <portlet>
-      <portlet-name>BasicPortlet</portlet-name>
-   </portlet>
-
-   <!-- Service injected in the portlet context. -->
-   <service>
-      <service-name>WebAppRegistry</service-name>
-      <service-class>org.jboss.portal.portlet.container.PortletApplicationRegistry</service-class>
-      <service-ref>:service=WebAppRegistry</service-ref>
-   </service>
-   <service>
-      <service-name>PortalObjectContainer</service-name>
-      <service-class>org.jboss.portal.core.model.portal.PortalObjectContainer</service-class>
-      <service-ref>:container=PortalObject</service-ref>
-   </service>
-   <service>
-      <service-name>InstanceContainer</service-name>
-      <service-class>org.jboss.portal.core.model.instance.InstanceContainer</service-class>
-      <service-ref>:container=Instance</service-ref>
-   </service>
-   <service>
-      <service-name>ThemeService</service-name>
-      <service-class>org.jboss.portal.theme.ThemeService</service-class>
-      <service-ref>:service=ThemeService</service-ref>
-   </service>
-   <service>
-      <service-name>LayoutService</service-name>
-      <service-class>org.jboss.portal.theme.LayoutService</service-class>
-      <service-ref>:service=LayoutService</service-ref>
-   </service>
-   <service>
-      <service-name>UserModule</service-name>
-      <service-class>org.jboss.portal.identity.UserModule</service-class>
-      <service-ref>:service=Module,type=User</service-ref>
-   </service>
-   <service>
-      <service-name>RoleModule</service-name>
-      <service-class>org.jboss.portal.identity.RoleModule</service-class>
-      <service-ref>:service=Module,type=Role</service-ref>
-   </service>
-   <service>
-      <service-name>UserProfileModule</service-name>
-      <service-class>org.jboss.portal.identity.UserProfileModule</service-class>
-      <service-ref>:service=Module,type=UserProfile</service-ref>
-   </service>
-   <service>
-      <service-name>MembershipModule</service-name>
-      <service-class>org.jboss.portal.identity.MembershipModule</service-class>
-      <service-ref>:service=Module,type=Membership</service-ref>
-   </service>
-   <service>
-      <service-name>MailModule</service-name>
-      <service-class>org.jboss.portal.core.modules.MailModule</service-class>
-      <service-ref>:service=Module,type=Mail</service-ref>
-   </service>
-</portlet-app>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,138 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE portlet-app PUBLIC
+   "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+   "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
+<portlet-app>
+   <remotable>true</remotable>
+   <portlet>
+      <portlet-name>PortletSessionPortlet</portlet-name>
+      <session-config>
+         <distributed>true</distributed>
+      </session-config>
+   </portlet>
+   <portlet>
+      <portlet-name>HeaderContentPortlet</portlet-name>
+      <remotable>false</remotable>
+      <header-content>
+         <link rel="stylesheet" type="text/css" href="/portlet-styles/HeaderContent.css" media="screen"/>
+         <script type="text/javascript" src="/portlet-styles/HeaderContent.js"/>
+         <meta name="description" content="test"/>
+      </header-content>
+   </portlet>
+
+   <!--All portlets we want to expose in WSRP Producer must be mentioned here-->
+   <portlet>
+      <portlet-name>CounterPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>CachedCounterPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>ExceptionPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>PortletB</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>CharsetPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>EncodingPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>SecuredTestPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>WeatherPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>NewsPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>JSPPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>TestPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>URLPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>BasicPortlet</portlet-name>
+   </portlet>
+
+   <!-- Service injected in the portlet context. -->
+   <service>
+      <service-name>WebAppRegistry</service-name>
+      <service-class>org.jboss.portal.portlet.container.PortletApplicationRegistry</service-class>
+      <service-ref>:service=WebAppRegistry</service-ref>
+   </service>
+   <service>
+      <service-name>PortalObjectContainer</service-name>
+      <service-class>org.jboss.portal.core.model.portal.PortalObjectContainer</service-class>
+      <service-ref>:container=PortalObject</service-ref>
+   </service>
+   <service>
+      <service-name>InstanceContainer</service-name>
+      <service-class>org.jboss.portal.core.model.instance.InstanceContainer</service-class>
+      <service-ref>:container=Instance</service-ref>
+   </service>
+   <service>
+      <service-name>ThemeService</service-name>
+      <service-class>org.jboss.portal.theme.ThemeService</service-class>
+      <service-ref>:service=ThemeService</service-ref>
+   </service>
+   <service>
+      <service-name>LayoutService</service-name>
+      <service-class>org.jboss.portal.theme.LayoutService</service-class>
+      <service-ref>:service=LayoutService</service-ref>
+   </service>
+   <service>
+      <service-name>UserModule</service-name>
+      <service-class>org.jboss.portal.identity.UserModule</service-class>
+      <service-ref>:service=Module,type=User</service-ref>
+   </service>
+   <service>
+      <service-name>RoleModule</service-name>
+      <service-class>org.jboss.portal.identity.RoleModule</service-class>
+      <service-ref>:service=Module,type=Role</service-ref>
+   </service>
+   <service>
+      <service-name>UserProfileModule</service-name>
+      <service-class>org.jboss.portal.identity.UserProfileModule</service-class>
+      <service-ref>:service=Module,type=UserProfile</service-ref>
+   </service>
+   <service>
+      <service-name>MembershipModule</service-name>
+      <service-class>org.jboss.portal.identity.MembershipModule</service-class>
+      <service-ref>:service=Module,type=Membership</service-ref>
+   </service>
+   <service>
+      <service-name>MailModule</service-name>
+      <service-class>org.jboss.portal.core.modules.MailModule</service-class>
+      <service-ref>:service=Module,type=Mail</service-ref>
+   </service>
+</portlet-app>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,63 +0,0 @@
-<%@ page import="org.jboss.portal.server.PortalConstants" %>
-<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~ JBoss, a division of Red Hat                                             ~
-~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
-~ contributors as indicated by the @authors tag. See the                   ~
-~ copyright.txt in the distribution for a full listing of                  ~
-~ individual contributors.                                                 ~
-~                                                                          ~
-~ This is free software; you can redistribute it and/or modify it          ~
-~ under the terms of the GNU Lesser General Public License as              ~
-~ published by the Free Software Foundation; either version 2.1 of         ~
-~ the License, or (at your option) any later version.                      ~
-~                                                                          ~
-~ This software is distributed in the hope that it will be useful,         ~
-~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
-~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
-~ Lesser General Public License for more details.                          ~
-~                                                                          ~
-~ You should have received a copy of the GNU Lesser General Public         ~
-~ License along with this software; if not, write to the Free              ~
-~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
-~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored="false" %>
-
-<portlet:defineObjects/>
-
-<table border="0" cellspacing="2" cellpadding="2">
-   <tr>
-      <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
-         src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
-         alt="Try the latest release of JBoss Portal, live and online."></a>
-         <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
-            src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
-            alt="Download JBoss Portal and have it up and running in minutes."></a>
-         <a href="http://www.portletswap.com" target="_blank"><img
-            src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
-            alt="Download portlets and layouts for your new JBoss Portal installation."></a></td>
-   </tr>
-   <tr>
-      <td></td>
-   </tr>
-   <tr>
-      <td class="portlet-section-alternate">
-         <font class="portlet-font">This is a basic installation of <b><%= PortalConstants.VERSION %></b>. You may
-            log in at any time, using the <i>Login</i> link at the top-right of this page, with the following
-            credentials:</font>
-      </td>
-   </tr>
-   <tr>
-      <td class="portlet-section-alternate" align="center">
-         <b>user/user</b> or <b>admin/admin</b>
-      </td>
-   </tr>
-   <tr>
-      <td align="center">
-         If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
-         our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
-      </td>
-   </tr>
-</table>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,63 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ JBoss, a division of Red Hat                                             ~
+~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+~ contributors as indicated by the @authors tag. See the                   ~
+~ copyright.txt in the distribution for a full listing of                  ~
+~ individual contributors.                                                 ~
+~                                                                          ~
+~ This is free software; you can redistribute it and/or modify it          ~
+~ under the terms of the GNU Lesser General Public License as              ~
+~ published by the Free Software Foundation; either version 2.1 of         ~
+~ the License, or (at your option) any later version.                      ~
+~                                                                          ~
+~ This software is distributed in the hope that it will be useful,         ~
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+~ Lesser General Public License for more details.                          ~
+~                                                                          ~
+~ You should have received a copy of the GNU Lesser General Public         ~
+~ License along with this software; if not, write to the Free              ~
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+   <tr>
+      <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+         src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+         alt="Try the latest release of JBoss Portal, live and online."></a>
+         <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+            src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+            alt="Download JBoss Portal and have it up and running in minutes."></a>
+         <a href="http://www.portletswap.com" target="_blank"><img
+            src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+            alt="Download portlets and layouts for your new JBoss Portal installation."></a></td>
+   </tr>
+   <tr>
+      <td></td>
+   </tr>
+   <tr>
+      <td class="portlet-section-alternate">
+         <font class="portlet-font">This is a basic installation of <b><%= PortalConstants.VERSION %></b>. You may
+            log in at any time, using the <i>Login</i> link at the top-right of this page, with the following
+            credentials:</font>
+      </td>
+   </tr>
+   <tr>
+      <td class="portlet-section-alternate" align="center">
+         <b>user/user</b> or <b>admin/admin</b>
+      </td>
+   </tr>
+   <tr>
+      <td align="center">
+         If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
+         our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
+      </td>
+   </tr>
+</table>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,40 +0,0 @@
-<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                             ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
-  ~ contributors as indicated by the @authors tag. See the                   ~
-  ~ copyright.txt in the distribution for a full listing of                  ~
-  ~ individual contributors.                                                 ~
-  ~                                                                          ~
-  ~ This is free software; you can redistribute it and/or modify it          ~
-  ~ under the terms of the GNU Lesser General Public License as              ~
-  ~ published by the Free Software Foundation; either version 2.1 of         ~
-  ~ the License, or (at your option) any later version.                      ~
-  ~                                                                          ~
-  ~ This software is distributed in the hope that it will be useful,         ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
-  ~ Lesser General Public License for more details.                          ~
-  ~                                                                          ~
-  ~ You should have received a copy of the GNU Lesser General Public         ~
-  ~ License along with this software; if not, write to the Free              ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored="false" %>
-
-<portlet:defineObjects/>
-
-<div align="center">
-   <br/>
-   <font class="portlet-font">Change News Feed URL:</font>
-
-   <form method="post" action="
-<portlet:actionURL></portlet:actionURL>">
-      <font class="portlet-font">URL:</font><br/>
-      <input class="portlet-form-input-field" type="text" value="" size="12" name="newurl">
-      <br/>
-      <input class="portlet-form-input-field" type="submit" name="submit" value="submit">
-   </form>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,40 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<div align="center">
+   <br/>
+   <font class="portlet-font">Change News Feed URL:</font>
+
+   <form method="post" action="
+<portlet:actionURL></portlet:actionURL>">
+      <font class="portlet-font">URL:</font><br/>
+      <input class="portlet-form-input-field" type="text" value="" size="12" name="newurl">
+      <br/>
+      <input class="portlet-form-input-field" type="submit" name="submit" value="submit">
+   </form>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,142 +0,0 @@
-<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                             ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
-  ~ contributors as indicated by the @authors tag. See the                   ~
-  ~ copyright.txt in the distribution for a full listing of                  ~
-  ~ individual contributors.                                                 ~
-  ~                                                                          ~
-  ~ This is free software; you can redistribute it and/or modify it          ~
-  ~ under the terms of the GNU Lesser General Public License as              ~
-  ~ published by the Free Software Foundation; either version 2.1 of         ~
-  ~ the License, or (at your option) any later version.                      ~
-  ~                                                                          ~
-  ~ This software is distributed in the hope that it will be useful,         ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
-  ~ Lesser General Public License for more details.                          ~
-  ~                                                                          ~
-  ~ You should have received a copy of the GNU Lesser General Public         ~
-  ~ License along with this software; if not, write to the Free              ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-
-<!-- this is static markup to test themes for wsrp css selector support -->
-<div id="wsrp_section_selectors">
-   <table border="0" width="100%" cellpadding="2">
-      <tr>
-         <td class="portlet-section-header">portlet-section-header</td>
-      </tr>
-      <tr>
-         <td class="portlet-section-subheader">portlet-section-subheader</td>
-      </tr>
-      <tr>
-         <td class="portlet-section-body">portlet-section-body</td>
-      </tr>
-      <tr>
-         <td class="portlet-section-text">portlet-section-text</td>
-      </tr>
-      <tr>
-         <td class="portlet-section-alternate">portlet-section-alternate</td>
-      </tr>
-      <tr>
-         <td class="portlet-section-selected">portlet-section-selected</td>
-      </tr>
-      <tr>
-         <td class="portlet-section-footer">portlet-section-footer</td>
-      </tr>
-   </table>
-</div>
-<br><span class="portlet-section-body">portlet-horizontal-seperator:</span><br>
-<hr class="portlet-horizontal-separator">
-<br>
-
-<div id="wsrp_table_selectors">
-   <table border="1" width="100%" cellpadding="2" cellspacing="0">
-      <tr>
-         <td class="portlet-table-header">portlet-table-header</td>
-      </tr>
-      <tr>
-         <td class="portlet-table-subheader">portlet-table-subheader</td>
-      </tr>
-      <tr>
-         <td class="portlet-table-alternate">portlet-table-alternate</td>
-      </tr>
-      <tr>
-         <td class="portlet-table-selected">portlet-table-selected</td>
-      </tr>
-      <tr>
-         <td class="portlet-table-body">portlet-table-body</td>
-      </tr>
-      <tr>
-         <td class="portlet-table-text">portlet-table-text</td>
-      </tr>
-      <tr>
-         <td class="portlet-table-footer">portlet-table-footer</td>
-      </tr>
-   </table>
-</div>
-<br>
-
-<div id="wsrp_form_selectors">
-   <form action="">
-      <fieldset>
-         <legend>A Sample Form:</legend>
-         <table border="0" width="100%" cellpadding="2">
-            <tr>
-               <td class="portlet-form-label" colspan="2">portlet-form-label</td>
-            </tr>
-            <tr>
-               <td class="portlet-form-field-label" width="140px"><label class="portlet-form-field-label"
-                                                                         for="text-field">
-                  portlet-form-field-label:</label></td>
-               <td align="left"><input type="text" id="text-field" class="portlet-form-input-field"
-                                       value="portlet-form-input-field" size="50"/></td>
-            </tr>
-            <tr>
-               <td class="portlet-form-field-label" width="140px"><label class="portlet-form-field-label"
-                                                                         for="select-control">
-                  portlet-form-field-label:</label></td>
-               <td>
-                  <select id="select-control" class="portlet-form-field">
-                     <option>portlet-form-field</option>
-                     <option>
-                        Option 2
-                     </option>
-                  </select>
-               </td>
-            </tr>
-            <tr>
-               <td colspan="2"><input type="button" class="portlet-form-button" value="portlet-form-button"/></td>
-            </tr>
-            <tr>
-               <td colspan="2"></td>
-            </tr>
-         </table>
-      </fieldset>
-   </form>
-</div>
-<br>
-
-<div id="wsrp_message_selectors">
-   <table border="0" width="100%" cellpadding="2">
-      <tr>
-         <td class="portlet-msg-status">portlet-msg-status</td>
-      </tr>
-      <tr>
-         <td class="portlet-msg-info">portlet-msg-info</td>
-      </tr>
-      <tr>
-         <td class="portlet-msg-error">portlet-msg-error</td>
-      </tr>
-      <tr>
-         <td class="portlet-msg-alert">portlet-msg-alert</td>
-      </tr>
-      <tr>
-         <td class="portlet-font-dim">portlet-font-dim</td>
-      </tr>
-      <tr>
-         <td class="portlet-font">portlet-font</td>
-      </tr>
-   </table>
-</div>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,142 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<!-- this is static markup to test themes for wsrp css selector support -->
+<div id="wsrp_section_selectors">
+   <table border="0" width="100%" cellpadding="2">
+      <tr>
+         <td class="portlet-section-header">portlet-section-header</td>
+      </tr>
+      <tr>
+         <td class="portlet-section-subheader">portlet-section-subheader</td>
+      </tr>
+      <tr>
+         <td class="portlet-section-body">portlet-section-body</td>
+      </tr>
+      <tr>
+         <td class="portlet-section-text">portlet-section-text</td>
+      </tr>
+      <tr>
+         <td class="portlet-section-alternate">portlet-section-alternate</td>
+      </tr>
+      <tr>
+         <td class="portlet-section-selected">portlet-section-selected</td>
+      </tr>
+      <tr>
+         <td class="portlet-section-footer">portlet-section-footer</td>
+      </tr>
+   </table>
+</div>
+<br><span class="portlet-section-body">portlet-horizontal-seperator:</span><br>
+<hr class="portlet-horizontal-separator">
+<br>
+
+<div id="wsrp_table_selectors">
+   <table border="1" width="100%" cellpadding="2" cellspacing="0">
+      <tr>
+         <td class="portlet-table-header">portlet-table-header</td>
+      </tr>
+      <tr>
+         <td class="portlet-table-subheader">portlet-table-subheader</td>
+      </tr>
+      <tr>
+         <td class="portlet-table-alternate">portlet-table-alternate</td>
+      </tr>
+      <tr>
+         <td class="portlet-table-selected">portlet-table-selected</td>
+      </tr>
+      <tr>
+         <td class="portlet-table-body">portlet-table-body</td>
+      </tr>
+      <tr>
+         <td class="portlet-table-text">portlet-table-text</td>
+      </tr>
+      <tr>
+         <td class="portlet-table-footer">portlet-table-footer</td>
+      </tr>
+   </table>
+</div>
+<br>
+
+<div id="wsrp_form_selectors">
+   <form action="">
+      <fieldset>
+         <legend>A Sample Form:</legend>
+         <table border="0" width="100%" cellpadding="2">
+            <tr>
+               <td class="portlet-form-label" colspan="2">portlet-form-label</td>
+            </tr>
+            <tr>
+               <td class="portlet-form-field-label" width="140px"><label class="portlet-form-field-label"
+                                                                         for="text-field">
+                  portlet-form-field-label:</label></td>
+               <td align="left"><input type="text" id="text-field" class="portlet-form-input-field"
+                                       value="portlet-form-input-field" size="50"/></td>
+            </tr>
+            <tr>
+               <td class="portlet-form-field-label" width="140px"><label class="portlet-form-field-label"
+                                                                         for="select-control">
+                  portlet-form-field-label:</label></td>
+               <td>
+                  <select id="select-control" class="portlet-form-field">
+                     <option>portlet-form-field</option>
+                     <option>
+                        Option 2
+                     </option>
+                  </select>
+               </td>
+            </tr>
+            <tr>
+               <td colspan="2"><input type="button" class="portlet-form-button" value="portlet-form-button"/></td>
+            </tr>
+            <tr>
+               <td colspan="2"></td>
+            </tr>
+         </table>
+      </fieldset>
+   </form>
+</div>
+<br>
+
+<div id="wsrp_message_selectors">
+   <table border="0" width="100%" cellpadding="2">
+      <tr>
+         <td class="portlet-msg-status">portlet-msg-status</td>
+      </tr>
+      <tr>
+         <td class="portlet-msg-info">portlet-msg-info</td>
+      </tr>
+      <tr>
+         <td class="portlet-msg-error">portlet-msg-error</td>
+      </tr>
+      <tr>
+         <td class="portlet-msg-alert">portlet-msg-alert</td>
+      </tr>
+      <tr>
+         <td class="portlet-font-dim">portlet-font-dim</td>
+      </tr>
+      <tr>
+         <td class="portlet-font">portlet-font</td>
+      </tr>
+   </table>
+</div>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,40 +0,0 @@
-<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                             ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
-  ~ contributors as indicated by the @authors tag. See the                   ~
-  ~ copyright.txt in the distribution for a full listing of                  ~
-  ~ individual contributors.                                                 ~
-  ~                                                                          ~
-  ~ This is free software; you can redistribute it and/or modify it          ~
-  ~ under the terms of the GNU Lesser General Public License as              ~
-  ~ published by the Free Software Foundation; either version 2.1 of         ~
-  ~ the License, or (at your option) any later version.                      ~
-  ~                                                                          ~
-  ~ This software is distributed in the hope that it will be useful,         ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
-  ~ Lesser General Public License for more details.                          ~
-  ~                                                                          ~
-  ~ You should have received a copy of the GNU Lesser General Public         ~
-  ~ License along with this software; if not, write to the Free              ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored="false" %>
-
-<portlet:defineObjects/>
-
-<div align="center">
-   <br/>
-   <font class="portlet-font">Change Weather Location:</font>
-
-   <form method="post" action="
-<portlet:actionURL></portlet:actionURL>">
-      <font class="portlet-font">Zip Code:</font><br/>
-      <input class="portlet-form-input-field" type="text" value="" size="12" name="newzip">
-      <br/>
-      <input class="portlet-form-input-field" type="submit" name="submit" value="submit">
-   </form>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,40 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<div align="center">
+   <br/>
+   <font class="portlet-font">Change Weather Location:</font>
+
+   <form method="post" action="
+<portlet:actionURL></portlet:actionURL>">
+      <font class="portlet-font">Zip Code:</font><br/>
+      <input class="portlet-form-input-field" type="text" value="" size="12" name="newzip">
+      <br/>
+      <input class="portlet-form-input-field" type="submit" name="submit" value="submit">
+   </form>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,143 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE deployments PUBLIC
-   "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
-   "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
-
-<deployments>
-   <deployment>
-      <instance>
-         <instance-id>JSPPortletInstance</instance-id>
-         <portlet-ref>JSPPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>NewsPortletInstance</instance-id>
-         <portlet-ref>NewsPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-id>NewsPortletInstance2</instance-id>
-         <portlet-ref>NewsPortlet</portlet-ref>
-         <preferences>
-            <preference>
-               <name>expires</name>
-               <value>180</value>
-            </preference>
-            <preference>
-               <name>RssXml</name>
-               <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
-            </preference>
-         </preferences>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>WeatherPortletInstance</instance-id>
-         <portlet-ref>WeatherPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>HeaderContentPortletInstance</instance-id>
-         <portlet-ref>HeaderContentPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>URLPortletInstance</instance-id>
-         <portlet-ref>URLPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>TestPortletInstance</instance-id>
-         <portlet-ref>TestPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>PortletAInstance</instance-id>
-         <portlet-ref>PortletA</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>PortletBInstance</instance-id>
-         <portlet-ref>PortletB</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>SecuredTestPortletInstance</instance-id>
-         <portlet-ref>SecuredTestPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>CharsetPortletInstance</instance-id>
-         <portlet-ref>CharsetPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>CounterPortletInstance</instance-id>
-         <portlet-ref>CounterPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>CachedCounterPortletInstance</instance-id>
-         <portlet-ref>CachedCounterPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>ExceptionPortletInstance</instance-id>
-         <portlet-ref>ExceptionPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>PortletSessionPortletInstance</instance-id>
-         <portlet-ref>PortletSessionPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>CharsetPortletInstance</instance-id>
-         <portlet-ref>CharsetPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>EncodingPortletInstance</instance-id>
-         <portlet-ref>EncodingPortlet</portlet-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet-instances.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,149 @@
+<?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE deployments PUBLIC
+   "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+   "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
+
+<deployments>
+   <deployment>
+      <instance>
+         <instance-id>JSPPortletInstance</instance-id>
+         <portlet-ref>JSPPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>NewsPortletInstance</instance-id>
+         <portlet-ref>NewsPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>NewsPortletInstance2</instance-id>
+         <portlet-ref>NewsPortlet</portlet-ref>
+         <preferences>
+            <preference>
+               <name>expires</name>
+               <value>180</value>
+            </preference>
+            <preference>
+               <name>RssXml</name>
+               <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
+            </preference>
+         </preferences>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>WeatherPortletInstance</instance-id>
+         <portlet-ref>WeatherPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>HeaderContentPortletInstance</instance-id>
+         <portlet-ref>HeaderContentPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>URLPortletInstance</instance-id>
+         <portlet-ref>URLPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>TestPortletInstance</instance-id>
+         <portlet-ref>TestPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>PortletAInstance</instance-id>
+         <portlet-ref>PortletA</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>PortletBInstance</instance-id>
+         <portlet-ref>PortletB</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>SecuredTestPortletInstance</instance-id>
+         <portlet-ref>SecuredTestPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CharsetPortletInstance</instance-id>
+         <portlet-ref>CharsetPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CounterPortletInstance</instance-id>
+         <portlet-ref>CounterPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CachedCounterPortletInstance</instance-id>
+         <portlet-ref>CachedCounterPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>ExceptionPortletInstance</instance-id>
+         <portlet-ref>ExceptionPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>PortletSessionPortletInstance</instance-id>
+         <portlet-ref>PortletSessionPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CharsetPortletInstance</instance-id>
+         <portlet-ref>CharsetPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>EncodingPortletInstance</instance-id>
+         <portlet-ref>EncodingPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>FSContentDrivenPortletInstance</instance-id>
+         <portlet-ref>FSContentDrivenPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<portlet-app
-   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   version="1.0">
-   <portlet>
-      <description>Simple JSP portlet</description>
-      <portlet-name>JSPPortlet</portlet-name>
-      <display-name>JSP Portlet</display-name>
-      <portlet-class>org.jboss.samples.portlet.jsp.JSPPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Greetings!</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet to test modification of head content</description>
-      <portlet-name>HeaderContentPortlet</portlet-name>
-      <display-name>Header Content Portlet</display-name>
-
-      <portlet-class>org.jboss.portal.core.portlet.plugins.HeaderContentPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-      <portlet-info>
-         <title>Header Content portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>A test portlet</description>
-      <description xml:lang="fr">C'est une portlet de test</description>
-      <portlet-name>TestPortlet</portlet-name>
-      <display-name>Test Portlet</display-name>
-      <display-name xml:lang="fr">Portlet Test</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-         <portlet-mode>EDIT</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Test portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-      <portlet-preferences>
-         <preference>
-            <name>read-write foo</name>
-            <value>bar</value>
-         </preference>
-         <preference>
-            <name>read-only foo</name>
-            <value>bar</value>
-            <read-only>true</read-only>
-         </preference>
-         <preference>
-            <name>read-write foo[]</name>
-            <value>bar0</value>
-            <value>bar1</value>
-         </preference>
-         <preference>
-            <name>html chars</name>
-            <value><![CDATA[<&>"]]></value>
-         </preference>
-      </portlet-preferences>
-      <security-role-ref>
-         <role-name>Admin</role-name>
-      </security-role-ref>
-      <security-role-ref>
-         <role-name>User</role-name>
-      </security-role-ref>
-      <security-role-ref>
-         <role-name>Authenticated</role-name>
-      </security-role-ref>
-   </portlet>
-   <portlet>
-      <description>Portlet displaying the number of it's action/render calls</description>
-      <portlet-name>CounterPortlet</portlet-name>
-      <display-name>Counter Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-      <portlet-info>
-         <title>Counter portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Counter Portlet with cache support</description>
-      <portlet-name>CachedCounterPortlet</portlet-name>
-      <display-name>Cached Counter Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class>
-      <expiration-cache>60</expiration-cache>
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-      <portlet-info>
-         <title>Cached Counter portlet</title>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet for testing behaviour on exceptions</description>
-      <portlet-name>ExceptionPortlet</portlet-name>
-      <display-name>Exception Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.ExceptionPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-      <portlet-info>
-         <title>Exception portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet using portlet session</description>
-      <portlet-name>PortletSessionPortlet</portlet-name>
-      <display-name>Porltet Session Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.PortletSessionPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-      <portlet-info>
-         <title>Portlet session portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet for demonstrating IPC</description>
-      <portlet-name>PortletA</portlet-name>
-      <display-name>Portlet A</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.event.PortletA</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Test Event A</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet for demonstrating IPC</description>
-      <portlet-name>PortletB</portlet-name>
-      <display-name>Portlet B</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.event.PortletB</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Test Event B</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet showing different ways to properly display and submit unicode text</description>
-      <portlet-name>CharsetPortlet</portlet-name>
-      <display-name>Charset Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.CharsetPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-         <portlet-mode>HELP</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Test charset</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet for testing encoding</description>
-      <portlet-name>EncodingPortlet</portlet-name>
-      <display-name>Encoding Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.EncodingPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Test charset</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Secured Test Portlet</description>
-      <portlet-name>SecuredTestPortlet</portlet-name>
-      <display-name>Secured Test Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-         <portlet-mode>HELP</portlet-mode>
-         <portlet-mode>EDIT</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Secured test portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <description>Portlet providing weather forecast</description>
-      <portlet-name>WeatherPortlet</portlet-name>
-      <display-name>Weather Portlet</display-name>
-      <portlet-class>org.jboss.samples.portlet.weather.WeatherPortlet</portlet-class>
-      <init-param>
-         <name>default_zipcode</name>
-         <value>33145</value>
-      </init-param>
-      <init-param>
-         <name>RSS_XSL</name>
-         <value>/WEB-INF/xsl/weather/Rss.xsl</value>
-      </init-param>
-      <init-param>
-         <name>base_url</name>
-         <value>http://xml.weather.yahoo.com/forecastrss?p=</value>
-      </init-param>
-      <expiration-cache>180</expiration-cache>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-         <portlet-mode>EDIT</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Weather Portlet</title>
-         <keywords>sample,news</keywords>
-      </portlet-info>
-      <portlet-preferences>
-         <preference>
-            <name>expires</name>
-            <value>180</value>
-         </preference>
-         <preference>
-            <name>RssXml</name>
-            <value>http://xml.weather.yahoo.com/forecastrss?p=33145</value>
-            <read-only>false</read-only>
-         </preference>
-      </portlet-preferences>
-   </portlet>
-   <portlet>
-      <description>Portlet aggregating news from different feeds</description>
-      <portlet-name>NewsPortlet</portlet-name>
-      <display-name>News Portlet</display-name>
-      <portlet-class>org.jboss.samples.portlet.news.NewsPortlet</portlet-class>
-      <init-param>
-         <name>RSS1_XSL</name>
-         <value>/WEB-INF/Rss1.xsl</value>
-      </init-param>
-      <init-param>
-         <name>RSS2_XSL</name>
-         <value>/WEB-INF/Rss2.xsl</value>
-      </init-param>
-      <init-param>
-         <name>base_url</name>
-         <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
-      </init-param>
-      <expiration-cache>180</expiration-cache>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-         <portlet-mode>EDIT</portlet-mode>
-      </supports>
-      <supported-locale>en</supported-locale>
-      <supported-locale>fr</supported-locale>
-      <resource-bundle>NewsResource</resource-bundle>
-      <portlet-info>
-         <title>News Feeds</title>
-         <keywords>sample,news</keywords>
-      </portlet-info>
-      <portlet-preferences>
-         <preference>
-            <name>expires</name>
-            <value>180</value>
-         </preference>
-         <preference>
-            <name>RssXml</name>
-            <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
-            <read-only>false</read-only>
-         </preference>
-      </portlet-preferences>
-   </portlet>
-   <portlet>
-      <description>URL Portlet</description>
-      <portlet-name>URLPortlet</portlet-name>
-      <display-name>URL Portlet</display-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.URLPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>URL Portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <portlet-name>BasicPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.BasicPortlet</portlet-class>
-      <display-name>Basic Portlet</display-name>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Basic Portlet</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
-   </portlet>
-   <user-attribute>
-      <name>user.name.nickName</name>
-   </user-attribute>
-   <user-attribute>
-      <name>user.business-info.online.email</name>
-   </user-attribute>
-   <user-attribute>
-      <name>user.name.given</name>
-   </user-attribute>
-   <user-attribute>
-      <name>user.name.family</name>
-   </user-attribute>
-   <user-attribute>
-      <name>portal.user.locale</name>
-   </user-attribute>
-   <user-attribute>
-      <name>portal.user.signature</name>
-   </user-attribute>
-   <user-attribute>
-      <name>portal.user.last-login-date</name>
-   </user-attribute>
-   <security-constraint>
-      <portlet-collection>
-         <portlet-name>SecuredTestPortlet</portlet-name>
-      </portlet-collection>
-      <user-data-constraint>
-         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </user-data-constraint>
-   </security-constraint>
-</portlet-app>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app
+   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   version="1.0">
+   <portlet>
+      <description>Simple JSP portlet</description>
+      <portlet-name>JSPPortlet</portlet-name>
+      <display-name>JSP Portlet</display-name>
+      <portlet-class>org.jboss.samples.portlet.jsp.JSPPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Greetings!</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet to test modification of head content</description>
+      <portlet-name>HeaderContentPortlet</portlet-name>
+      <display-name>Header Content Portlet</display-name>
+
+      <portlet-class>org.jboss.portal.core.portlet.plugins.HeaderContentPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+         <title>Header Content portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>A test portlet</description>
+      <description xml:lang="fr">C'est une portlet de test</description>
+      <portlet-name>TestPortlet</portlet-name>
+      <display-name>Test Portlet</display-name>
+      <display-name xml:lang="fr">Portlet Test</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Test portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+      <portlet-preferences>
+         <preference>
+            <name>read-write foo</name>
+            <value>bar</value>
+         </preference>
+         <preference>
+            <name>read-only foo</name>
+            <value>bar</value>
+            <read-only>true</read-only>
+         </preference>
+         <preference>
+            <name>read-write foo[]</name>
+            <value>bar0</value>
+            <value>bar1</value>
+         </preference>
+         <preference>
+            <name>html chars</name>
+            <value><![CDATA[<&>"]]></value>
+         </preference>
+      </portlet-preferences>
+      <security-role-ref>
+         <role-name>Admin</role-name>
+      </security-role-ref>
+      <security-role-ref>
+         <role-name>User</role-name>
+      </security-role-ref>
+      <security-role-ref>
+         <role-name>Authenticated</role-name>
+      </security-role-ref>
+   </portlet>
+   <portlet>
+      <description>Portlet displaying the number of it's action/render calls</description>
+      <portlet-name>CounterPortlet</portlet-name>
+      <display-name>Counter Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+         <title>Counter portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Counter Portlet with cache support</description>
+      <portlet-name>CachedCounterPortlet</portlet-name>
+      <display-name>Cached Counter Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class>
+      <expiration-cache>60</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+         <title>Cached Counter portlet</title>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet for testing behaviour on exceptions</description>
+      <portlet-name>ExceptionPortlet</portlet-name>
+      <display-name>Exception Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.ExceptionPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+         <title>Exception portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet using portlet session</description>
+      <portlet-name>PortletSessionPortlet</portlet-name>
+      <display-name>Porltet Session Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.PortletSessionPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+         <title>Portlet session portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet for demonstrating IPC</description>
+      <portlet-name>PortletA</portlet-name>
+      <display-name>Portlet A</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.event.PortletA</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Test Event A</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet for demonstrating IPC</description>
+      <portlet-name>PortletB</portlet-name>
+      <display-name>Portlet B</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.event.PortletB</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Test Event B</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet showing different ways to properly display and submit unicode text</description>
+      <portlet-name>CharsetPortlet</portlet-name>
+      <display-name>Charset Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.CharsetPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>HELP</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Test charset</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet for testing encoding</description>
+      <portlet-name>EncodingPortlet</portlet-name>
+      <display-name>Encoding Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.EncodingPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Test charset</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Secured Test Portlet</description>
+      <portlet-name>SecuredTestPortlet</portlet-name>
+      <display-name>Secured Test Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>HELP</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Secured test portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>Portlet providing weather forecast</description>
+      <portlet-name>WeatherPortlet</portlet-name>
+      <display-name>Weather Portlet</display-name>
+      <portlet-class>org.jboss.samples.portlet.weather.WeatherPortlet</portlet-class>
+      <init-param>
+         <name>default_zipcode</name>
+         <value>33145</value>
+      </init-param>
+      <init-param>
+         <name>RSS_XSL</name>
+         <value>/WEB-INF/xsl/weather/Rss.xsl</value>
+      </init-param>
+      <init-param>
+         <name>base_url</name>
+         <value>http://xml.weather.yahoo.com/forecastrss?p=</value>
+      </init-param>
+      <expiration-cache>180</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Weather Portlet</title>
+         <keywords>sample,news</keywords>
+      </portlet-info>
+      <portlet-preferences>
+         <preference>
+            <name>expires</name>
+            <value>180</value>
+         </preference>
+         <preference>
+            <name>RssXml</name>
+            <value>http://xml.weather.yahoo.com/forecastrss?p=33145</value>
+            <read-only>false</read-only>
+         </preference>
+      </portlet-preferences>
+   </portlet>
+   <portlet>
+      <description>Portlet aggregating news from different feeds</description>
+      <portlet-name>NewsPortlet</portlet-name>
+      <display-name>News Portlet</display-name>
+      <portlet-class>org.jboss.samples.portlet.news.NewsPortlet</portlet-class>
+      <init-param>
+         <name>RSS1_XSL</name>
+         <value>/WEB-INF/Rss1.xsl</value>
+      </init-param>
+      <init-param>
+         <name>RSS2_XSL</name>
+         <value>/WEB-INF/Rss2.xsl</value>
+      </init-param>
+      <init-param>
+         <name>base_url</name>
+         <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
+      </init-param>
+      <expiration-cache>180</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+      </supports>
+      <supported-locale>en</supported-locale>
+      <supported-locale>fr</supported-locale>
+      <resource-bundle>NewsResource</resource-bundle>
+      <portlet-info>
+         <title>News Feeds</title>
+         <keywords>sample,news</keywords>
+      </portlet-info>
+      <portlet-preferences>
+         <preference>
+            <name>expires</name>
+            <value>180</value>
+         </preference>
+         <preference>
+            <name>RssXml</name>
+            <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
+            <read-only>false</read-only>
+         </preference>
+      </portlet-preferences>
+   </portlet>
+   <portlet>
+      <description>URL Portlet</description>
+      <portlet-name>URLPortlet</portlet-name>
+      <display-name>URL Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.URLPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>URL Portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <portlet-name>BasicPortlet</portlet-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.BasicPortlet</portlet-class>
+      <display-name>Basic Portlet</display-name>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Basic Portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <portlet>
+      <description>File System Content Driven Portlet</description>
+      <portlet-name>FSContentDrivenPortlet</portlet-name>
+      <display-name>File System Content Driven Portlet</display-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.FSContentDrivenPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+         <title>File Portlet</title>
+         <keywords>sample,test</keywords>
+      </portlet-info>
+   </portlet>
+   <user-attribute>
+      <name>user.name.nickName</name>
+   </user-attribute>
+   <user-attribute>
+      <name>user.business-info.online.email</name>
+   </user-attribute>
+   <user-attribute>
+      <name>user.name.given</name>
+   </user-attribute>
+   <user-attribute>
+      <name>user.name.family</name>
+   </user-attribute>
+   <user-attribute>
+      <name>portal.user.locale</name>
+   </user-attribute>
+   <user-attribute>
+      <name>portal.user.signature</name>
+   </user-attribute>
+   <user-attribute>
+      <name>portal.user.last-login-date</name>
+   </user-attribute>
+   <security-constraint>
+      <portlet-collection>
+         <portlet-name>SecuredTestPortlet</portlet-name>
+      </portlet-collection>
+      <user-data-constraint>
+         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+      </user-data-constraint>
+   </security-constraint>
+</portlet-app>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-   <listener>
-      <listener-class> org.jboss.portal.portlet.session.SessionListener </listener-class>
-   </listener>
-</web-app>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/web.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+   <listener>
+      <listener-class> org.jboss.portal.portlet.session.SessionListener </listener-class>
+   </listener>
+   <context-param>
+      <param-name>org.jboss.portal.content_type</param-name>
+      <param-value>filesystem</param-value>
+   </context-param>
+   <context-param>
+      <param-name>org.jboss.portal.portlet_instance</param-name>
+      <param-value>FSContentDrivenPortletInstance</param-value>
+   </context-param>
+   <listener>
+      <listener-class>org.jboss.portlet.content.ContentTypeRegistration</listener-class>
+   </listener>
+</web-app>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<xsl:stylesheet
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   version="1.0">
-
-   <xsl:output method="html"/>
-
-   <xsl:template match="/">
-      <TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">
-         <xsl:apply-templates/>
-      </TABLE>
-   </xsl:template>
-
-   <xsl:template match="item">
-      <TR>
-         <TD>
-            -
-            <A TARGET="_popup" STYLE="text-decoration: none;">
-               <xsl:attribute name="HREF">
-                  <xsl:value-of select="link"/>
-               </xsl:attribute>
-               <xsl:value-of select="title"/>
-            </A>
-         </TD>
-      </TR>
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <xsl:template match="text()"/>
-</xsl:stylesheet>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<xsl:stylesheet
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   version="1.0">
+
+   <xsl:output method="html"/>
+
+   <xsl:template match="/">
+      <TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">
+         <xsl:apply-templates/>
+      </TABLE>
+   </xsl:template>
+
+   <xsl:template match="item">
+      <TR>
+         <TD>
+            -
+            <A TARGET="_popup" STYLE="text-decoration: none;">
+               <xsl:attribute name="HREF">
+                  <xsl:value-of select="link"/>
+               </xsl:attribute>
+               <xsl:value-of select="title"/>
+            </A>
+         </TD>
+      </TR>
+      <xsl:apply-templates/>
+   </xsl:template>
+
+   <xsl:template match="text()"/>
+</xsl:stylesheet>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,54 +0,0 @@
-<?xml version="1.0" ?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-   <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
-   <xsl:variable name="link-path">
-      <xsl:value-of select="rss/channel/link"/>
-   </xsl:variable>
-   <xsl:template match="/">
-      <div align="center">
-         <a href="{$link-path}" target="_blank">
-            <xsl:value-of select="rss/channel/title"/>
-         </a>
-      </div>
-      <ul>
-         <xsl:for-each select="rss/channel/item">
-            <xsl:variable name="this-link">
-               <xsl:value-of select="link"/>
-            </xsl:variable>
-            <li>
-               <a href="{$this-link}" target="_blank">
-                  <xsl:value-of select="title"/>
-               </a>
-            </li>
-            <!--         <xsl:value-of select="description" disable-output-escaping="yes"/>
-         <br/>-->
-         </xsl:for-each>
-      </ul>
-      <br/>
-      <br/>
-      <xsl:value-of select="rss/channel/copyright"/>
-   </xsl:template>
-</xsl:stylesheet>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+   <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
+   
+   <xsl:variable name="link-path">
+      <xsl:value-of select="rss/channel/link"/>
+   </xsl:variable>
+
+   <xsl:template match="/">
+      <div style="font-size: 1.5em;" class="portlet-section-header">
+         <a href="{$link-path}" target="_blank">
+            <xsl:value-of select="rss/channel/title"/> - <xsl:value-of select="rss/channel/description"/>
+         </a>
+      </div>
+      <ul>
+         <xsl:for-each select="rss/channel/item">
+            <xsl:variable name="this-link">
+               <xsl:value-of select="link"/>
+            </xsl:variable>
+            <li>
+               <div class="portlet-section-subheader">
+                 <a href="{$this-link}" target="_blank">
+                   <xsl:value-of select="title"/>
+                 </a>
+               </div>
+               <div class="portlet-font-dim">
+                   <xsl:if test="string(author)">
+                     <xsl:value-of select="author"/>
+                   </xsl:if>
+                   <xsl:if test="string(author) and string(pubDate)">
+                     &#160;-&#160;
+                   </xsl:if>
+                   <xsl:if test="string(pubDate)">
+                     <xsl:value-of select="pubDate"/>
+                   </xsl:if>
+               </div>
+            </li>
+            <!--         <xsl:value-of select="description" disable-output-escaping="yes"/>
+         <br/>-->
+         </xsl:for-each>
+      </ul>
+      <br/>
+      <br/>
+      <xsl:value-of select="rss/channel/copyright"/>
+   </xsl:template>
+</xsl:stylesheet>

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,100 +0,0 @@
-<?xml version="1.0" ?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-   <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
-   <xsl:variable name="image-path">http://us.i1.yimg.com/us.yimg.com/i/us/we/52/</xsl:variable>
-   <xsl:variable name="link-path">
-      <xsl:value-of select="rss/channel/link"/>
-   </xsl:variable>
-   <xsl:template match="/">
-      <br/>
-      <div align="center">
-         <font>
-            <b>
-               <xsl:for-each select="rss/channel/location">
-                  <xsl:value-of select="@city"/>, <xsl:value-of select="@region"/>, <xsl:value-of
-                  select="@country"/>
-               </xsl:for-each>
-            </b>
-         </font>
-         <br/>
-         <br/>
-         <table width="130" border="0">
-            <tr>
-               <xsl:for-each select="rss/channel/item/condition">
-                  <td>
-                     <table border="0" height="130">
-                        <tr>
-                           <td class="portlet-section-header" align="center">Currently</td>
-                        </tr>
-                        <tr>
-                           <td class="portlet-section-alternate" align="center" valign="top">
-                              <img src="{$image-path}/{@code}.gif"/>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td class="portlet-section-alternate" align="center" valign="top">
-                              <xsl:value-of select="@text"/>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td class="portlet-section-alternate" align="center" valign="top">
-                              <xsl:value-of select="@temp"/>F</td>
-                        </tr>
-                     </table>
-                  </td>
-               </xsl:for-each>
-               <xsl:for-each select="rss/channel/item/forecast">
-                  <td>
-                     <table border="0" height="130">
-                        <tr>
-                           <td class="portlet-section-header" align="center" valign="top">
-                              <xsl:value-of select="@day"/>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td class="portlet-section-alternate" align="center" valign="top">
-                              <img src="{$image-path}/{@code}.gif"/>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td class="portlet-section-alternate" align="center" valign="top">
-                              <xsl:value-of select="@text"/>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td class="portlet-section-alternate" align="center" valign="top">
-                              <xsl:value-of select="@low"/>F/<xsl:value-of select="@high"/>F</td>
-                        </tr>
-                     </table>
-                  </td>
-               </xsl:for-each>
-            </tr>
-         </table>
-         <br/>
-         <a href="{$link-path}" target="_blank">Complete Forecast</a>
-      </div>
-   </xsl:template>
-</xsl:stylesheet>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,100 @@
+<?xml version="1.0" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+   <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
+   <xsl:variable name="image-path">http://us.i1.yimg.com/us.yimg.com/i/us/we/52/</xsl:variable>
+   <xsl:variable name="link-path">
+      <xsl:value-of select="rss/channel/link"/>
+   </xsl:variable>
+   <xsl:template match="/">
+      <br/>
+      <div align="center">
+         <font>
+            <b>
+               <xsl:for-each select="rss/channel/location">
+                  <xsl:value-of select="@city"/>, <xsl:value-of select="@region"/>, <xsl:value-of
+                  select="@country"/>
+               </xsl:for-each>
+            </b>
+         </font>
+         <br/>
+         <br/>
+         <table width="130" border="0">
+            <tr>
+               <xsl:for-each select="rss/channel/item/condition">
+                  <td>
+                     <table border="0" height="130">
+                        <tr>
+                           <td class="portlet-section-header" align="center">Currently</td>
+                        </tr>
+                        <tr>
+                           <td class="portlet-section-alternate" align="center" valign="top">
+                              <img src="{$image-path}/{@code}.gif"/>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td class="portlet-section-alternate" align="center" valign="top">
+                              <xsl:value-of select="@text"/>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td class="portlet-section-alternate" align="center" valign="top">
+                              <xsl:value-of select="@temp"/>F</td>
+                        </tr>
+                     </table>
+                  </td>
+               </xsl:for-each>
+               <xsl:for-each select="rss/channel/item/forecast">
+                  <td>
+                     <table border="0" height="130">
+                        <tr>
+                           <td class="portlet-section-header" align="center" valign="top">
+                              <xsl:value-of select="@day"/>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td class="portlet-section-alternate" align="center" valign="top">
+                              <img src="{$image-path}/{@code}.gif"/>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td class="portlet-section-alternate" align="center" valign="top">
+                              <xsl:value-of select="@text"/>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td class="portlet-section-alternate" align="center" valign="top">
+                              <xsl:value-of select="@low"/>F/<xsl:value-of select="@high"/>F</td>
+                        </tr>
+                     </table>
+                  </td>
+               </xsl:for-each>
+            </tr>
+         </table>
+         <br/>
+         <a href="{$link-path}" target="_blank">Complete Forecast</a>
+      </div>
+   </xsl:template>
+</xsl:stylesheet>

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1 (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1 +0,0 @@
-Bar content
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/bar.txt	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1 @@
+Bar content
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1 +0,0 @@
-Foo content
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir1/foo.txt	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1 @@
+Foo content
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2 (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1 +0,0 @@
-Foo content
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/dir2/foo.txt	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1 @@
+Foo content
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/accessorize.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/accessorize.gif (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/accessorize.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/developers_banner.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/developers_banner.gif (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/developers_banner.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/dodemo.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/dodemo.gif (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/dodemo.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/getcode.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/getcode.gif (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/images/getcode.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,13 +0,0 @@
-#Introducing-HeaderContent {
-/*	Original Logo...*/
-   background-image: url( ../images/developers_banner.gif );
-   background-repeat: no-repeat;
-   width: 187px;
-   height: 120px;
-}
-
-#Introducing-HeaderContentInput {
-   position: relative;
-   top: 85px;
-   left: 3px;
-}

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.css	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,13 @@
+#Introducing-HeaderContent {
+/*	Original Logo...*/
+   background-image: url( ../images/developers_banner.gif );
+   background-repeat: no-repeat;
+   width: 187px;
+   height: 120px;
+}
+
+#Introducing-HeaderContentInput {
+   position: relative;
+   top: 85px;
+   left: 3px;
+}

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,5 +0,0 @@
-// simple test java script
-function injectJS()
-{
-   alert('hello from the injected java script!');
-}

Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/portlet-styles/HeaderContent.js	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,5 @@
+// simple test java script
+function injectJS()
+{
+   alert('hello from the injected java script!');
+}

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -31,6 +31,11 @@
    <distributable/>
    -->
 
+   <!-- Bridge portal user events -->
+   <listener>
+      <listener-class>org.jboss.portal.core.event.user.UserEventBridge</listener-class>
+   </listener>
+
    <!-- The portal servlet is the main entrance point -->
    <servlet>
       <servlet-name>PortalServletWithPathMapping</servlet-name>
@@ -41,9 +46,9 @@
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
       <init-param>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Core</param-value>
-         <description>The request controller for the portal servlet</description>
+         <param-name>controllerFactoryName</param-name>
+         <param-value>portal:service=ControllerFactory</param-value>
+         <description>The request controller factory for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>
@@ -62,9 +67,9 @@
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
       <init-param>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Core</param-value>
-         <description>The request controller for the portal servlet</description>
+         <param-name>controllerFactoryName</param-name>
+         <param-value>portal:service=ControllerFactory</param-value>
+         <description>The request controller factory for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>
@@ -230,9 +235,9 @@
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
       <init-param>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Ajax</param-value>
-         <description>The request controller for the portal servlet</description>
+         <param-name>controllerFactoryName</param-name>
+         <param-value>portal:service=ControllerFactory</param-value>
+         <description>The request controller factory for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/error.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/error.jsp	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/error.jsp	2007-04-04 13:24:34 UTC (rev 10757)
@@ -59,7 +59,7 @@
 				<!-- REAL CONTENT CELL : begin -->
 				<td style="background-color:#b4b4b4" align="center">
 					<b>JBoss Portal Login</b><br/><br/>
-					<p style="color:red">Login failed !</p>
+					<p style="color:red"><%= request.getAttribute("org.jboss.portal.loginError") %></p>
 					<table>
 				       <tr>
 					  <td align="right" width="50">

Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,1320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<server>
+
+   <!-- Server configuration service -->
+   <mbean
+      code="org.jboss.portal.server.config.ServerConfigService"
+      name="portal:service=ServerConfig"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="ConfigLocation">conf/config.xml</attribute>
+   </mbean>
+
+   <!-- DTD repository -->
+   <mbean
+      code="org.jboss.portal.server.impl.xml.EntityResolverService"
+      name="portal:service=EntityResolver"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="DTDMapping">
+         <properties>
+            <entry key="-//JBoss Portal//DTD JBoss Portlet 2.6//EN">dtd/jboss-portlet_2_6.dtd</entry>
+            <entry key="-//JBoss Portal//DTD JBoss App 2.6//EN">dtd/jboss-app_2_6.dtd</entry>
+            <entry key="-//JBoss Portal//DTD Portal Object 2.6//EN">dtd/portal-object_2_6.dtd</entry>
+            <entry key="-//JBoss Portal//DTD Portlet Instances 2.6//EN">dtd/portlet-instances_2_6.dtd</entry>
+         </properties>
+      </attribute>
+   </mbean>
+
+   <!-- Runtime context for running portlet container -->
+   <mbean
+      code="org.jboss.portal.web.jboss.JBossWebContext"
+      name="portal:service=ServletContainerContext"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
+   <!-- Portal security services-->
+   <mbean
+      code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
+      name="portal:service=AuthorizationDomainRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/> 
+   </mbean>
+   <mbean
+      code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
+      name="portal:service=PortalAuthorizationManagerFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="AuthorizationDomainRegistry"
+         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
+      name="portal:service=PortletSecurityService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+	   <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+      <depends
+         optional-attribute-name="AuthorizationDomainRegistry"
+         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+   </mbean>
+
+   <!-- Server stack -->
+   <mbean
+      code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
+      name="portal:service=Interceptor,type=Server,name=Transaction"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.event.user.UserEventInterceptor"
+      name="portal:service=Interceptor,type=Server,name=UserEvent"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
+      name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.server.UserInterceptor"
+      name="portal:service=Interceptor,type=Server,name=User"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="CacheUser">true</attribute>
+      <depends>portal:service=Module,type=IdentityServiceController</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
+      name="portal:service=Interceptor,type=Server,name=Locale"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
+      name="portal:service=Interceptor,type=Server,name=ContentType"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+      name="portal:service=InterceptorStackFactory,type=Server"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=UserEvent</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=ContentType</depends-list-element>
+      </depends-list>
+   </mbean>
+
+   <!-- Command stack -->
+   <mbean
+      code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
+      name="portal:service=Interceptor,type=Command,name=PortalNode"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
+      name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
+      name="portal:service=Interceptor,type=Command,name=PageCustomizer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+      name="portal:service=Interceptor,type=Command,name=Ajax"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
+      name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="ListenerRegistry"
+         proxy-type="attribute">portal:service=ListenerRegistry</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+      name="portal:service=InterceptorStackFactory,type=Command"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
+      </depends-list>
+   </mbean>
+
+   <!-- Instance stack -->
+   <mbean
+      code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+      name="portal:service=InterceptorStackFactory,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
+      </depends-list>
+   </mbean>
+
+   <!-- Producer stack -->
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Valve"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="ServletContainerContext"
+         proxy-type="attribute">portal:service=ServletContainerContext</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.bridge.BridgeInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Bridge"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=WindowStates"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Modes"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Transaction"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Header"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+      name="portal:service=InterceptorStackFactory,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Header</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Transaction</depends-list-element>
+      </depends-list>
+   </mbean>
+
+   <!-- Theme and layout services -->
+   <mbean
+      code="org.jboss.portal.theme.impl.ThemeServiceImpl"
+      name="portal:service=ThemeService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="DefaultThemeName">renaissance</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.theme.impl.LayoutServiceImpl"
+      name="portal:service=LayoutService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="DefaultLayoutName">generic</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.theme.impl.page.PageServiceImpl"
+      name="portal:service=PageService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="LayoutService"
+         proxy-type="attribute">portal:service=LayoutService</depends>
+      <depends
+         optional-attribute-name="ThemeService"
+         proxy-type="attribute">portal:service=ThemeService</depends>
+   </mbean>
+
+   <!--
+      | Uncomment in clustered mode : replicated cache for hibernate
+      
+      <mbean
+      code="org.jboss.cache.TreeCache"
+      name="portal:service=TreeCache,type=hibernate">
+      <depends>jboss:service=Naming</depends>
+      <depends>jboss:service=TransactionManager</depends>
+      <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name="CacheMode">REPL_SYNC</attribute>
+      <attribute name="ClusterName">portal.hibernate</attribute>
+      </mbean>
+      
+      <mbean
+      code="org.jboss.portal.jems.hibernate.JBossTreeCacheProvider"
+      name="portal:service=TreeCacheProvider,type=hibernate">
+      <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=hibernate</depends>
+      </mbean>
+   
+   -->
+
+   <!-- Session factories -->
+   <mbean
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
+         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+       -->
+      <attribute name="DoChecking">true</attribute>
+      <attribute name="ConfigLocation">conf/hibernate/user/hibernate.cfg.xml</attribute>
+      <attribute name="SetupLocation">conf/hibernate/user/setup.txt</attribute>
+      <attribute name="JNDIName">java:/portal/IdentitySessionFactory</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
+         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+       -->
+      <attribute name="DoChecking">true</attribute>
+      <attribute name="ConfigLocation">conf/hibernate/instance/hibernate.cfg.xml</attribute>
+      <attribute name="JNDIName">java:/portal/InstanceSessionFactory</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
+         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+       -->
+      <attribute name="DoChecking">true</attribute>
+      <attribute name="ConfigLocation">conf/hibernate/portal/hibernate.cfg.xml</attribute>
+      <attribute name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=Portlet"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
+         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+       -->
+      <attribute name="DoChecking">true</attribute>
+      <attribute name="ConfigLocation">conf/hibernate/portlet/hibernate.cfg.xml</attribute>
+      <attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute>
+   </mbean>
+
+   <!--Identity-->
+   <mbean
+      code="org.jboss.portal.identity.service.IdentityEventManagerService"
+      name="portal:service=IdentityEventManager"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.identity.IdentityServiceControllerImpl"
+      name="portal:service=Module,type=IdentityServiceController"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate</depends>
+      <depends
+         optional-attribute-name="IdentityEventBroadcaster"
+         proxy-type="attribute">portal:service=IdentityEventManager</depends>
+      <attribute name="JndiName">java:/portal/IdentityServiceController</attribute>
+      <attribute name="RegisterMBeans">true</attribute>
+      <attribute name="ConfigFile">conf/identity/identity-config.xml</attribute>
+      <attribute name="DefaultConfigFile">conf/identity/standardidentity-config.xml</attribute>
+   </mbean>
+
+   <mbean
+      code="org.jboss.portal.core.impl.mail.MailModuleImpl"
+      name="portal:service=Module,type=Mail"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss:service=Mail</depends>
+      <depends>portal:service=Module,type=IdentityServiceController</depends>
+      <attribute name="QueueCapacity">-1</attribute>
+      <attribute name="Gateway">localhost</attribute>
+      <attribute name="SmtpUser"></attribute>
+      <attribute name="SmtpPassword"></attribute>
+      <attribute name="JavaMailDebugEnabled">false</attribute>
+      <attribute name="SMTPConnectionTimeout">100000</attribute>
+      <attribute name="SMTPTimeout">10000</attribute>
+      <attribute name="JNDIName">java:portal/MailModule</attribute>
+   </mbean>
+
+   <mbean
+      code="org.jboss.security.auth.login.DynamicLoginConfig"
+      name="portal:service=JAASLoginModule">
+      <depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
+      <depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+      <attribute name="AuthConfig">conf/login-config.xml</attribute>
+   </mbean>
+
+   <!-- Registries -->
+   <mbean
+      code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"
+      name="portal:service=WebAppRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
+   <!-- Listener registry -->
+   <mbean
+      code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
+      name="portal:service=ListenerRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
+   <!-- The different containers -->
+   <mbean
+      code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
+      name="portal:container=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=Instance</depends>
+      <depends
+         optional-attribute-name="StackFactory"
+         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+      <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+      <depends
+         optional-attribute-name="AuthorizationDomainRegistry"
+         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
+      <attribute name="CacheNaturalId">true</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
+      name="portal:container=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=PortalObject</depends>
+	   <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+      <depends
+         optional-attribute-name="AuthorizationDomainRegistry"
+         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="ContentProviderRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
+      <attribute name="CacheNaturalId">true</attribute>
+   </mbean>
+
+   <!-- Customization manager -->
+   <mbean
+      code="org.jboss.portal.core.impl.model.CustomizationManagerService"
+      name="portal:service=CustomizationManager"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+	   <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="PortalObjectContainer"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends>portal:service=Module,type=IdentityServiceController</depends>
+      <attribute name="DashboardContextId">dashboard</attribute>
+   </mbean>
+
+   <!-- The content provider framework -->
+   <mbean
+      code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
+      name="portal:service=ContentProviderRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
+      name="portal:service=ContentRenderer,type=portlet"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="ContentType">portlet</attribute>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.impl.model.content.generic.GenericContentProviderRegistry"
+      name="portal:service=GenericContentProviderRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+   </mbean>
+
+   <!-- Integrate identity -->
+   <mbean
+      code="org.jboss.portal.core.identity.DashboardBridge"
+      name="portal:service=IdentityDashboardBridge"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="IdentityEventEmitter"
+         proxy-type="attribute">portal:service=IdentityEventManager</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.identity.SecurityBridge"
+      name="portal:service=IdentitySecurityBridge"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="IdentityEventEmitter"
+         proxy-type="attribute">portal:service=IdentityEventManager</depends>
+      <depends
+         optional-attribute-name="DynamicLoginConfig"
+         proxy-type="attribute">portal:service=JAASLoginModule</depends>
+   </mbean>
+
+   <!-- Command factories -->
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
+      name="portal:commandFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <!-- LABS -->
+      <depends
+         optional-attribute-name="NextFactory"
+         proxy-type="attribute">portal:commandFactory=LabsMain</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+      name="portal:commandFactory=DefaultPortal"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="NextFactory"
+         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+      name="portal:commandFactory=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+   </mbean>
+   <!-- LABS
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,path=portal"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/portal</attribute>
+      <depends
+         optional-attribute-name="DelegatingFactory"
+         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="DelegateFactory"
+         proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+   </mbean> -->
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
+      name="portal:commandFactory=SignOut"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,path=signout"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/signout</attribute>
+      <depends
+         optional-attribute-name="DelegatingFactory"
+         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="DelegateFactory"
+         proxy-type="attribute">portal:commandFactory=SignOut</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.model.portal.DashboardCommandFactory"
+      name="portal:commandFactory=Dashboard"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,path=dashboard"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/dashboard</attribute>
+      <depends
+         optional-attribute-name="DelegatingFactory"
+         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="DelegateFactory"
+         proxy-type="attribute">portal:commandFactory=Dashboard</depends>
+   </mbean>
+
+   <!-- LABS command factories -->
+
+   <mbean
+      code="org.jboss.labs.mapper.command.MainCF"
+      name="portal:commandFactory=LabsMain"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="PageDelegatingCF"
+         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+      <depends
+         optional-attribute-name="PortalObjectCF"
+         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+   </mbean>
+
+   <mbean
+      code="org.jboss.labs.mapper.command.delegating.page.PageDelegatingCFImpl"
+      name="portal:commandFactory=LabsPageDelegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.labs.mapper.command.delegating.page.WikiCF"
+      name="portal:commandFactory=Wiki"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">wiki</attribute>
+      <attribute name="PageName">labswiki</attribute>
+      <attribute name="WindowName">WikiPortletWindow</attribute>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="PageDelegatingCF"
+         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+      <depends
+         optional-attribute-name="PortalObjectCF"
+         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.labs.mapper.command.delegating.page.DownloadCF"
+      name="portal:commandFactory=Download"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">downloads</attribute>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="PageDelegatingCF"
+         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+      <depends
+         optional-attribute-name="PortalObjectCF"
+         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.labs.mapper.command.delegating.page.BlogCF"
+      name="portal:commandFactory=Blog"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">blog</attribute>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="PageDelegatingCF"
+         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+      <depends
+         optional-attribute-name="PortalObjectCF"
+         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+   </mbean>
+
+   <mbean
+      code="org.jboss.labs.mapper.command.PortalObjectCFImpl"
+      name="portal:commandFactory=LabsPortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends>shotoku:service=svn</depends>
+   </mbean>
+
+   <!-- URL factories -->
+   <!-- LABS -->
+   <mbean
+      code="org.jboss.labs.mapper.url.LabsDelegatingURLFactoryService"
+      name="portal:urlFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <!-- LABS -->
+      <depends
+         optional-attribute-name="NextFactory"
+         proxy-type="attribute">portal:urlFactory=LabsMain</depends>
+   </mbean>
+
+   <!-- URL factories -->
+   <!--<mbean
+      code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
+      name="portal:urlFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>-->
+   <!-- LABS
+   <mbean
+      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+      name="portal:urlFactory=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/portal</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>  -->
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+      name="portal:urlFactory=SignOut"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/signout</attribute>
+      <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+      name="portal:urlFactory=Dashboard"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/dashboard</attribute>
+      <attribute name="ClassNames">org.jboss.portal.core.model.portal.command.ViewDashboardCommand</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+
+   <!-- LABS URL factories -->
+
+   <mbean
+      code="org.jboss.labs.mapper.url.LabsMainUrlFactory"
+      name="portal:urlFactory=LabsMain"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.labs.mapper.url.WikiUrlFactory"
+      name="portal:urlFactory=Wiki"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <attribute name="Path">wiki</attribute>
+      <attribute name="PageName">labswiki</attribute>
+      <xmbean/>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.labs.mapper.url.DownloadUrlFactory"
+      name="portal:urlFactory=Download"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <attribute name="Path">downloads</attribute>
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.labs.mapper.url.BlogUrlFactory"
+      name="portal:urlFactory=Blog"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <attribute name="Path">blog</attribute>
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+
+   <!-- The federating portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
+      name="portal:service=PortletInvoker,type=Federating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
+   <!-- The portlet container invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+      name="portal:service=PortletInvoker,type=Container"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="StackFactory"
+         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=WebAppRegistry</depends>
+   </mbean>
+
+   <!-- The producer portlet invoker -->
+   <mbean
+      code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
+      name="portal:service=PersistenceManager,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=Portlet</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
+      name="portal:service=StateManagementPolicy,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="PersistLocally">true</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.portlet.impl.state.StateConverterV0"
+      name="portal:service=StateConverter,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
+      name="portal:service=PortletInvoker,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+      <depends
+         optional-attribute-name="PersistenceManager"
+         proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+      <depends
+         optional-attribute-name="StateManagementPolicy"
+         proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+      <depends
+         optional-attribute-name="StateConverter"
+         proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
+   </mbean>
+
+   <!-- Register the state portlet invoker on the federating portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService"
+      name="portal:service=PortletInvokerRegistration,id=local"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Id">local</attribute>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
+      <depends
+         optional-attribute-name="FederatingPortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+   </mbean>
+
+   <!-- The core controller -->
+   <mbean
+      code="org.jboss.portal.core.controller.classic.ClassicController"
+      name="portal:controller=Core"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="PageService"
+         proxy-type="attribute">portal:service=PageService</depends>
+      <depends
+         optional-attribute-name="CommandFactory"
+         proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+      <depends
+         optional-attribute-name="URLFactory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="StackFactory"
+         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+      <depends
+         optional-attribute-name="PortalObjectContainer"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="ContentRendererRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+   </mbean>
+
+   <!-- The ajax controller -->
+   <mbean
+      code="org.jboss.portal.core.controller.ajax.AjaxController"
+      name="portal:controller=Ajax"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="PageService"
+         proxy-type="attribute">portal:service=PageService</depends>
+      <depends
+         optional-attribute-name="CommandFactory"
+         proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+      <depends
+         optional-attribute-name="URLFactory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="StackFactory"
+         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+      <depends
+         optional-attribute-name="PortalObjectContainer"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="PortalAuthorizationManagerFactory"
+         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+      <depends
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="ContentRendererRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+   </mbean>
+
+   <!-- The controller factory -->
+   <mbean
+      code="org.jboss.portal.core.controller.ControllerFactory"
+      name="portal:service=ControllerFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="ClassicController"
+         proxy-type="attribute">portal:controller=Core</depends>
+      <depends
+         optional-attribute-name="AjaxController"
+         proxy-type="attribute">portal:controller=Ajax</depends>
+   </mbean>
+
+   <!-- -->
+   <mbean
+      code="org.jboss.portal.server.impl.ServerImpl"
+      name="portal:service=Server"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Config"
+         proxy-type="attribute">portal:service=ServerConfig</depends>
+   </mbean>
+
+   <!-- -->
+   <mbean
+      code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
+      name="portal:deployer=PortalWebApp">
+      <depends>jboss.system:service=MainDeployer</depends>
+      <depends>portal:container=PortalObject</depends>
+      <depends>portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="PortalServer"
+         proxy-type="attribute">portal:service=Server</depends>
+   </mbean>
+
+   <!-- Portal object deployment factory -->
+   <!--
+      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
+      
+      <mbean
+      code="org.jboss.portal.jems.as.system.LifecycleInvoker"
+      name="portal:service=Controller,target=ObjectDeploymentFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
+      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+      <depends>portal:container=PortalObject</depends>
+      <attribute name="Target">portal:deploymentFactory=Object</attribute>
+      <attribute name="OnStart">registerFactory</attribute>
+      <attribute name="OnStop">unregisterFactory</attribute>
+      </mbean>
+   
+   -->
+   <mbean
+      code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
+      name="portal:deploymentFactory=Object"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Deployer"
+         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends
+         optional-attribute-name="PortalObjectContainer"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+      <depends
+         optional-attribute-name="ContentProviderRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+      <depends
+         optional-attribute-name="PortalObjectEntityResolver"
+         proxy-type="attribute">portal:service=EntityResolver</depends>
+      <attribute name="SetupLocation">conf/data/default-object.xml</attribute>
+      <!-- Set to false in clustered mode, otherwise set to true -->
+      <attribute name="RegistrationControlledByService">true</attribute>
+   </mbean>
+
+   <!--  -->
+   <!--
+      | Uncomment in cluster mode : have the creation of instances run as a clustered singleton
+      
+      <mbean
+      code="org.jboss.portal.jems.as.system.LifecycleInvoker"
+      name="portal:service=Controller,target=PortletAppDeploymentFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
+      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+      <depends>portal:container=PortalObject</depends>
+      <attribute name="Target">portal:deploymentFactory=PortletApp</attribute>
+      <attribute name="OnStart">enableCreateInstances</attribute>
+      <attribute name="OnStop">disableCreateInstances</attribute>
+      </mbean>
+   
+   -->
+   <mbean
+      code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
+      name="portal:deploymentFactory=PortletApp"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <!-- 
+      <depends>jboss.ha:service=HASingletonDeployer</depends>
+       -->
+      <depends>portal:service=PortletInvokerRegistration,id=local</depends>
+      <depends
+         optional-attribute-name="Deployer"
+         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends
+         optional-attribute-name="WebAppRegistry"
+         proxy-type="attribute">portal:service=WebAppRegistry</depends>
+      <depends
+         optional-attribute-name="Config"
+         proxy-type="attribute">portal:service=ServerConfig</depends>
+      <depends
+         optional-attribute-name="PortletSecurityService"
+         proxy-type="attribute">portal:service=PortletSecurityService</depends>
+      <depends
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="JBossPortletEntityResolver"
+         proxy-type="attribute">portal:service=EntityResolver</depends>
+      <depends
+         optional-attribute-name="PortalObjectEntityResolver"
+         proxy-type="attribute">portal:service=EntityResolver</depends>
+      <depends
+         optional-attribute-name="PortletInstancesEntityResolver"
+         proxy-type="attribute">portal:service=EntityResolver</depends>
+      <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
+      <attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
+      <!-- Set to false in clustered mode, otherwise set to true -->
+      <attribute name="CreateInstances">true</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
+      name="portal:deploymentFactory=Layout"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Deployer"
+         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends
+         optional-attribute-name="LayoutService"
+         proxy-type="attribute">portal:service=LayoutService</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
+      name="portal:deploymentFactory=LayoutFeatures"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Deployer"
+         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends
+         optional-attribute-name="LayoutService"
+         proxy-type="attribute">portal:service=LayoutService</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
+      name="portal:deploymentFactory=Theme"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Deployer"
+         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends
+         optional-attribute-name="ThemeService"
+         proxy-type="attribute">portal:service=ThemeService</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.deployment.WebAppAdapter"
+      name="portal:deployer=Adapter"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+      <depends
+         optional-attribute-name="Deployer"
+         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends
+         optional-attribute-name="JBossAppEntityResolver"
+         proxy-type="attribute">portal:service=EntityResolver</depends>
+   </mbean>
+
+</server>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -34,6 +34,7 @@
       <attribute name="ConfigLocation">conf/config.xml</attribute>
    </mbean>
 
+   <!-- DTD repository -->
    <mbean
       code="org.jboss.portal.server.impl.xml.EntityResolverService"
       name="portal:service=EntityResolver"
@@ -50,6 +51,15 @@
       </attribute>
    </mbean>
 
+   <!-- Runtime context for running portlet container -->
+   <mbean
+      code="org.jboss.portal.web.jboss.JBossWebContext"
+      name="portal:service=ServletContainerContext"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
    <!-- Portal security services-->
    <mbean
       code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
@@ -91,6 +101,13 @@
       <xmbean/>
    </mbean>
    <mbean
+      code="org.jboss.portal.core.event.user.UserEventInterceptor"
+      name="portal:service=Interceptor,type=Server,name=UserEvent"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
       code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
       name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
       xmbean-dd=""
@@ -103,6 +120,7 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute name="CacheUser">true</attribute>
       <depends>portal:service=Module,type=IdentityServiceController</depends>
    </mbean>
    <mbean
@@ -127,6 +145,7 @@
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
          <depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=UserEvent</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
@@ -136,6 +155,20 @@
 
    <!-- Command stack -->
    <mbean
+      code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+      name="portal:service=Interceptor,type=Command,name=Ajax"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor"
+      name="portal:service=Interceptor,type=Command,name=NavigationalState"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
       code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
       name="portal:service=Interceptor,type=Command,name=PortalNode"
       xmbean-dd=""
@@ -160,13 +193,6 @@
          proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
-      name="portal:service=Interceptor,type=Command,name=Ajax"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
       code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
       name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
       xmbean-dd=""
@@ -183,10 +209,11 @@
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
       </depends-list>
    </mbean>
@@ -255,6 +282,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <depends
+         optional-attribute-name="ServletContainerContext"
+         proxy-type="attribute">portal:service=ServletContainerContext</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
@@ -491,7 +521,7 @@
 
    <!-- Registries -->
    <mbean
-      code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
+      code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"
       name="portal:service=WebAppRegistry"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -546,23 +576,12 @@
       <depends
          optional-attribute-name="InstanceContainer"
          proxy-type="attribute">portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="ContentProviderRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
       <attribute name="CacheNaturalId">true</attribute>
    </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.content.portlet.PortletContentHandler"
-      name="portal:service=ContentHandler,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="ContentType">portlet</attribute>
-   </mbean>
 
    <!-- Customization manager -->
    <mbean
@@ -584,372 +603,377 @@
       <attribute name="DashboardContextId">dashboard</attribute>
    </mbean>
 
-   <!-- Integrate identity -->
+   <!-- The content provider framework -->
    <mbean
-      code="org.jboss.portal.core.identity.DashboardBridge"
-      name="portal:service=IdentityDashboardBridge"
+      code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
+      name="portal:service=ContentProviderRegistry"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends
-         optional-attribute-name="IdentityEventEmitter"
-         proxy-type="attribute">portal:service=IdentityEventManager</depends>
-      <depends
-         optional-attribute-name="CustomizationManager"
-         proxy-type="attribute">portal:service=CustomizationManager</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.identity.SecurityBridge"
-      name="portal:service=IdentitySecurityBridge"
+      code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
+      name="portal:service=ContentRenderer,type=portlet"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute name="ContentType">portlet</attribute>
       <depends
-         optional-attribute-name="IdentityEventEmitter"
-         proxy-type="attribute">portal:service=IdentityEventManager</depends>
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <depends
-         optional-attribute-name="DynamicLoginConfig"
-         proxy-type="attribute">portal:service=JAASLoginModule</depends>
-   </mbean>
-
-   <!-- Command factories -->
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
-      name="portal:commandFactory=Delegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <!-- LABS -->
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
       <depends
-         optional-attribute-name="NextFactory"
-         proxy-type="attribute">portal:commandFactory=LabsMain</depends>
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
-      name="portal:commandFactory=DefaultPortal"
+      code="org.jboss.portal.core.impl.model.content.generic.GenericContentProviderRegistry"
+      name="portal:service=GenericContentProviderRegistry"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends
-         optional-attribute-name="NextFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
-      name="portal:commandFactory=PortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
       <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
+         optional-attribute-name="InstanceContainer"
+         proxy-type="attribute">portal:container=Instance</depends>
    </mbean>
-   <!-- LABS
+
+   <!-- Integrate identity -->
    <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=portal"
+      code="org.jboss.portal.core.identity.DashboardBridge"
+      name="portal:service=IdentityDashboardBridge"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <attribute name="Path">/portal</attribute>
       <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+         optional-attribute-name="IdentityEventEmitter"
+         proxy-type="attribute">portal:service=IdentityEventManager</depends>
       <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=PortalObject</depends>
-   </mbean>-->
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
-      name="portal:commandFactory=SignOut"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+         optional-attribute-name="CustomizationManager"
+         proxy-type="attribute">portal:service=CustomizationManager</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=signout"
+      code="org.jboss.portal.core.identity.SecurityBridge"
+      name="portal:service=IdentitySecurityBridge"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <attribute name="Path">/signout</attribute>
       <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+         optional-attribute-name="IdentityEventEmitter"
+         proxy-type="attribute">portal:service=IdentityEventManager</depends>
       <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=SignOut</depends>
+         optional-attribute-name="DynamicLoginConfig"
+         proxy-type="attribute">portal:service=JAASLoginModule</depends>
    </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.portal.DashboardCommandFactory"
-      name="portal:commandFactory=Dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/dashboard</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Dashboard</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
-      name="portal:commandFactory=Configurator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=configure"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/configure</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Configurator</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/test</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Test</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
-      name="portal:commandFactory=Test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">TestPortletInstance</attribute>
-   </mbean>
 
-   <!-- LABS command factories -->
+    <!-- Command factories -->
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
+       name="portal:commandFactory=Delegating"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <!-- LABS -->
+       <depends
+          optional-attribute-name="NextFactory"
+          proxy-type="attribute">portal:commandFactory=LabsMain</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+       name="portal:commandFactory=DefaultPortal"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="NextFactory"
+          proxy-type="attribute">portal:commandFactory=Delegating</depends>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+       name="portal:commandFactory=PortalObject"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+    </mbean>
+    <!-- LABS
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+       name="portal:commandFactory=Delegate,path=portal"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/portal</attribute>
+       <depends
+          optional-attribute-name="DelegatingFactory"
+          proxy-type="attribute">portal:commandFactory=Delegating</depends>
+       <depends
+          optional-attribute-name="DelegateFactory"
+          proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+    </mbean> -->
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
+       name="portal:commandFactory=SignOut"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+       name="portal:commandFactory=Delegate,path=signout"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/signout</attribute>
+       <depends
+          optional-attribute-name="DelegatingFactory"
+          proxy-type="attribute">portal:commandFactory=Delegating</depends>
+       <depends
+          optional-attribute-name="DelegateFactory"
+          proxy-type="attribute">portal:commandFactory=SignOut</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.model.portal.DashboardCommandFactory"
+       name="portal:commandFactory=Dashboard"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+       name="portal:commandFactory=Delegate,path=dashboard"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/dashboard</attribute>
+       <depends
+          optional-attribute-name="DelegatingFactory"
+          proxy-type="attribute">portal:commandFactory=Delegating</depends>
+       <depends
+          optional-attribute-name="DelegateFactory"
+          proxy-type="attribute">portal:commandFactory=Dashboard</depends>
+    </mbean>
 
-   <mbean
-      code="org.jboss.labs.mapper.command.MainCF"
-      name="portal:commandFactory=LabsMain"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="PageDelegatingCF"
-         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
-      <depends
-         optional-attribute-name="PortalObjectCF"
-         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
-   </mbean>
+    <!-- LABS command factories -->
 
-   <mbean
-      code="org.jboss.labs.mapper.command.delegating.page.PageDelegatingCFImpl"
-      name="portal:commandFactory=LabsPageDelegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.labs.mapper.command.delegating.page.WikiCF"
-      name="portal:commandFactory=Wiki"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">wiki</attribute>
-      <attribute name="PageName">labswiki</attribute>
-      <attribute name="WindowName">WikiPortletWindow</attribute>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="PageDelegatingCF"
-         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
-      <depends
-         optional-attribute-name="PortalObjectCF"
-         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.labs.mapper.command.delegating.page.DownloadCF"
-      name="portal:commandFactory=Download"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">downloads</attribute>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="PageDelegatingCF"
-         proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
-      <depends
-         optional-attribute-name="PortalObjectCF"
-         proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
-   </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.command.MainCF"
+       name="portal:commandFactory=LabsMain"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends
+          optional-attribute-name="PageDelegatingCF"
+          proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+       <depends
+          optional-attribute-name="PortalObjectCF"
+          proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+    </mbean>
 
-   <mbean
-      code="org.jboss.labs.mapper.command.PortalObjectCFImpl"
-      name="portal:commandFactory=LabsPortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends>shotoku:service=svn</depends>
-   </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.command.delegating.page.PageDelegatingCFImpl"
+       name="portal:commandFactory=LabsPageDelegating"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.command.delegating.page.WikiCF"
+       name="portal:commandFactory=Wiki"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">wiki</attribute>
+       <attribute name="PageName">labswiki</attribute>
+       <attribute name="WindowName">WikiPortletWindow</attribute>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends
+          optional-attribute-name="PageDelegatingCF"
+          proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+       <depends
+          optional-attribute-name="PortalObjectCF"
+          proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.command.delegating.page.DownloadCF"
+       name="portal:commandFactory=Download"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">downloads</attribute>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends
+          optional-attribute-name="PageDelegatingCF"
+          proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+       <depends
+          optional-attribute-name="PortalObjectCF"
+          proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.command.delegating.page.BlogCF"
+       name="portal:commandFactory=Blog"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">blog</attribute>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends
+          optional-attribute-name="PageDelegatingCF"
+          proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+       <depends
+          optional-attribute-name="PortalObjectCF"
+          proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+    </mbean>
 
-   <!-- URL factories -->
-   <!-- LABS -->
-   <mbean
-      code="org.jboss.labs.mapper.url.LabsDelegatingURLFactoryService"
-      name="portal:urlFactory=Delegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <!-- LABS -->
-      <depends
-         optional-attribute-name="NextFactory"
-         proxy-type="attribute">portal:urlFactory=LabsMain</depends>
-   </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.command.PortalObjectCFImpl"
+       name="portal:commandFactory=LabsPortalObject"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends>shotoku:service=svn</depends>
+    </mbean>
 
-   <!-- URL factories -->
-   <!--<mbean
-      code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
-      name="portal:urlFactory=Delegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>-->
-   <!-- LABS
-   <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
-      name="portal:urlFactory=PortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/portal</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>  -->
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
-      name="portal:urlFactory=SignOut"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/signout</attribute>
-      <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
-      name="portal:urlFactory=Dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/dashboard</attribute>
-      <attribute name="ClassNames">org.jboss.portal.core.model.portal.command.ViewDashboardCommand</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
-      name="portal:urlFactory=Configurator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
-      <attribute name="Path">/configure</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
-      name="portal:urlFactory=Test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">TestPortletInstance</attribute>
-      <attribute name="Path">/test</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
+    <!-- URL factories -->
+    <!-- LABS -->
+    <mbean
+       code="org.jboss.labs.mapper.url.LabsDelegatingURLFactoryService"
+       name="portal:urlFactory=Delegating"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <!-- LABS -->
+       <depends
+          optional-attribute-name="NextFactory"
+          proxy-type="attribute">portal:urlFactory=LabsMain</depends>
+    </mbean>
 
-   <!-- LABS URL factories -->
+    <!-- URL factories -->
+    <!--<mbean
+       code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
+       name="portal:urlFactory=Delegating"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+    </mbean>-->
+    <!-- LABS
+    <mbean
+       code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+       name="portal:urlFactory=PortalObject"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/portal</attribute>
+       <depends
+          optional-attribute-name="Factory"
+          proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>  -->
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+       name="portal:urlFactory=SignOut"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/signout</attribute>
+       <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+       <depends
+          optional-attribute-name="Factory"
+          proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+       name="portal:urlFactory=Dashboard"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/dashboard</attribute>
+       <attribute name="ClassNames">org.jboss.portal.core.model.portal.command.ViewDashboardCommand</attribute>
+       <depends
+          optional-attribute-name="Factory"
+          proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
 
-   <mbean
-      code="org.jboss.labs.mapper.url.LabsMainUrlFactory"
-      name="portal:urlFactory=LabsMain"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.labs.mapper.url.WikiUrlFactory"
-      name="portal:urlFactory=Wiki"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <attribute name="Path">wiki</attribute>
-      <attribute name="PageName">labswiki</attribute>
-      <xmbean/>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.labs.mapper.url.DownloadUrlFactory"
-      name="portal:urlFactory=Download"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <attribute name="Path">downloads</attribute>
-      <xmbean/>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
+    <!-- LABS URL factories -->
 
+    <mbean
+       code="org.jboss.labs.mapper.url.LabsMainUrlFactory"
+       name="portal:urlFactory=LabsMain"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.url.WikiUrlFactory"
+       name="portal:urlFactory=Wiki"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <attribute name="Path">wiki</attribute>
+       <attribute name="PageName">labswiki</attribute>
+       <xmbean/>
+       <depends
+          optional-attribute-name="Factory"
+          proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.url.DownloadUrlFactory"
+       name="portal:urlFactory=Download"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <attribute name="Path">downloads</attribute>
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends
+          optional-attribute-name="Factory"
+          proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.labs.mapper.url.BlogUrlFactory"
+       name="portal:urlFactory=Blog"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <attribute name="Path">blog</attribute>
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+       <depends
+          optional-attribute-name="Factory"
+          proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+
    <!-- The federating portlet invoker -->
    <mbean
       code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
@@ -1035,52 +1059,6 @@
          proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
    </mbean>
 
-   <!-- The content editor registry -->
-   <mbean
-      code="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistryService"
-      name="portal:service=ContentEditorRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.portlet.dashboard.PortletContentEditor"
-      name="portal:service=ContentEditor,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentEditorRegistry</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="ContentType">portlet</attribute>
-   </mbean>
-
-   <!-- The content renderer registry -->
-   <mbean
-      code="org.jboss.portal.core.impl.model.portal.content.ContentRendererRegistryService"
-      name="portal:service=ContentRendererRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.portal.content.PortletContentRenderer"
-      name="portal:service=ContentRenderer,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="ContentType">portlet</attribute>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=ContentRendererRegistry</depends>
-      <depends
-         optional-attribute-name="CustomizationManager"
-         proxy-type="attribute">portal:service=CustomizationManager</depends>
-   </mbean>
-
    <!-- The core controller -->
    <mbean
       code="org.jboss.portal.core.controller.classic.ClassicController"
@@ -1114,7 +1092,7 @@
          proxy-type="attribute">portal:service=CustomizationManager</depends>
       <depends
          optional-attribute-name="ContentRendererRegistry"
-         proxy-type="attribute">portal:service=ContentRendererRegistry</depends>
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
    </mbean>
 
    <!-- The ajax controller -->
@@ -1148,8 +1126,26 @@
       <depends
          optional-attribute-name="CustomizationManager"
          proxy-type="attribute">portal:service=CustomizationManager</depends>
+      <depends
+         optional-attribute-name="ContentRendererRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
    </mbean>
 
+   <!-- The controller factory -->
+   <mbean
+      code="org.jboss.portal.core.controller.ControllerFactory"
+      name="portal:service=ControllerFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="ClassicController"
+         proxy-type="attribute">portal:controller=Core</depends>
+      <depends
+         optional-attribute-name="AjaxController"
+         proxy-type="attribute">portal:controller=Ajax</depends>
+   </mbean>
+
    <!-- -->
    <mbean
       code="org.jboss.portal.server.impl.ServerImpl"
@@ -1206,8 +1202,8 @@
          optional-attribute-name="PortalObjectContainer"
          proxy-type="attribute">portal:container=PortalObject</depends>
       <depends
-         optional-attribute-name="ContentHandlerRegistry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
+         optional-attribute-name="ContentProviderRegistry"
+         proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
       <depends
          optional-attribute-name="PortalObjectEntityResolver"
          proxy-type="attribute">portal:service=EntityResolver</depends>

Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,396 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+   <description>JBoss Portal</description>
+   <!-- Comment/Uncomment to enable portal session replication
+   <distributable/>
+   -->
+
+   <!-- LABS FILTERS -->
+   <servlet>
+   	<servlet-name>loginServlet</servlet-name>
+   	<servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
+   </servlet>
+
+   <servlet-mapping>
+   	<servlet-name>loginServlet</servlet-name>
+   	<url-pattern>/loginAction</url-pattern>
+   </servlet-mapping>
+
+   <servlet>
+   	<servlet-name>wrongLoginServlet</servlet-name>
+   	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
+   	<init-param>
+			<param-name>LOGIN_FAILED</param-name>
+			<param-value>/loginPage/LoginWindow?action=2&amp;loginFailed=loginFailed</param-value>
+			<description>Page with information that the login was failed</description>
+	</init-param>
+   </servlet>
+
+   <servlet-mapping>
+   	<servlet-name>wrongLoginServlet</servlet-name>
+   	<url-pattern>/loginFailed</url-pattern>
+   </servlet-mapping>
+
+	<servlet>
+		<servlet-name>ShowLoginPage</servlet-name>
+		<servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
+		<init-param>
+			<param-name>LOGIN_PAGE</param-name>
+			<param-value>/loginPage</param-value>
+			<description>Login page that will get forwarded (dispatched) to</description>
+		</init-param>
+		<init-param>
+			<param-name>LOGOUT_PAGE</param-name>
+			<param-value>/</param-value>
+			<description>Logout page that will get forwarded to</description>
+		</init-param>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>ShowLoginPage</servlet-name>
+		<url-pattern>/showLogin</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>ShowLoginPage</servlet-name>
+		<url-pattern>/logout</url-pattern>
+	</servlet-mapping>
+
+    <filter>
+      <filter-name>redirectFilter</filter-name>
+      <filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>redirectFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+   <filter>
+      <filter-name>titleAndTimestampFilter</filter-name>
+      <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>titleAndTimestampFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+   <filter>
+      <filter-name>injectLoginLinkFilter</filter-name>
+      <filter-class>org.jboss.forge.portal.InjectLoginLinks</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>injectLoginLinkFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+   <filter>
+	<filter-name>autologinFilter</filter-name>
+	<filter-class>org.jboss.forge.portal.AutologinFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>autologinFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+   <filter>
+      <filter-name>moveMeta</filter-name>
+      <filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>moveMeta</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+   <!-- BlockPages filter -->
+   <!-- TAKEN FROM SOHIL'S WEB.XML
+   <filter>
+	<filter-name>BlockPagesFilter</filter-name>
+	<filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+   	<filter-name>BlockPagesFilter</filter-name>
+	<servlet-name>PortalServlet</servlet-name>
+   </filter-mapping>
+   -->
+
+   <!-- SSL Processor -->
+   <filter>
+      <filter-name>SSLProcessor</filter-name>
+      <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>SSLProcessor</filter-name>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+   </filter-mapping>
+
+   <filter-mapping>
+      <filter-name>SSLProcessor</filter-name>
+      <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
+   </filter-mapping>
+
+   <filter>
+      <filter-name>PrimaryNavigationFilter</filter-name>
+      <filter-class>org.jboss.forge.portal.PrimaryNavigationFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>PrimaryNavigationFilter</filter-name>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+   </filter-mapping>
+
+   <filter-mapping>
+      <filter-name>PrimaryNavigationFilter</filter-name>
+      <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
+   </filter-mapping>
+
+   <!-- END OF LABS FILTERS -->
+
+   <!-- The portal servlet is the main entrance point -->
+   <servlet>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+      <init-param>
+         <param-name>asDefaultServlet</param-name>
+         <param-value>false</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
+      </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Core</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
+      <load-on-startup>0</load-on-startup>
+      <security-role-ref>
+        <role-name>Authenticated</role-name>
+        <role-link>Authenticated</role-link>
+      </security-role-ref>
+   </servlet>
+
+   <!-- The portal servlet is the main entrance point -->
+   <servlet>
+      <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
+      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+      <init-param>
+         <param-name>asDefaultServlet</param-name>
+         <param-value>true</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
+      </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Core</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
+      <load-on-startup>0</load-on-startup>
+      <security-role-ref>
+        <role-name>Authenticated</role-name>
+        <role-link>Authenticated</role-link>
+      </security-role-ref>
+   </servlet>
+
+   <!-- Provide access to unauthenticated users -->
+   <servlet-mapping>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+      <url-pattern>/*</url-pattern>
+   </servlet-mapping>
+
+   <!-- Provide secure access to unauthenticated users -->
+   <servlet-mapping>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+      <url-pattern>/sec/*</url-pattern>
+   </servlet-mapping>
+
+   <!-- Provide access to authenticated users -->
+   <servlet-mapping>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+      <url-pattern>/auth/*</url-pattern>
+   </servlet-mapping>
+
+   <!-- Provide secure access to authenticated users -->
+   <servlet-mapping>
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
+      <url-pattern>/authsec/*</url-pattern>
+   </servlet-mapping>
+
+   <!-- Force the mapping of the jsp and images because of the default servlet replacement -->
+   <servlet-mapping>
+      <servlet-name>jsp</servlet-name>
+      <url-pattern>/login.jsp</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>jsp</servlet-name>
+      <url-pattern>/error.jsp</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_bottom.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_bottom_left.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_bottom_right.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_left.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_right.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_top.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_top_left.png</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>default</servlet-name>
+      <url-pattern>/images/login_top_right.png</url-pattern>
+   </servlet-mapping>
+
+   <session-config>
+      <session-timeout>15</session-timeout>
+   </session-config>
+
+   <!--
+     | JDBC usage must be done with
+     | DataSource ds = (DataSource)ctx.lookup("java:comp/env/jdbc/PortalDS";
+     -->
+   <resource-ref>
+      <res-ref-name>jdbc/PortalDS</res-ref-name>
+      <res-type>javax.sql.DataSource</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+   </resource-ref>
+
+   <security-constraint>
+      <web-resource-collection>
+         <web-resource-name>Authenticated</web-resource-name>
+         <description></description>
+         <url-pattern>/auth/*</url-pattern>
+      </web-resource-collection>
+      <auth-constraint>
+         <role-name>Authenticated</role-name>
+      </auth-constraint>
+   </security-constraint>
+
+   <security-constraint>
+     <web-resource-collection>
+       <web-resource-name>Secure</web-resource-name>
+       <url-pattern>/sec/*</url-pattern>
+     </web-resource-collection>
+     <user-data-constraint>
+       <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+     </user-data-constraint>
+   </security-constraint>
+
+   <security-constraint>
+     <web-resource-collection>
+       <web-resource-name>Secure+Authenticated</web-resource-name>
+       <url-pattern>/authsec/*</url-pattern>
+     </web-resource-collection>
+     <auth-constraint>
+       <role-name>Authenticated</role-name>
+     </auth-constraint>
+     <user-data-constraint>
+       <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+     </user-data-constraint>
+   </security-constraint>
+
+   <!--
+     | Uncomment to use BASIC authentication scheme. Don't forget to comment other
+     | form authentication.
+     -->
+   <!--
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBoss Portal</realm-name>
+   </login-config>
+   -->
+
+   <!--
+     | Uncomment to use FORM authentication scheme. Don't forget to comment other
+     | form authentication.
+     -->
+   <!--
+   -->
+   <login-config>
+      <auth-method>FORM</auth-method>
+      <realm-name>JBoss Portal</realm-name>
+      <form-login-config>
+         <form-login-page>/login.jsp</form-login-page>
+         <form-error-page>/error.jsp</form-error-page>
+      </form-login-config>
+   </login-config>
+
+   <security-role>
+      <role-name>Authenticated</role-name>
+   </security-role>
+
+   <!-- AJAX -->
+
+   <!-- The portal servlet for ajax requests -->
+   <servlet>
+      <servlet-name>PortalServletForAjax</servlet-name>
+      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+      <init-param>
+         <param-name>asDefaultServlet</param-name>
+         <param-value>false</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
+      </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Ajax</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
+      <load-on-startup>0</load-on-startup>
+      <security-role-ref>
+        <role-name>Authenticated</role-name>
+        <role-link>Authenticated</role-link>
+      </security-role-ref>
+   </servlet>
+
+   <!-- Provide secure access to authenticated users -->
+   <servlet-mapping>
+      <servlet-name>PortalServletForAjax</servlet-name>
+      <url-pattern>/ajax/*</url-pattern>
+   </servlet-mapping>
+</web-app>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -22,10 +22,10 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee  http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-      
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
    <description>JBoss Portal</description>
    <!-- Comment/Uncomment to enable portal session replication
    <distributable/>
@@ -36,22 +36,22 @@
    	<servlet-name>loginServlet</servlet-name>
    	<servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
    </servlet>
-   
+
    <servlet-mapping>
    	<servlet-name>loginServlet</servlet-name>
    	<url-pattern>/loginAction</url-pattern>
    </servlet-mapping>
-   
+
    <servlet>
    	<servlet-name>wrongLoginServlet</servlet-name>
    	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
    	<init-param>
-   			<description>Page with information that the login was failed</description>
 			<param-name>LOGIN_FAILED</param-name>
 			<param-value>/loginPage/LoginWindow?action=2&amp;loginFailed=loginFailed</param-value>
+			<description>Page with information that the login was failed</description>
 	</init-param>
    </servlet>
-   
+
    <servlet-mapping>
    	<servlet-name>wrongLoginServlet</servlet-name>
    	<url-pattern>/loginFailed</url-pattern>
@@ -61,37 +61,27 @@
 		<servlet-name>ShowLoginPage</servlet-name>
 		<servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
 		<init-param>
-			<description>Login page that will get forwarded (dispatched) to</description>
 			<param-name>LOGIN_PAGE</param-name>
 			<param-value>/loginPage</param-value>
+			<description>Login page that will get forwarded (dispatched) to</description>
 		</init-param>
 		<init-param>
-			<description>Logout page that will get forwarded to</description>
 			<param-name>LOGOUT_PAGE</param-name>
 			<param-value>/</param-value>
+			<description>Logout page that will get forwarded to</description>
 		</init-param>
 	</servlet>
-	
+
 	<servlet-mapping>
 		<servlet-name>ShowLoginPage</servlet-name>
 		<url-pattern>/showLogin</url-pattern>
 	</servlet-mapping>
-	
+
 	<servlet-mapping>
 		<servlet-name>ShowLoginPage</servlet-name>
 		<url-pattern>/logout</url-pattern>
 	</servlet-mapping>
 
-	<filter>
-      <filter-name>downloadsFilter</filter-name>
-      <filter-class>org.jboss.forge.portal.DownloadsFilter</filter-class>
-   </filter>
-
-   <filter-mapping>
-      <filter-name>downloadsFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
-   
     <filter>
       <filter-name>redirectFilter</filter-name>
       <filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>
@@ -106,17 +96,17 @@
       <filter-name>titleAndTimestampFilter</filter-name>
       <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
    </filter>
-   
+
    <filter-mapping>
       <filter-name>titleAndTimestampFilter</filter-name>
       <url-pattern>/*</url-pattern>
    </filter-mapping>
-   
+
    <filter>
       <filter-name>injectLoginLinkFilter</filter-name>
       <filter-class>org.jboss.forge.portal.InjectLoginLinks</filter-class>
    </filter>
-   
+
    <filter-mapping>
       <filter-name>injectLoginLinkFilter</filter-name>
       <url-pattern>/*</url-pattern>
@@ -126,36 +116,23 @@
 	<filter-name>autologinFilter</filter-name>
 	<filter-class>org.jboss.forge.portal.AutologinFilter</filter-class>
    </filter>
-   
+
    <filter-mapping>
       <filter-name>autologinFilter</filter-name>
       <url-pattern>/*</url-pattern>
-   </filter-mapping>   
-   
+   </filter-mapping>
+
    <filter>
       <filter-name>moveMeta</filter-name>
       <filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
    </filter>
-   
+
    <filter-mapping>
       <filter-name>moveMeta</filter-name>
       <url-pattern>/*</url-pattern>
    </filter-mapping>
-   
-   <!-- BlockPages filter -->
-   <!-- TAKEN FROM SOHIL'S WEB.XML
-   <filter>
-	<filter-name>BlockPagesFilter</filter-name>
-	<filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class>
-   </filter>
 
-   <filter-mapping>
-   	<filter-name>BlockPagesFilter</filter-name>
-	<servlet-name>PortalServlet</servlet-name>
-   </filter-mapping>
-   -->
-   
-   <!-- SSL Processor -->
+    <!-- SSL Processor -->
    <filter>
       <filter-name>SSLProcessor</filter-name>
       <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
@@ -165,7 +142,7 @@
       <filter-name>SSLProcessor</filter-name>
       <servlet-name>PortalServletWithPathMapping</servlet-name>
    </filter-mapping>
-   
+
    <filter-mapping>
       <filter-name>SSLProcessor</filter-name>
       <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
@@ -188,20 +165,24 @@
 
    <!-- END OF LABS FILTERS -->
 
+   <!-- Bridge portal user events -->
+   <listener>
+      <listener-class>org.jboss.portal.core.event.user.UserEventBridge</listener-class>
+   </listener>
 
    <!-- The portal servlet is the main entrance point -->
    <servlet>
       <servlet-name>PortalServletWithPathMapping</servlet-name>
       <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
       <init-param>
-      	 <description>The servlet needs to know wether it is set as a default servlet or not</description>
          <param-name>asDefaultServlet</param-name>
          <param-value>false</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
       <init-param>
-      	 <description>The request controller for the portal servlet</description>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Core</param-value>
+         <param-name>controllerFactoryName</param-name>
+         <param-value>portal:service=ControllerFactory</param-value>
+         <description>The request controller factory for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>
@@ -215,14 +196,14 @@
       <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
       <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
       <init-param>
-      	 <description>The servlet needs to know wether it is set as a default servlet or not</description>
          <param-name>asDefaultServlet</param-name>
          <param-value>true</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
       <init-param>
-      	 <description>The request controller for the portal servlet</description>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Core</param-value>
+         <param-name>controllerFactoryName</param-name>
+         <param-value>portal:service=ControllerFactory</param-value>
+         <description>The request controller factory for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>
@@ -367,22 +348,11 @@
       <auth-method>FORM</auth-method>
       <realm-name>JBoss Portal</realm-name>
       <form-login-config>
-         <form-login-page>/showLogin</form-login-page>
-         <!-- <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&amp;loginFailed=loginFailed</form-error-page>-->      
-         <form-error-page>/loginFailed</form-error-page>
+         <form-login-page>/login.jsp</form-login-page>
+         <form-error-page>/error.jsp</form-error-page>
       </form-login-config>
    </login-config>
 
-   <!-- TAKEN FROM SOHIL'S WEB.XML
-   <login-config>
-      <auth-method>JBOSS-FEDERATED-SSO</auth-method>
-      <realm-name>JBoss Portal</realm-name>
-      <form-login-config>
-         <form-login-page>/index.html?ctrl:id=page.default.login</form-login-page>
-         <form-error-page>/index.html?ctrl:id=window.default.LoginWindow&amp;ctrl:type=action&amp;action=loginFailed</form-error-page>
-      </form-login-config>
-   </login-config>-->
-
    <security-role>
       <role-name>Authenticated</role-name>
    </security-role>
@@ -394,14 +364,14 @@
       <servlet-name>PortalServletForAjax</servlet-name>
       <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
       <init-param>
-      	 <description>The servlet needs to know wether it is set as a default servlet or not</description>
          <param-name>asDefaultServlet</param-name>
          <param-value>false</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
       <init-param>
-      	 <description>The request controller for the portal servlet</description>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Ajax</param-value>
+         <param-name>controllerFactoryName</param-name>
+         <param-value>portal:service=ControllerFactory</param-value>
+         <description>The request controller factory for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>

Deleted: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml.old
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml.old	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml.old	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,290 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-   <description>JBoss Portal</description>
-   <!-- Comment/Uncomment to enable portal session replication
-   <distributable/>
-   -->
-
-   <!-- LABS FILTERS -->
-   <servlet>
-   	<servlet-name>loginServlet</servlet-name>
-   	<servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
-   </servlet>
-   
-   <servlet-mapping>
-   	<servlet-name>loginServlet</servlet-name>
-   	<url-pattern>/loginAction</url-pattern>
-   </servlet-mapping>
-   
-   <servlet>
-   	<servlet-name>wrongLoginServlet</servlet-name>
-   	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
-   </servlet>
-   
-   <servlet-mapping>
-   	<servlet-name>wrongLoginServlet</servlet-name>
-   	<url-pattern>/loginFailed</url-pattern>
-   </servlet-mapping>
-
-	<servlet>
-		<servlet-name>ShowLoginPage</servlet-name>
-		<servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>ShowLoginPage</servlet-name>
-		<url-pattern>/showLogin</url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>ShowLoginPage</servlet-name>
-		<url-pattern>/logout</url-pattern>
-	</servlet-mapping>
-   
-   <filter>
-      <filter-name>titleAndTimestampFilter</filter-name>
-      <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
-   </filter>
-   
-   <filter-mapping>
-      <filter-name>titleAndTimestampFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
-
-   <filter>
-	<filter-name>autologinFilter</filter-name>
-	<filter-class>org.jboss.forge.portal.AutologinFilter</filter-class>
-   </filter>
-   
-   <filter-mapping>
-      <filter-name>autologinFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>   
-   
-   <filter>
-      <filter-name>moveMeta</filter-name>
-      <filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
-   </filter>
-   
-   <filter-mapping>
-      <filter-name>moveMeta</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
-   
-   <!-- BlockPages filter -->
-   <!-- TAKEN FROM SOHIL'S WEB.XML
-   <filter>
-	<filter-name>BlockPagesFilter</filter-name>
-	<filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class>
-   </filter>
-
-   <filter-mapping>
-   	<filter-name>BlockPagesFilter</filter-name>
-	<servlet-name>PortalServlet</servlet-name>
-   </filter-mapping>
-   -->
-   
-   <!-- SSL Processor -->
-   <filter>
-      <filter-name>SSLProcessor</filter-name>
-      <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
-   </filter>
-
-   <filter-mapping>
-      <filter-name>SSLProcessor</filter-name>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>SSLProcessor</filter-name>
-      <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
-   </filter-mapping>
-   
-   <!-- Attributes filter -->
-   <filter>
-      <filter-name>AttributesFilter</filter-name>
-      <filter-class>org.jboss.forge.portal.AttributesFilter</filter-class>
-   </filter>
-
-   <filter-mapping>
-      <filter-name>AttributesFilter</filter-name>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>AttributesFilter</filter-name>
-      <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
-   </filter-mapping>
-
-   <!-- END OF LABS FILTERS -->
-
-
-   <!-- The portal servlet is the main entrance point -->
-   <servlet>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
-      <init-param>
-         <param-name>asDefaultServlet</param-name>
-         <param-value>false</param-value>
-         <description>The servlet needs to know wether it is set as a default servlet or not</description>
-      </init-param>
-      <init-param>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Request</param-value>
-         <description>The request controller for the portal servlet</description>
-      </init-param>
-      <load-on-startup>0</load-on-startup>
-      <security-role-ref>
-        <role-name>Authenticated</role-name>
-        <role-link>Authenticated</role-link>
-      </security-role-ref>
-   </servlet>
-
-   <!-- The portal servlet is the main entrance point -->
-   <servlet>
-      <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
-      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
-      <init-param>
-         <param-name>asDefaultServlet</param-name>
-         <param-value>true</param-value>
-         <description>The servlet needs to know wether it is set as a default servlet or not</description>
-      </init-param>
-      <init-param>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Request</param-value>
-         <description>The request controller for the portal servlet</description>
-      </init-param>
-      <load-on-startup>0</load-on-startup>
-      <security-role-ref>
-        <role-name>Authenticated</role-name>
-        <role-link>Authenticated</role-link>
-      </security-role-ref>
-   </servlet>
-
-   <!-- Provide access to unauthenticated users -->
-   <servlet-mapping>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-      <url-pattern>/*</url-pattern>
-   </servlet-mapping>
-
-   <!-- Provide secure access to unauthenticated users -->
-   <servlet-mapping>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-      <url-pattern>/sec/*</url-pattern>
-   </servlet-mapping>
-
-   <!-- Provide access to authenticated users -->
-   <servlet-mapping>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-      <url-pattern>/auth/*</url-pattern>
-   </servlet-mapping>
-
-   <!-- Provide secure access to authenticated users -->
-   <servlet-mapping>
-      <servlet-name>PortalServletWithPathMapping</servlet-name>
-      <url-pattern>/authsec/*</url-pattern>
-   </servlet-mapping>
-
-   <!-- Force the mapping of the index.jsp -->
-   <servlet-mapping>
-      <servlet-name>jsp</servlet-name>
-      <url-pattern>/login.jsp</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>jsp</servlet-name>
-      <url-pattern>/error.jsp</url-pattern>
-   </servlet-mapping>
-
-   <session-config>
-      <session-timeout>15</session-timeout>
-   </session-config>
-
-   <!--
-     | JDBC usage must be done with
-     | DataSource ds = (DataSource)ctx.lookup("java:comp/env/jdbc/PortalDS";
-     -->
-   <resource-ref>
-      <res-ref-name>jdbc/PortalDS</res-ref-name>
-      <res-type>javax.sql.DataSource</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-   </resource-ref>
-
-   <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>Authenticated</web-resource-name>
-         <description></description>
-         <url-pattern>/auth/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-         <role-name>Authenticated</role-name>
-      </auth-constraint>
-   </security-constraint>
-
-   <security-constraint>
-     <web-resource-collection>
-       <web-resource-name>Secure</web-resource-name>
-       <url-pattern>/sec/*</url-pattern>
-     </web-resource-collection>
-     <user-data-constraint>
-       <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-     </user-data-constraint>
-   </security-constraint>
-
-   <security-constraint>
-     <web-resource-collection>
-       <web-resource-name>Secure+Authenticated</web-resource-name>
-       <url-pattern>/authsec/*</url-pattern>
-     </web-resource-collection>
-     <auth-constraint>
-       <role-name>Authenticated</role-name>
-     </auth-constraint>
-     <user-data-constraint>
-       <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-     </user-data-constraint>
-   </security-constraint>
-
-   <!--
-     | Uncomment to use BASIC authentication scheme. Don't forget to comment other
-     | form authentication.
-     -->
-   <!--
-   <login-config>
-      <auth-method>BASIC</auth-method>
-      <realm-name>JBoss Portal</realm-name>
-   </login-config>
-   -->
-
-   <!--
-     | Uncomment to use FORM authentication scheme. Don't forget to comment other
-     | form authentication.
-     -->
-   <!--
-   -->
-   <login-config>
-      <auth-method>FORM</auth-method>
-      <realm-name>JBoss Portal</realm-name>
-      <form-login-config>
-         <form-login-page>/showLogin</form-login-page>
-         <!-- <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&amp;loginFailed=loginFailed</form-error-page>-->      
-         <form-error-page>/portal/loginFailed</form-error-page>
-      </form-login-config>
-   </login-config>
-
-   <!-- TAKEN FROM SOHIL'S WEB.XML
-   <login-config>
-      <auth-method>JBOSS-FEDERATED-SSO</auth-method>
-      <realm-name>JBoss Portal</realm-name>
-      <form-login-config>
-         <form-login-page>/index.html?ctrl:id=page.default.login</form-login-page>
-         <form-error-page>/index.html?ctrl:id=window.default.LoginWindow&amp;ctrl:type=action&amp;action=loginFailed</form-error-page>
-      </form-login-config>
-   </login-config>-->
-
-   <security-role>
-      <role-name>Authenticated</role-name>
-   </security-role>
-</web-app>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -35,6 +35,10 @@
         <attribute name="ViewPostsOnSeparatePageName">viewPostsOnSeparatePage</attribute>
         <attribute name="ViewAllPostsName">viewAllPosts</attribute>
         <attribute name="CommentsEnabledName">commentsEnabled</attribute>
+        <attribute name="ShowLinkToOriginalBlogName">showLinkToOriginalBlog</attribute>
+        <attribute name="ShowLinkToOriginalPostName">showLinkToOriginalPost</attribute>
+        <attribute name="LinkPostsToOriginalName">linkPostsToOriginal</attribute>
+        <attribute name="FeedLinksName">feedLinks</attribute>
     </mbean>
 
     <!-- Model service -->
@@ -57,4 +61,4 @@
            name="blog:service=Store"
            xmbean-dd="org/jboss/labs/blog/service/store/LabsStoreService.xml">
     </mbean>
-</server>
\ No newline at end of file
+</server>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog-object.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog-object.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,16 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployments>
-    <deployment>
-        <if-exists>overwrite</if-exists>
-        <parent-ref>default</parent-ref>
-        <page>
-            <page-name>blogtest</page-name>
-            <window>
-                <window-name>BlogPortletTestWindow</window-name>
-                <instance-ref>BlogPortletTestInstance</instance-ref>
-                <region>center</region>
-                <height>2</height>
-            </window>
-        </page>
-    </deployment>
 </deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog.taglib.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog.taglib.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/blog.taglib.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
-        "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-        "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
-    <namespace>http://www.jboss.org/portal/jbossblog</namespace>
-    <tag>
-        <tag-name>isAllowed</tag-name>
-        <handler-class>org.jboss.blog.service.permissions.acl.ACLTagHandler</handler-class>
-    </tag>
-</facelet-taglib>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/faces-config.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/faces-config.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,217 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE faces-config PUBLIC
-        "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-        "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
-    <application>
-        <!-- JBoss Portal-facelets integration -->
-        <property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
-
-        <!--<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>-->
-        <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
-        <locale-config>
-            <default-locale>en</default-locale>
-        </locale-config>
-        <action-listener>org.jboss.blog.service.permissions.acl.AuthorizationListener</action-listener>
-    </application>
-
-    <managed-bean>
-        <managed-bean-name>blogView</managed-bean-name>
-        <managed-bean-class>org.jboss.blog.ui.BlogView</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-        <managed-property>
-            <property-name>state</property-name>
-            <value>#{state}</value>
-        </managed-property>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>blogEdit</managed-bean-name>
-        <managed-bean-class>org.jboss.blog.ui.BlogEdit</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-        <managed-property>
-            <property-name>state</property-name>
-            <value>#{state}</value>
-        </managed-property>
-        <managed-property>
-            <property-name>blogView</property-name>
-            <value>#{blogView}</value>
-        </managed-property>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>postEdit</managed-bean-name>
-        <managed-bean-class>org.jboss.blog.ui.PostEdit</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-        <managed-property>
-            <property-name>state</property-name>
-            <value>#{state}</value>
-        </managed-property>
-        <managed-property>
-            <property-name>blogView</property-name>
-            <value>#{blogView}</value>
-        </managed-property>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>idEdit</managed-bean-name>
-        <managed-bean-class>org.jboss.blog.ui.IdEdit</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-        <managed-property>
-            <property-name>state</property-name>
-            <value>#{state}</value>
-        </managed-property>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>commentEdit</managed-bean-name>
-        <managed-bean-class>org.jboss.blog.ui.CommentEdit</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-        <managed-property>
-            <property-name>blogView</property-name>
-            <value>#{blogView}</value>
-        </managed-property>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>state</managed-bean-name>
-        <managed-bean-class>org.jboss.blog.ui.State</managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
-
-    <!-- Post/ blog view -->
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>blog_view</from-outcome>
-            <to-view-id>/views/index.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>post_view</from-outcome>
-            <to-view-id>/views/post_view.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <!-- Post edit/new/del -->
-    <navigation-rule>
-        <from-view-id>/views/index.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>post_edit</from-outcome>
-            <to-view-id>/views/post_edit.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/post_view.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>post_edit</from-outcome>
-            <to-view-id>/views/post_edit.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/index.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>post_new</from-outcome>
-            <to-view-id>/views/post_new.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/post_edit.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>post_del</from-outcome>
-            <to-view-id>/views/post_del.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <!-- Comment del -->
-
-    <navigation-rule>
-        <from-view-id>/views/post_view.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>comment_del</from-outcome>
-            <to-view-id>/views/comment_del.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <!-- Admin -->
-    <navigation-rule>
-        <from-view-id>/views/index.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>admin_panel</from-outcome>
-            <to-view-id>/views/admin_panel.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/admin_panel.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>id_edit</from-outcome>
-            <to-view-id>/views/id_edit.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/id_edit.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>admin_panel</from-outcome>
-            <to-view-id>/views/admin_panel.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <!-- Blog edit/new/del -->
-    <navigation-rule>
-        <from-view-id>/views/index.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>blog_edit</from-outcome>
-            <to-view-id>/views/blog_edit.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/post_view.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>blog_edit</from-outcome>
-            <to-view-id>/views/blog_edit.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/id_edit.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>blog_new</from-outcome>
-            <to-view-id>/views/blog_new.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/id_edit.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>blog_del</from-outcome>
-            <to-view-id>/views/blog_del.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/blog_del.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>id_edit</from-outcome>
-            <to-view-id>/views/id_edit.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/views/blog_del.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>admin_panel</from-outcome>
-            <to-view-id>/views/admin_panel.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-</faces-config>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/jboss-portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,6 +1,6 @@
 <portlet-app>
     <portlet>
-        <portlet-name>BlogPortlet</portlet-name>
+        <portlet-name>SimpleBlogPortlet</portlet-name>
         <transaction>
             <trans-attribute>Required</trans-attribute>
         </transaction>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib)

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/jstl.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/jstl.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/standard.jar (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/lib/standard.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet-instances.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet-instances.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,32 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployments>
-    <deployment>
-        <if-exists>overwrite</if-exists>
-        <instance>
-            <instance-id>BlogPortletTestInstance</instance-id>
-            <portlet-ref>BlogPortlet</portlet-ref>
-            <preferences>
-                <preference>
-                    <name>blogId</name>
-                    <value>matrix</value>
-                </preference>
-                <preference>
-                    <name>blogCategory</name>
-                    <value></value>
-                </preference>
-                <preference>
-                    <name>numberOfPostsPerPage</name>
-                    <value>4</value>
-                </preference>
-                <preference>
-                    <name>viewPostsOnSeparatePage</name>
-                    <value>true</value>
-                </preference>
-                <preference>
-                    <name>commentsEnabled</name>
-                    <value>false</value>
-                </preference>
-            </preferences>
-        </instance>
-    </deployment>
 </deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -3,11 +3,11 @@
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
     <portlet>
-        <portlet-name>BlogPortlet</portlet-name>
-        <portlet-class>org.jboss.blog.portlet.BlogFacesPortlet</portlet-class>
+        <portlet-name>SimpleBlogPortlet</portlet-name>
+        <portlet-class>org.jboss.blog.portlet.simple.BlogPortlet</portlet-class>
         <init-param>
-            <name>default-view</name>
-            <value>/views/index.xhtml</value>
+            <name>jspPrefix</name>
+            <value>/repo-access/default/blog/</value>
         </init-param>
         <expiration-cache>0</expiration-cache>
         <supports>
@@ -16,7 +16,7 @@
         </supports>
         <supported-locale>en</supported-locale>
         <portlet-info>
-            <title>Blog portlet</title>
+            <title>Simple blog portlet</title>
         </portlet-info>
         <portlet-preferences>
             <preference>
@@ -39,6 +39,25 @@
                 <name>commentsEnabled</name>
                 <value>false</value>
             </preference>
+            <preference>
+                <name>showLinkToOriginalBlog</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showLinkToOriginalPost</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>linkPostsToOriginal</name>
+                <value>false</value>
+            </preference>
+            <preference>
+                <name>viewAllPosts</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>feedLinks</name>
+            </preference>
         </portlet-preferences>
     </portlet>
 </portlet-app>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld)

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-adam/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld	2007-04-04 13:09:29 UTC (rev 10755)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-
-   <tlib-version>1.0</tlib-version>
-   <jsp-version>1.2</jsp-version>
-   <short-name>portlet</short-name>
-
-   <uri>http://java.sun.com/portlet</uri>
-
-   <tag>
-
-      <name>param</name>
-      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
-      <name>renderURL</name>
-      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.RenderURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class>
-      <body-content>JSP</body-content>
-
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
-      <name>defineObjects</name>
-      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI</tei-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
-      <name>actionURL</name>
-      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.ActionURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class>
-      <body-content>JSP</body-content>
-
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
-      <name>namespace</name>
-      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-
-</taglib>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/tld/portlet.tld	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+
+   <tlib-version>1.0</tlib-version>
+   <jsp-version>1.2</jsp-version>
+   <short-name>portlet</short-name>
+
+   <uri>http://java.sun.com/portlet</uri>
+
+   <tag>
+
+      <name>param</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>renderURL</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.RenderURLTag</tag-class>
+      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <name>portletMode</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>secure</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>var</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>windowState</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>defineObjects</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTag</tag-class>
+      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI</tei-class>
+      <body-content>empty</body-content>
+
+   </tag>
+   <tag>
+
+      <name>actionURL</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.ActionURLTag</tag-class>
+      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <name>portletMode</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>secure</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>var</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>windowState</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>namespace</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag</tag-class>
+      <body-content>empty</body-content>
+
+   </tag>
+
+</taglib>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/web.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/jboss-blog.war/WEB-INF/web.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -4,28 +4,6 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
             http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
-    <!-- Use Documents Saved as *.xhtml -->
-    <context-param>
-        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-        <param-value>.xhtml</param-value>
-    </context-param>
-
-    <!-- Special Debug Output for Development -->
-    <context-param>
-        <param-name>facelets.DEVELOPMENT</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>facelets.LIBRARIES</param-name>
-        <param-value>/WEB-INF/blog.taglib.xml</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>facelets.RESOURCE_RESOLVER</param-name>
-        <param-value>org.jboss.forge.common.facelets.LabsFaceletsResourceResolver</param-value>
-    </context-param>
-
     <filter>
         <filter-name>filesFromRepoFilter</filter-name>
         <filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/lib/jboss-blog-core.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/forge/common/facelets/LabsFaceletsResourceResolver.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/forge/common/facelets/LabsFaceletsResourceResolver.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/forge/common/facelets/LabsFaceletsResourceResolver.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -12,13 +12,19 @@
  */
 public class LabsFaceletsResourceResolver implements ResourceResolver {
     private URLStreamHandler ush;
+    private ResourceResolver defaultRR;
 
     public LabsFaceletsResourceResolver() {
         ush = new ShotokuURLStreamHandler();
+        defaultRR = new DefaultResourceResolver();
     }
 
     public URL resolveUrl(String file) {
         try {
+            if ((file != null) && (file.startsWith("/WEB-INF"))) {
+                return defaultRR.resolveUrl(file);
+            }
+
             return new URL("shotoku", "localhost", 80, file, ush);
         } catch (MalformedURLException e) {
             return null;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -103,14 +103,14 @@
 					.indexOf(ForgeHelper.REPO_ACCESS_DIR)
 					+ repoAccessDirLength + 1);
 
-			Node requestedNode;
+            Node requestedNode;
 			try {
 				requestedNode = contentManager.getNode(requestedFile);
 			} catch (ResourceDoesNotExist e) {
 				throw new ServletException(e);
 			}
-			
-			if (requestedFile.toLowerCase().endsWith("jsp")) {
+
+            if (requestedFile.toLowerCase().endsWith("jsp")) {
 				// If the requested page is a jsp, then we copy it (if a newer
                 // version is available) and dispatch a request for it.
                 String filePath = basePath + separator + requestedFile;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -34,9 +34,18 @@
         }
     }
 
+    public static UserModule getUserModule() {
+        try {
+            return (UserModule)new InitialContext().lookup("java:portal/UserModule");
+        } catch (NamingException e) {
+            log.error(e);
+            return null;
+        }
+    }
+
     public static boolean isUserInRole(User user, String roleName) {
         try {
-            for (Object roleObj : getMembershipModule().getRoles(user)) {
+            for (Object roleObj : getMembershipModule().getRoles(getUserModule().findUserById(user.getId()))) {
                 Role role = (Role) roleObj;
 
                 if (Tools.objectsEqual(roleName, role.getName())) {
@@ -53,7 +62,7 @@
     public static List<String> getRoleNames(User user) {
         List<String> ret = new ArrayList<String>();
         try {
-            for (Object roleObj : getMembershipModule().getRoles(user)) {
+            for (Object roleObj : getMembershipModule().getRoles(getUserModule().findUserById(user.getId()))) {
                 ret.add(((Role) roleObj).getName());
             }
         } catch (IdentityException e) {
@@ -65,7 +74,7 @@
     
     public static void setRoles(User user, Set roles) {
     	try {
-			getMembershipModule().assignRoles(user, roles);
+			getMembershipModule().assignRoles(getUserModule().findUserById(user.getId()), roles);
 		} catch (IdentityException e) {
 			log.error(e);
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -519,13 +519,13 @@
                         uniqueId);
             }
         } catch (UnknownPortletException e) {
-            e.printStackTrace();
+            log.warn(e.getMessage() + " in " + projectId, e);
         } catch (UnknownPortalException e) {
-            e.printStackTrace();
+            log.warn(e.getMessage() + " in " + projectId, e);
         } catch (PortletInvokerException e) {
-            e.printStackTrace();
+            log.warn(e.getMessage() + " in " + projectId, e);
         } catch (NumberFormatException e) {
-            e.printStackTrace();
+            log.warn(e.getMessage() + " in " + projectId, e);
         }
     }
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -89,7 +89,7 @@
 
         // If any additional navigational parameters where passed and if we
         // can add them, adding them.
-        StateString navState = decoder.getNavigationalstate();
+        StateString navState = decoder.getNavigationalState();
 
         // Returning an appropriate command.
         switch (decoder.getType())

Copied: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,75 @@
+package org.jboss.labs.mapper.command.delegating.page;
+
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.portlet.impl.PortletRequestDecoder;
+import org.jboss.labs.mapper.PathParser;
+import org.jboss.forge.common.Constants;
+import org.jboss.forge.common.exceptions.ServiceRetrievalException;
+import org.jboss.forge.common.ejb3.ProjectPagesService;
+import org.jboss.forge.common.ejb3.LabsServices;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public abstract class AbstractProjectPortletDelegateCF extends AbstractPageDelegateCF {
+    public abstract String getPortletName();
+    public abstract void fillParams(PathParser parser, Map<String, Object> params);
+
+    public ControllerCommand doMapping(ServerInvocation invocation, String host,
+                                       String contextPath, PathParser parser, Page page) {
+        String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);
+
+        // Only project pages are supported.
+        if (projectId == null) {
+            return null;
+        }
+
+        ProjectPagesService pps;
+
+        try {
+            pps = LabsServices.getProjectPagesService();
+        } catch (ServiceRetrievalException e) {
+            return null;
+        }
+
+        String pageName = null;
+        if (!projectId.equals(page.getName())) {
+            pageName = page.getName();
+        }
+
+        // First trying a window with a possible unique-id
+        Window portletWindow = page.getWindow(pps.createWindowId(getPortletName(), projectId, pageName,
+                parser.getFirstToken()));
+        if (portletWindow == null) {
+            // Trying if there is no single downloads window.
+            portletWindow = page.getWindow(pps.createWindowId(getPortletName(), projectId, pageName, null));
+        } else {
+            // Forgetting the unique-id.
+            parser.proceed();
+        }
+
+        // Checking if a downloads window was found on the page.
+        if (portletWindow == null) {
+            return null;
+        }
+
+        Map<String, Object> params = new HashMap<String, Object>();
+        fillParams(parser, params);
+
+        if (hasMetaParameter(invocation)) {
+			return getPortalObjectCF().doMapping(invocation, portletWindow,
+					params, false);
+		} else {
+			params.put(PortletRequestDecoder.META_PARAMETER, Integer
+					.toString(PortletRequestDecoder.RENDER_MASK));
+			return getPortalObjectCF().doMapping(invocation, portletWindow,
+					params, false);
+		}
+    }
+}

Copied: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,23 @@
+package org.jboss.labs.mapper.command.delegating.page;
+
+import org.jboss.labs.mapper.PathParser;
+
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class BlogCF extends AbstractProjectPortletDelegateCF {
+    protected final static String DOWNLOAD_PORTLET_NAME = "downloads";
+
+    public String getPortletName() {
+        return "blog";
+    }
+
+    public void fillParams(PathParser parser, Map<String, Object> params) {
+        String current = parser.getCurrent();
+        if (current != null) {
+            params.put("post", parser.getCurrent());
+        }
+    }
+}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,75 +1,20 @@
 package org.jboss.labs.mapper.command.delegating.page;
 
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.portlet.impl.PortletRequestDecoder;
 import org.jboss.labs.mapper.PathParser;
-import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.exceptions.ServiceRetrievalException;
-import org.jboss.forge.common.ejb3.LabsServices;
-import org.jboss.forge.common.ejb3.ProjectPagesService;
 
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
  */
-public class DownloadCF extends AbstractPageDelegateCF {
+public class DownloadCF extends AbstractProjectPortletDelegateCF {
     protected final static String DOWNLOAD_PORTLET_NAME = "downloads";
 
-    public ControllerCommand doMapping(ServerInvocation invocation, String host,
-                                       String contextPath, PathParser parser, Page page) {
-        String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);
+    public String getPortletName() {
+        return "downloads";
+    }
 
-        // Only project pages are supported.
-        if (projectId == null) {
-            return null;
-        }
-
-        ProjectPagesService pps;
-
-        try {
-            pps = LabsServices.getProjectPagesService();
-        } catch (ServiceRetrievalException e) {
-            return null;
-        }
-
-        String pageName = null;
-        if (!projectId.equals(page.getName())) {
-            pageName = page.getName();
-        }
-
-        // First trying a window with a possible unique-id
-        Window downloadsWindow = page.getWindow(pps.createWindowId(DOWNLOAD_PORTLET_NAME, projectId, pageName,
-                parser.getFirstToken()));
-        if (downloadsWindow == null) {
-            // Trying if there is no single downloads window.
-            downloadsWindow = page.getWindow(pps.createWindowId(DOWNLOAD_PORTLET_NAME, projectId, pageName, null));
-        } else {
-            // Forgetting the unique-id.
-            parser.proceed();
-        }
-
-        // Checking if a downloads window was found on the page.
-        if (downloadsWindow == null) {
-            return null;
-        }
-
-        Map<String, Object> params = new HashMap<String, Object>();
+    public void fillParams(PathParser parser, Map<String, Object> params) {
         params.put("category", parser.getCurrent());
-
-        if (hasMetaParameter(invocation)) {
-			return getPortalObjectCF().doMapping(invocation, downloadsWindow,
-					params, false);
-		} else {
-			params.put(PortletRequestDecoder.META_PARAMETER, Integer
-					.toString(PortletRequestDecoder.RENDER_MASK));
-			return getPortalObjectCF().doMapping(invocation, downloadsWindow,
-					params, false);
-		}
     }
 }

Copied: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,88 @@
+package org.jboss.labs.mapper.url;
+
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.portal.core.model.portal.command.InvokeWindowCommand;
+import org.jboss.portal.core.model.portal.command.PortalObjectCommand;
+import org.jboss.portal.core.model.portal.command.InvokePortletWindowActionCommand;
+import org.jboss.portal.core.model.portal.command.InvokePortletWindowRenderCommand;
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.server.ServerURL;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.PortletParametersStateString;
+import org.jboss.forge.common.Constants;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public abstract class AbstractLabsProjectPortletUrlFactory extends AbstractLabsDelegateUrlFactory {
+    private PortalObjectContainer container;
+
+    public PortalObjectContainer getContainer() {
+        return container;
+    }
+
+    public void setContainer(PortalObjectContainer container) {
+        this.container = container;
+    }
+
+    public abstract void buildPathFromPortletParameters(StringBuffer sb, PortletParametersStateString ppss);
+    public abstract void finishUrl(ServerURL url);
+
+    public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd) {
+        if (cmd == null) {
+            throw new IllegalArgumentException("No null command accepted");
+        }
+
+        if (cmd instanceof InvokeWindowCommand) {
+            PortalObjectCommand poc = (PortalObjectCommand) cmd;
+            PortalObjectId targetId = poc.getTargetId();
+
+            if (targetId.getLength() >= 0) {
+                return null;
+            }
+
+            if (targetId.getName(Math.abs(targetId.getLength()) - 1).toLowerCase().contains(getPath())) {
+                StringBuffer sb = new StringBuffer();
+                addToPath(sb, targetId, false);
+                addTokenToPath(sb, getPath());
+
+                InvokePortletWindowActionCommand actionCmd = null;
+                InvokePortletWindowRenderCommand renderCmd = null;
+
+                StateString navigationalState = null;
+
+                if (poc instanceof InvokePortletWindowActionCommand) {
+                    actionCmd = (InvokePortletWindowActionCommand) poc;
+                    navigationalState = actionCmd.getNavigationalState();
+                } else if (poc instanceof InvokePortletWindowRenderCommand) {
+                    renderCmd = (InvokePortletWindowRenderCommand) poc;
+                    navigationalState = renderCmd.getNavigationalState();
+                }
+
+                String uniqueId = getContainer().getObject(targetId).getDeclaredProperty(
+                        Constants.PORTAL_OBJECT_UNIQUE_ID_MARKER);
+                if (uniqueId != null) {
+                    addTokenToPath(sb, uniqueId);
+                }
+
+                if (navigationalState instanceof PortletParametersStateString) {
+                    PortletParametersStateString ppss =
+                            (PortletParametersStateString) navigationalState;
+
+                    buildPathFromPortletParameters(sb, ppss);
+                }
+
+                ServerURL url = convertToURL(sb);
+                encodeUrl(actionCmd, renderCmd, url, navigationalState);
+
+                finishUrl(url);
+
+                return url;
+            }
+        }
+
+        return null;
+    }
+}

Copied: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java (from rev 10755, labs/jbosslabs/trunk/portal-extensions-adam/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -0,0 +1,84 @@
+package org.jboss.labs.mapper.url;
+
+import org.jboss.portal.server.ServerURL;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.portlet.PortletParametersStateString;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.model.portal.command.InvokeWindowCommand;
+import org.jboss.portal.core.model.portal.command.PortalObjectCommand;
+import org.jboss.portal.core.model.portal.command.InvokePortletWindowActionCommand;
+import org.jboss.portal.core.model.portal.command.InvokePortletWindowRenderCommand;
+import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.forge.common.Constants;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class BlogUrlFactory extends AbstractLabsProjectPortletUrlFactory {
+    public void buildPathFromPortletParameters(StringBuffer sb, PortletParametersStateString ppss) {
+        if (ppss.getValue("post") != null) {
+            addTokenToPath(sb, ppss.getValue("post").toLowerCase());
+        }
+    }
+
+    public void finishUrl(ServerURL url) {
+        url.getParameterMap().remove("post");
+    }
+
+    public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd) {
+        if (cmd == null) {
+            throw new IllegalArgumentException("No null command accepted");
+        }
+
+        if (cmd instanceof InvokeWindowCommand) {
+            PortalObjectCommand poc = (PortalObjectCommand) cmd;
+            PortalObjectId targetId = poc.getTargetId();
+            
+            if (targetId.getLength() <= 0) {
+                return null;
+            }
+            
+            if (targetId.getName(targetId.getLength() - 1).toLowerCase().contains(getPath())) {
+                StringBuffer sb = new StringBuffer();
+                addToPath(sb, targetId, false);
+                addTokenToPath(sb, getPath());
+
+                InvokePortletWindowActionCommand actionCmd = null;
+                InvokePortletWindowRenderCommand renderCmd = null;
+
+                StateString navigationalState = null;
+
+                if (poc instanceof InvokePortletWindowActionCommand) {
+                    actionCmd = (InvokePortletWindowActionCommand) poc;
+                    navigationalState = actionCmd.getNavigationalState();
+                } else if (poc instanceof InvokePortletWindowRenderCommand) {
+                    renderCmd = (InvokePortletWindowRenderCommand) poc;
+                    navigationalState = renderCmd.getNavigationalState();
+                }
+
+                String uniqueId = getContainer().getObject(targetId).getDeclaredProperty(
+                        Constants.PORTAL_OBJECT_UNIQUE_ID_MARKER);
+                if (uniqueId != null) {
+                    addTokenToPath(sb, uniqueId);
+                }
+
+                if (navigationalState instanceof PortletParametersStateString) {
+                    PortletParametersStateString ppss =
+                            (PortletParametersStateString) navigationalState;
+
+                    buildPathFromPortletParameters(sb, ppss);
+                }
+
+                ServerURL url = convertToURL(sb);
+                encodeUrl(actionCmd, renderCmd, url, navigationalState);
+
+                finishUrl(url);
+
+                return url;
+            }
+        }
+
+        return null;
+    }
+}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -1,84 +1,19 @@
 package org.jboss.labs.mapper.url;
 
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.model.portal.command.*;
-import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.PortletParametersStateString;
-import org.jboss.forge.common.Constants;
 
 /**
  * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
  */
-public class DownloadUrlFactory extends AbstractLabsDelegateUrlFactory {
-    private PortalObjectContainer container;
-
-    public PortalObjectContainer getContainer() {
-        return container;
+public class DownloadUrlFactory extends AbstractLabsProjectPortletUrlFactory {
+    public void buildPathFromPortletParameters(StringBuffer sb, PortletParametersStateString ppss) {
+        if (ppss.getValue("category") != null) {
+            addTokenToPath(sb, ppss.getValue("category").toLowerCase());
+        }
     }
 
-    public void setContainer(PortalObjectContainer container) {
-        this.container = container;
+    public void finishUrl(ServerURL url) {
+        url.getParameterMap().remove("category");
     }
-
-    public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd) {
-        if (cmd == null) {
-            throw new IllegalArgumentException("No null command accepted");
-        }
-
-        if (cmd instanceof InvokeWindowCommand) {
-            PortalObjectCommand poc = (PortalObjectCommand) cmd;
-            PortalObjectId targetId = poc.getTargetId();
-
-            if (targetId.getLength() >= 0) {
-                return null;
-            }
-
-            if (targetId.getName(Math.abs(targetId.getLength()) - 1).toLowerCase().contains(getPath())) {
-                StringBuffer sb = new StringBuffer();
-                addToPath(sb, targetId, false);
-                addTokenToPath(sb, getPath());
-
-                InvokePortletWindowActionCommand actionCmd = null;
-                InvokePortletWindowRenderCommand renderCmd = null;
-
-                StateString navigationalState = null;
-
-                if (poc instanceof InvokePortletWindowActionCommand) {
-                    actionCmd = (InvokePortletWindowActionCommand) poc;
-                    navigationalState = actionCmd.getNavigationalState();                    
-                } else if (poc instanceof InvokePortletWindowRenderCommand) {
-                    renderCmd = (InvokePortletWindowRenderCommand) poc;
-                    navigationalState = renderCmd.getNavigationalState();
-                }
-
-                String uniqueId = getContainer().getObject(targetId).getDeclaredProperty(
-                        Constants.PORTAL_OBJECT_UNIQUE_ID_MARKER);
-                if (uniqueId != null) {
-                    addTokenToPath(sb, uniqueId);
-                }
-
-                if (navigationalState instanceof PortletParametersStateString) {
-                    PortletParametersStateString ppss =
-                            (PortletParametersStateString) navigationalState;
-
-                    if (ppss.getValue("category") != null) {
-                        addTokenToPath(sb, ppss.getValue("category").toLowerCase());
-                    }
-                }
-
-                ServerURL url = convertToURL(sb);
-                encodeUrl(actionCmd, renderCmd, url, navigationalState);
-                
-                url.getParameterMap().remove("category");
-
-                return url;
-            }
-        }
-
-        return null;
-    }
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -41,6 +41,12 @@
         </dependency>
         <dependency>
             <groupId>jboss</groupId>
+            <artifactId>javax.servlet.jsp</artifactId>
+            <version>1.0</version>
+            <jar>javax.servlet.jsp.jar</jar>
+        </dependency>
+        <dependency>
+            <groupId>jboss</groupId>
             <artifactId>javax.servlet</artifactId>
             <version>1.0</version>
             <jar>javax.servlet.jar</jar>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java	2007-04-04 13:24:34 UTC (rev 10757)
@@ -116,8 +116,6 @@
 			requestedRelPath = requestedPathFromPref.toString();
 		}
 
-		log.info(requestedRelPath);
-
 		return ProjectsHelper.createAbsoluteFreezonePath(projectId,
 				requestedRelPath);
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/jboss-portlet.xml	2007-04-04 13:23:28 UTC (rev 10756)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/jboss-portlet.xml	2007-04-04 13:24:34 UTC (rev 10757)
@@ -5,4 +5,34 @@
             <trans-attribute>Required</trans-attribute>
         </transaction>
     </portlet>
+    <portlet>
+        <portlet-name>InfoPortlet</portlet-name>
+        <transaction>
+            <trans-attribute>Required</trans-attribute>
+        </transaction>
+    </portlet>
+    <portlet>
+        <portlet-name>FreezonePortlet</portlet-name>
+        <transaction>
+            <trans-attribute>Required</trans-attribute>
+        </transaction>
+    </portlet>
+    <portlet>
+        <portlet-name>PodcastPortlet</portlet-name>
+        <transaction>
+            <trans-attribute>Required</trans-attribute>
+        </transaction>
+    </portlet>
+    <portlet>
+        <portlet-name>ProjectAdminPortlet</portlet-name>
+        <transaction>
+            <trans-attribute>Required</trans-attribute>
+        </transaction>
+    </portlet>
+    <portlet>
+        <portlet-name>MenuPortlet</portlet-name>
+        <transaction>
+            <trans-attribute>Required</trans-attribute>
+        </transaction>
+    </portlet>
 </portlet-app>
\ No newline at end of file




More information about the jboss-svn-commits mailing list