[jboss-svn-commits] JBL Code SVN: r6051 - in labs/jbosslabs/trunk/portal-extensions: . binaries/maven-repo-addons/jboss/jars configuration configuration/to-copy/server/all/deploy configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF configuration/to-copy/server/all/deploy/jboss-portal.sar/conf configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF forge-ads forge-ads/src/web/WEB-INF forge-ads/src/web/WEB-INF/tld forge-blog/src/java/org/jboss/portlet/blog forge-blog/src/web/WEB-INF forge-blog/src/web/WEB-INF/tld forge-common/src/java/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common/navigation forge-common/src/java/org/jboss/forge/common/projects/elements forge-common/src/java/org/jboss/forge/common/projects/permissions forge-common/src/java/org/jboss/forge/commo! n/soa/primates forge-contributor forge-contributor/src/java/org/jboss/forge/contributor forge-contributor/src/web/WEB-INF forge-contributor/src/web/WEB-INF/tld forge-file-access/src/web/WEB-INF forge-file-access/src/web/WEB-INF/tld forge-freezone/src/web/WEB-INF forge-freezone/src/web/WEB-INF/tld forge-kosmos forge-links forge-login forge-login/src/java/org/jboss/labs/login forge-login/src/java/org/jboss/portal/core/security/jaas forge-login-portlet/src/web/WEB-INF forge-map/src/web/WEB-INF forge-map/src/web/WEB-INF/tld forge-mapper forge-mapper/src/etc forge-mapper/src/java/org/jboss/labs/mapper forge-navigation/src/web/WEB-INF forge-navigation/src/web/WEB-INF/tld forge-podcast/src/web/WEB-INF forge-podcast/src/web/WEB-INF/tld forge-prj-downloads/src/web/WEB-INF forge-prj-downloads/src/web/WEB-INF/tld forge-prj-info/src/web/WEB-INF forge-prj-info/src/web/WEB-INF/tld forge-speller/src/web/WEB-INF/tld forge-status/src/web/WEB-INF forge-status/src/web/WEB-INF/tld forge-tagme/! src/java/org/jboss/labs/tagme/services forge-theme forge-theme/src/java/org/jboss/portal/core/theme/render/impl forge-timetracker/src/web/WEB-INF forge-timetracker/src/web/WEB-INF/tld forge-wiki/src/web/WEB-INF forge-wiki/src/web/WEB-INF/tld jbosswiki jbosswiki/forge-wiki/src/web/WEB-INF polls/src/web/WEB-INF polls/src/web/W

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Aug 31 16:59:48 EDT 2006 

Author: adamw
Date: 2006-08-31 16:55:25 -0400 (Thu, 31 Aug 2006)
New Revision: 6051

Added:
   labs/jbosslabs/trunk/portal-extensions/TODO
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-identity-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portals-bridges-common.jar
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml.old
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/portal-mysql-ds.xml.sample
   labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-theme/forge-theme.iml
   labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/commons-lang-2.0.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jsf-example.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-federation-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portals-bridges-common.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/jackrabbit-core-1.0.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/jcr-1.0.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/slf4j-log4j12.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/export_archive.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/export_pickup.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/fast-forward.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/fast-rewind.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/first.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/help.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/last.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/management.css
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/context.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/page.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/portal.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/window.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/images/accessorize.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/images/dodemo.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/images/getcode.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.js
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
   labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/primates/primates.iml
   labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml
Removed:
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portals-bridges-common-0.2.jar
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/federation-register/
   labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/ads-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/blog-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/con-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/downloads-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/freezone-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-jspwiki/
   labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/login-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/map-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/etc/org/
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
   labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/navigation-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/podcast-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/prj-downloads-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/prj-info-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/status-object.xml
   labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/wiki-object.xml
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/wiki-object.xml
   labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/polls-object.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-page.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jboss-cache.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jgroups.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portals-bridges-common-0.2.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/wurfltags.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/xom.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/jackrabbit-core.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/jcr.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/context.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/page-closed.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/page-open.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/window.png
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml
   labs/jbosslabs/trunk/portal-extensions/portal-federation/
   labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/primates-object.xml
Modified:
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-bridge-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-common-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-core-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-faces-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-format-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-portlet-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-security-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-server-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-theme-lib.jar
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/common.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/conf/config.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml
   labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/tld/portlet.tld
   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/ForgeHelper.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/AbstractRequestPermissionChecker.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimatesService.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml
   labs/jbosslabs/trunk/portal-extensions/forge-links/forge-links.iml
   labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml
   labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
   labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/portal/core/security/jaas/ForgeHibernateLoginModule.java
   labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-speller/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java
   labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
   labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java
   labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java
   labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java
   labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java
   labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
   labs/jbosslabs/trunk/portal-extensions/labs.iml
   labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/commons-collections.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/commons-fileupload.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/javassist.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jsf-facelets.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/project.html
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/sitemap.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/edit.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/menu.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/viewfile.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/nav.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/manager.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/preferences.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/properties.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRoleMembers.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/upload_archive.gif
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/phalanx/index.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.css
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp
   labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
   labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java
   labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/portlet.tld
Log:
http://jira.jboss.com/jira/browse/JBLAB-752

Added: labs/jbosslabs/trunk/portal-extensions/TODO
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/TODO	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/TODO	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+Fix: (build currently commented out in maven.xml)
+- forge-theme (along with modifications in forge-portal-default/src/web/WEB-INF/default-object.xml)
+- jbosswiki
+- forge-login
+
+- kosmos
+
+- root redirect
+
+- Shotoku <-> portal CMS

Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-portlet-api-lib.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-portlet-api-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-api-lib.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-api-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-bridge-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-common-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-core-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-faces-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-format-lib.jar
===================================================================
(Binary files differ)

Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-identity-lib.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-identity-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-portlet-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-security-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-server-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portal-theme-lib.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portals-bridges-common-0.2.jar
===================================================================
(Binary files differ)

Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portals-bridges-common.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portals-bridges-common.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/portlet-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/common.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/common.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/common.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -28,13 +28,30 @@
 	    <version>1.0</version>
 	    <jar>portal-common-lib.jar</jar>
 	</dependency>
-	
 	<dependency>
 	    <groupId>jboss</groupId>
+	    <artifactId>portal-identity-lib</artifactId>
+	    <version>1.0</version>
+	    <jar>portal-identity-lib.jar</jar>
+	</dependency>	
+	<dependency>
+	    <groupId>jboss</groupId>
 	    <artifactId>portal-core-lib</artifactId>
 	    <version>1.0</version>
 	    <jar>portal-core-lib.jar</jar>
 	</dependency>
+	<dependency>
+	    <groupId>jboss</groupId>
+	    <artifactId>jboss-portlet-api-lib</artifactId>
+	    <version>1.0</version>
+	    <jar>jboss-portlet-api-lib.jar</jar>
+	</dependency>
+	<dependency>
+	    <groupId>jboss</groupId>
+	    <artifactId>portal-api-lib</artifactId>
+	    <version>1.0</version>
+	    <jar>portal-api-lib.jar</jar>
+	</dependency>
 	
 	<dependency>
 	    <groupId>jboss</groupId>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -29,6 +29,7 @@
 		</ant:copy>
 		<ant:delete file="${local.deploy.dir}/jboss-portal.sar/conf/data/default-object.xml" />
 		<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-samples.war" />	
+		<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-wsrp.sar" />			
 		<ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
 	</goal>
 </project>


Property changes on: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy
___________________________________________________________________
Name: svn:ignore
   - JBLabs-ds.xml
portal-login-ds.xml

   + JBLabs-ds.xml
portal-login-ds.xml
portal-mysql-ds.xml


Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -5,518 +5,434 @@
    <mbean
       code="org.jboss.portal.server.config.ServerConfigService"
       name="portal:service=ServerConfig"
-      xmbean-dd="org/jboss/portal/server/config/ServerConfigService.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <attribute name="ConfigLocation">conf/config.xml</attribute>
    </mbean>
 
-   <!-- Jacc policy configuration -->
+   <!-- Portal security services-->
    <mbean
-      code="org.jboss.portal.security.impl.jacc.PortalJaccPolicy"
-      name="jboss.security:service=JaccPolicyProvider"
-      xmbean-dd="org/jboss/portal/security/impl/jacc/PortalJaccPolicy.xml">
-      <attribute name="ExternalPermissionTypes">
-         org.jboss.portal.core.security.PortalObjectPermission,
-         org.jboss.portal.core.security.InstancePermission,
-         org.jboss.portal.core.security.ComponentPermission
-      </attribute>
+      code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
+      name="portal:service=AuthorizationDomainRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/> 
    </mbean>
-
-   <!-- Security provider -->
-   <!-- todo when the xmbean loading is fixed in JBoss move the xmbean descriptor to a resource file : http://jira.jboss.com/jira/browse/JBAS-2501 -->
    <mbean
-      code="org.jboss.portal.security.impl.jacc.JBossSecurityProviderImpl"
-      name="portal:service=SecurityProvider"
-      xmbean-dd="">
-      <xmbean>
-         <descriptors>
-            <injection id="MBeanServerType" setMethod="setMBeanServer"/>
-            <injection id="ObjectNameType" setMethod="setObjectName"/>
-         </descriptors>
-         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
-            <description>The policy provider MBean name</description>
-            <name>PolicyName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getPolicyAttributeName" setMethod="setPolicyAttributeName">
-            <description>The Policy attribute name on the PolicyName MBean</description>
-            <name>PolicyAttributeName</name>
-            <type>java.lang.String</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getConfig" setMethod="setConfig">
-            <description>The Server Config</description>
-            <name>ConfigName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-        <attribute access="read-write" getMethod="getServerConfig">
-          <description>(no description)</description>
-          <name>ServerConfig</name>
-          <type>org.jboss.portal.server.config.ServerConfig</type>
-          <descriptors>
-            <persistence/>
-          </descriptors>
-        </attribute>
-        <attribute access="read-write" getMethod="getPolicy">
-          <description>(no description)</description>
-          <name>Policy</name>
-          <type>java.security.Policy</type>
-          <descriptors>
-            <persistence/>
-          </descriptors>
-        </attribute>
-        <operation impact="ACTION_INFO">
-          <description>(no description)</description>
-          <name>inService</name>
-          <parameter>
-            <description>(no description)</description>
-            <name>policyContextID</name>
-            <type>java.lang.String</type>
-          </parameter>
-          <return-type>boolean</return-type>
-          <descriptors>
-          </descriptors>
-        </operation>
-        <operation impact="ACTION_INFO">
-          <description>(no description)</description>
-          <name>getPolicyConfiguration</name>
-          <parameter>
-            <description>(no description)</description>
-            <name>policyContextID</name>
-            <type>java.lang.String</type>
-          </parameter>
-          <parameter>
-            <description>(no description)</description>
-            <name>remove</name>
-            <type>boolean</type>
-          </parameter>
-          <return-type>javax.security.jacc.PolicyConfiguration</return-type>
-          <descriptors>
-          </descriptors>
-        </operation>
-         <operation>
-            <name>start</name>
-         </operation>
-         <operation>
-            <name>stop</name>
-         </operation>
-      </xmbean>
-      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
-      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
-      <attribute name="ConfigName">portal:service=ServerConfig</attribute>
+      code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
+      name="portal:service=PortalAuthorizationManagerFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="AuthorizationDomainRegistry"
+         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.security.impl.jacc.PortalPolicyServiceImpl"
-      name="portal:service=PolicyService"
-      xmbean-dd="org/jboss/portal/security/impl/jacc/PortalPolicyServiceImpl.xml">
-      <depends optional-attribute-name="SecurityProvider" proxy-type="attribute">portal:service=SecurityProvider</depends>
+      code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
+      name="portal:service=PortletSecurityService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
-   <mbean
-      code="org.jboss.portal.security.impl.jacc.JaccPortalPolicyConfigurator"
-      name="portal:policy=JaccPortalPolicyConfigurator"
-      xmbean-dd="org/jboss/portal/security/impl/jacc/JaccPortalPolicyConfigurator.xml">
-      <depends optional-attribute-name="JBossSecurityProvider" proxy-type="attribute">portal:service=SecurityProvider</depends>
-      <depends optional-attribute-name="PermissionFactory" proxy-type="attribute">portal:service=PortalPermissionFactory</depends>
-   </mbean>
 
-   <!-- Persistent cache for portal objeccts and instances security stores -->
+   <!-- Portlet state -->
    <mbean
-      code="org.jboss.cache.TreeCache"
-      name="portal:service=TreeCache,type=persistent">
-      <depends>jboss:service=TransactionManager</depends>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-      <!-- Set to REPL_SYNC in clustered mode, otherwise LOCAL -->
-      <attribute name="CacheMode">LOCAL</attribute>
-      <attribute name="ClusterName">portal.security</attribute>
-      <attribute name="FetchStateOnStartup">true</attribute>
-      <attribute name="CacheLoaderClass">org.jboss.portal.core.security.store.HibernateCacheLoader</attribute>
-      <attribute name="CacheLoaderConfig">config.location=conf/hibernate/security/hibernate.cfg.xml</attribute>
-      <attribute name="CacheLoaderShared">true</attribute>
-      <attribute name="CacheLoaderFetchTransientState">false</attribute>
-      <attribute name="CacheLoaderFetchPersistentState">true</attribute>
-      <attribute name="CacheLoaderPreload">/</attribute>
-      <depends>portal:policy=JaccPortalPolicyConfigurator</depends>
+      code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
+      name="portal:service=StateStore,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=Portlet</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
    </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.store.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=persistent"
-      xmbean-dd="org/jboss/portal/security/impl/store/JBossTreeCacheProvider.xml">
-      <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=persistent</depends>
-   </mbean>
 
-   <!-- Transient cache for component security store -->
-   <mbean
-      code="org.jboss.cache.TreeCache"
-      name="portal:service=TreeCache,type=transient">
-      <depends>jboss:service=TransactionManager</depends>
-      <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-      <attribute name="CacheMode">LOCAL</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.store.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=transient"
-      xmbean-dd="org/jboss/portal/security/impl/store/JBossTreeCacheProvider.xml">
-      <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=transient</depends>
-   </mbean>
-
-   <!-- -->
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigServiceImpl"
-      name="portal:policy=PortalPolicyConfigService"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigServiceImpl.xml">
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigStoreImpl"
-      name="portal:policy=PortalPolicyConfigStore,type=PortalObject"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigStoreImpl.xml">
-      <depends optional-attribute-name="ConfigListener" proxy-type="attribute">portal:policy=JaccPortalPolicyConfigurator</depends>
-      <depends optional-attribute-name="CacheProvider" proxy-type="attribute">portal:service=TreeCacheProvider,type=persistent</depends>
-      <depends optional-attribute-name="PortalPolicyConfigService" proxy-type="attribute">portal:policy=PortalPolicyConfigService</depends>
-      <attribute name="PermissionType">portalobject</attribute>
-      <attribute name="Prefix">portalobject</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigStoreImpl"
-      name="portal:policy=PortalPolicyConfigStore,type=Instance"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigStoreImpl.xml">
-      <depends optional-attribute-name="ConfigListener" proxy-type="attribute">portal:policy=JaccPortalPolicyConfigurator</depends>
-      <depends optional-attribute-name="CacheProvider" proxy-type="attribute">portal:service=TreeCacheProvider,type=persistent</depends>
-      <depends optional-attribute-name="PortalPolicyConfigService" proxy-type="attribute">portal:policy=PortalPolicyConfigService</depends>
-      <attribute name="PermissionType">instance</attribute>
-      <attribute name="Prefix">instance</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigStoreImpl"
-      name="portal:policy=PortalPolicyConfigStore,type=Component"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigStoreImpl.xml">
-      <depends optional-attribute-name="ConfigListener" proxy-type="attribute">portal:policy=JaccPortalPolicyConfigurator</depends>
-      <depends optional-attribute-name="CacheProvider" proxy-type="attribute">portal:service=TreeCacheProvider,type=transient</depends>
-      <depends optional-attribute-name="PortalPolicyConfigService" proxy-type="attribute">portal:policy=PortalPolicyConfigService</depends>
-      <attribute name="PermissionType">component</attribute>
-      <attribute name="Prefix">component</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPermissionFactory"
-      name="portal:service=PortalPermissionFactory"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPermissionFactory.xml">
-      <attribute name="Config">
-         portalobject=org.jboss.portal.core.security.PortalObjectPermission
-         instance=org.jboss.portal.core.security.InstancePermission
-         component=org.jboss.portal.core.security.ComponentPermission
-      </attribute>
-   </mbean>
-
    <!-- Server stack -->
    <mbean
       code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
       name="portal:service=Interceptor,type=Server,name=Transaction"
-      xmbean-dd="org/jboss/portal/core/aspects/server/TransactionInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
       name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
-      xmbean-dd="org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.server.UserInterceptor"
       name="portal:service=Interceptor,type=Server,name=User"
-      xmbean-dd="org/jboss/portal/core/aspects/server/UserInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="UserModule"
+         proxy-type="attribute">portal:service=Module,type=User</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
       name="portal:service=Interceptor,type=Server,name=Locale"
-      xmbean-dd="org/jboss/portal/core/aspects/server/LocaleInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
       name="portal:service=Interceptor,type=Server,name=ContentType"
-      xmbean-dd="org/jboss/portal/server/aspects/server/ContentTypeInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.server.PolicyAssociationInterceptor"
-      name="portal:service=Interceptor,type=Server,name=PolicyAssociation"
-      xmbean-dd="org/jboss/portal/core/aspects/server/PolicyAssociationInterceptor.xml">
-      <depends optional-attribute-name="PolicyService" proxy-type="attribute">portal:service=PolicyService</depends>
+      code="org.jboss.portal.server.aspects.server.NavigationInterceptor"
+      name="portal:service=Interceptor,type=Server,name=Navigation"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.server.SubjectAssociationInterceptor"
-      name="portal:service=Interceptor,type=Server,name=SubjectAssociation"
-      xmbean-dd="org/jboss/portal/core/aspects/server/SubjectAssociationInterceptor.xml">
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
       name="portal:service=InterceptorStack,type=Server"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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=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-element>portal:service=Interceptor,type=Server,name=PolicyAssociation</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Server,name=SubjectAssociation</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=Navigation</depends-list-element>
       </depends-list>
    </mbean>
 
    <!-- Command stack -->
    <mbean
-      code="org.jboss.portal.core.aspects.controller.NavigationInterceptor"
-      name="portal:service=Interceptor,type=Command,name=Navigation"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/NavigationInterceptor.xml">
+      code="org.jboss.portal.core.aspects.controller.PageNavigationInterceptor"
+      name="portal:service=Interceptor,type=Command,name=PageNavigation"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.controller.PortalNodeInterceptor"
       name="portal:service=Interceptor,type=Command,name=PortalNode"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/PortalNodeInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
       name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.xml">
-      <depends optional-attribute-name="PortalPermissionFactory" proxy-type="attribute">portal:service=PortalPermissionFactory</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.controller.EventBroadcasterInterceptor"
       name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/EventBroadcasterInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
       name="portal:service=InterceptorStack,type=Command"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Command,name=Navigation</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=PageNavigation</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
       </depends-list>
    </mbean>
 
-   <!-- Portlet stack -->
+   <!-- Consumer stack -->
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.ValveInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Valve"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/ValveInterceptor.xml">
+      code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.ContextTrackerInterceptor"
-      name="portal:service=Interceptor,type=Component,name=ContextTracker"
-      xmbean-dd="org/jboss/portal/server/aspects/component/ContextTrackerInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.SecureTransportInterceptor"
-      name="portal:service=Interceptor,type=Component,name=SecureTransport"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/SecureTransportInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.SessionPreDispatchInterceptor"
-      name="portal:service=Interceptor,type=Component,name=SessionPreDispatch"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/SessionPreDispatchInterceptor.xml">
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
+      name="portal:service=InterceptorStack,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</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.server.aspects.component.ContextDispatcherInterceptor"
-      name="portal:service=Interceptor,type=Component,name=ContextDispatcher"
-      xmbean-dd="org/jboss/portal/server/aspects/component/ContextDispatcherInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Valve"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.SessionPostDispatchInterceptor"
-      name="portal:service=Interceptor,type=Component,name=SessionPostDispatch"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/SessionPostDispatchInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.bridge.BridgeInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Bridge"
-      xmbean-dd="org/jboss/portal/bridge/BridgeInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.WindowStatesInterceptor"
-      name="portal:service=Interceptor,type=Component,name=WindowStates"
-      xmbean-dd="org/jboss/portal/server/aspects/component/WindowStatesInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.ModesInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Modes"
-      xmbean-dd="org/jboss/portal/server/aspects/component/ModesInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.CacheInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Cache"
-      xmbean-dd="org/jboss/portal/server/aspects/component/CacheInterceptor.xml">
+      code="org.jboss.portal.bridge.BridgeInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Bridge"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.NavigationInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Navigation"
-      xmbean-dd="org/jboss/portal/server/aspects/component/NavigationInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=WindowStates"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.component.TransactionInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Transaction"
-      xmbean-dd="org/jboss/portal/core/aspects/component/TransactionInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Modes"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.component.HeaderInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Header"
-      xmbean-dd="org/jboss/portal/core/aspects/component/HeaderInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
-      name="portal:service=InterceptorStack,type=Component"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
-      <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Valve</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=SecureTransport</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=ContextTracker</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=SessionPreDispatch</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=ContextDispatcher</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=SessionPostDispatch</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Bridge</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=WindowStates</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Modes</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Cache</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Navigation</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Header</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Transaction</depends-list-element>
-      </depends-list>
+      code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Transaction"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
-
-   <!-- Theme and layout services -->
    <mbean
-      code="org.jboss.portal.theme.invocation.LayoutInterceptor"
-      name="portal:service=Interceptor,type=Page,name=Layout"
-      xmbean-dd="org/jboss/portal/theme/invocation/LayoutInterceptor.xml">
+      code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Header"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.theme.invocation.ThemeInterceptor"
-      name="portal:service=Interceptor,type=Page,name=Theme"
-      xmbean-dd="org/jboss/portal/theme/invocation/ThemeInterceptor.xml">
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.invocation.RenderSetInterceptor"
-      name="portal:service=Interceptor,type=Page,name=RenderSet"
-      xmbean-dd="org/jboss/portal/theme/invocation/RenderSetInterceptor.xml">
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.invocation.StrategyInterceptor"
-      name="portal:service=Interceptor,type=Page,name=Strategy"
-      xmbean-dd="org/jboss/portal/theme/invocation/StrategyInterceptor.xml">
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
-      name="portal:service=InterceptorStack,type=Page"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
+      name="portal:service=InterceptorStack,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Page,name=Layout</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Page,name=Theme</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Page,name=RenderSet</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Page,name=Strategy</depends-list-element>
+         <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=ContextTracker</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=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="org/jboss/portal/theme/impl/ThemeServiceImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.theme.impl.LayoutServiceImpl"
       name="portal:service=LayoutService"
-      xmbean-dd="org/jboss/portal/theme/impl/LayoutServiceImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.theme.impl.page.PageServiceImpl"
       name="portal:service=PageService"
-      xmbean-dd="org/jboss/portal/theme/impl/page/PageServiceImpl.xml">
-      <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
-      <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
-      <depends optional-attribute-name="PageStack" proxy-type="attribute">portal:service=InterceptorStack,type=Page</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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
+      <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.security.impl.store.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=hibernate"
-      xmbean-dd="org/jboss/portal/security/impl/store/JBossTreeCacheProvider.xml">
+      </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>
+      </mbean>
    
    -->
 
    <!-- Session factories -->
    <mbean
-      code="org.jboss.portal.core.hibernate.SessionFactoryBinder"
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
       name="portal:service=Hibernate"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+         <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/UserSessionFactory</attribute>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=globalinstance"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+         <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.core.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=globalportal"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+         <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.common.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>
 
    <!-- Modules -->
    <mbean
-      code="org.jboss.portal.core.impl.user.UserModuleImpl"
+      code="org.jboss.portal.identity.db.UserModuleImpl"
       name="portal:service=Module,type=User"
-      xmbean-dd="org/jboss/portal/core/impl/user/UserModuleImpl.xml">
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate</depends>
-      <attribute name="JNDIName">java:portal/UserModule</attribute>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate</depends>
+      <attribute name="JNDIName">java:/portal/UserModule</attribute>
+      <attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.impl.role.RoleModuleImpl"
+      code="org.jboss.portal.identity.db.RoleModuleImpl"
       name="portal:service=Module,type=Role"
-      xmbean-dd="org/jboss/portal/core/impl/role/RoleModuleImpl.xml">
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate</depends>
-      <attribute name="JNDIName">java:portal/RoleModule</attribute>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate</depends>
+      <attribute name="JNDIName">java:/portal/RoleModule</attribute>
+      <attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
    </mbean>
-   <!--
-      <mbean
-         code="org.jboss.portal.core.impl.security.SecurityModuleImpl"
-         name="portal:service=Module,type=Security"
-         xmbean-dd="org/jboss/portal/core/impl/security/SecurityModuleImpl.xml">
-         <depends>portal:service=Hibernate</depends>
-         <depends optional-attribute-name="Tree" proxy-type="attribute">portal:service=Tree</depends>
-         <attribute name="JNDIName">java:portal/SecurityModule</attribute>
-      </mbean>
-   -->
    <mbean
       code="org.jboss.portal.core.impl.mail.MailModuleImpl"
       name="portal:service=Module,type=Mail"
-      xmbean-dd="org/jboss/portal/core/impl/mail/MailModuleImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <depends>jboss:service=Mail</depends>
       <depends>portal:service=Module,type=User</depends>
       <attribute name="QueueCapacity">-1</attribute>
@@ -538,24 +454,32 @@
 
    <!-- Registries -->
    <mbean
-      code="org.jboss.portal.server.impl.app.JBossWebAppRegistryImpl"
+      code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
       name="portal:service=WebAppRegistry"
-      xmbean-dd="org/jboss/portal/server/impl/app/JBossWebAppRegistryImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
 
    <!-- Listener registry -->
    <mbean
       code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
       name="portal:service=ListenerRegistry"
-      xmbean-dd="org/jboss/portal/core/event/PortalEventListenerRegistryImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
 
    <!-- A sample listener -->
    <mbean
       code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
       name="portal:service=ListenerService,type=test_listener"
-      xmbean-dd="org/jboss/portal/core/event/PortalEventListenerServiceImpl.xml">
-      <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
@@ -563,76 +487,233 @@
    <!-- The different containers -->
    <mbean
       code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
-      name="portal:container=Instance,type=global"
-      xmbean-dd="org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.xml">
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate,type=globalinstance</depends>
+      name="portal:container=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=Instance</depends>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Instance</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>
    </mbean>
    <mbean
       code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
-      name="portal:container=PortalObject,type=global"
-      xmbean-dd="org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.xml">
-      <depends optional-attribute-name="PortalEventListenerRegistry" proxy-type="attribute">portal:service=ListenerRegistry</depends>
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate,type=globalportal</depends>
+      name="portal:container=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="PortalEventListenerRegistry"
+         proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
    </mbean>
 
-   <!-- Define the command mappers -->
+   <!-- Command factories -->
+   
+   <!-- Labs command factory -->
    <mbean
-      code="org.jboss.portal.core.command.mapper.CanonicalCommandMapper"
-      name="portal:mapper=Canonical"
-      xmbean-dd="org/jboss/portal/core/command/mapper/CanonicalCommandMapper.xml">
+      code="org.jboss.labs.mapper.LabsCommandFactory"
+      name="portal:commandFactory=Labs"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>shotoku:service=svn</depends>
+      <depends
+         optional-attribute-name="NextFactory"
+         proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
+   </mbean> 
+   
+   <!-- Standard command factories -->   
+   <mbean
+      code="org.jboss.portal.core.command.mapper.DelegatingCommandFactoryService"
+      name="portal:commandFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.command.mapper.PrefixDelegatingCommandMapperService"
-      name="portal:mapper=PrefixDelegating"
-      xmbean-dd="org/jboss/portal/core/command/mapper/PrefixDelegatingCommandMapperService.xml">
-      <depends optional-attribute-name="NextMapper" proxy-type="attribute">portal:mapper=Canonical</depends>
+      code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+      name="portal:commandFactory=DefaultPortal"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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.DefaultPortalCommandMapper"
-      name="portal:mapper=DefaultPortal"
-      xmbean-dd="org/jboss/portal/core/model/portal/DefaultPortalCommandMapper.xml">
-      <depends optional-attribute-name="NextMapper" proxy-type="attribute">portal:mapper=PrefixDelegating</depends>
-      <depends optional-attribute-name="Container"
-               proxy-type="attribute">portal:container=PortalObject,type=global</depends>
+      code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+      name="portal:commandFactory=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectCommandMapper"
-      name="portal:mapper=PortalObject,type=global"
-      xmbean-dd="org/jboss/portal/core/model/portal/PortalObjectCommandMapper.xml">
+      code="org.jboss.portal.core.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,prefix=portal"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <attribute name="Prefix">portal</attribute>
-      <depends optional-attribute-name="Mapper" proxy-type="attribute">portal:mapper=PrefixDelegating</depends>
-      <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject,type=global</depends>
+      <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>
-   
-   <!-- Labs command mapper -->
+
+   <!-- URL factories -->
    <mbean
-      code="org.jboss.labs.mapper.LabsCommandMapper"
-      name="portal:mapper=Labs"
-      xmbean-dd="org/jboss/labs/mapper/LabsCommandMapper.xml">
-      <depends>shotoku:service=svn</depends>
-      <depends optional-attribute-name="NextMapper" proxy-type="attribute">portal:mapper=DefaultPortal</depends>
-      <depends optional-attribute-name="Container"
-               proxy-type="attribute">portal:container=PortalObject,type=global</depends>
+      code="org.jboss.portal.core.command.mapper.DelegatingURLFactoryService"
+      name="portal:urlFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
-   
    <mbean
+      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+      name="portal:urlFactory=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Prefix">portal</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+
+   <!-- The federating portlet invoker -->
+   <mbean
+      code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
+      name="portal:service=PortletInvoker,type=Federating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Stack"
+         proxy-type="attribute">portal:service=InterceptorStack,type=Producer</depends>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=WebAppRegistry</depends>
+   </mbean>
+
+   <!-- The state portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
+      name="portal:service=PortletInvoker,type=Stateful"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+      <depends
+         optional-attribute-name="StateStore"
+         proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
+   </mbean>
+
+   <!-- Register the state portlet invoker on the federating portlet invoker -->
+   <mbean
+      code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
+      name="portal:service=PortletInvokerRegistration,id=local"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Id">local</attribute>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
+      <depends
+         optional-attribute-name="FederatingPortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+   </mbean>
+
+   <!-- The instance portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.test.TestPortletInvoker"
+      name="portal:service=PortletInvoker,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Producer"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+      <depends
+         optional-attribute-name="Stack"
+         proxy-type="attribute">portal:service=InterceptorStack,type=Instance</depends>
+   </mbean>
+
+
+   <!-- The core controller -->
+   <mbean
       code="org.jboss.portal.core.CoreController"
       name="portal:controller=Request"
-      xmbean-dd="org/jboss/portal/core/CoreController.xml">
-      <depends optional-attribute-name="PageService" proxy-type="attribute">portal:service=PageService</depends>
-      <depends optional-attribute-name="CommandMapper" proxy-type="attribute">portal:mapper=Labs</depends>
-      <depends optional-attribute-name="PortletStack" proxy-type="attribute">portal:service=InterceptorStack,type=Component</depends>
-      <depends optional-attribute-name="CommandStack" proxy-type="attribute">portal:service=InterceptorStack,type=Command</depends>
-      <depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
-      <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject,type=global</depends>
-      <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance,type=global</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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=Labs</depends>
+      <depends
+         optional-attribute-name="URLFactory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="CommandStack"
+         proxy-type="attribute">portal:service=InterceptorStack,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>
    </mbean>
 
+   <!-- -->
    <mbean
       code="org.jboss.portal.server.impl.ServerImpl"
       name="portal:service=Server"
-      xmbean-dd="org/jboss/portal/server/impl/ServerImpl.xml">
-      <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Config"
+         proxy-type="attribute">portal:service=ServerConfig</depends>
    </mbean>
 
    <!-- -->
@@ -640,84 +721,146 @@
       code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
       name="portal:deployer=PortalWebApp">
       <depends>jboss.system:service=MainDeployer</depends>
-      <depends>portal:container=PortalObject,type=global</depends>
-      <depends>portal:container=Instance,type=global</depends>
-      <depends optional-attribute-name="PortalServer" proxy-type="attribute">portal:service=Server</depends>
+      <depends>portal:container=PortalObject</depends>
+      <depends>portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="PortalServer"
+         proxy-type="attribute">portal:service=Server</depends>
    </mbean>
 
-   <!-- Deployment factories -->
+   <!-- Portal object deployment factory -->
+   <!--
+      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
+      
+      <mbean
+      code="org.jboss.portal.core.system.LifecycleInvoker"
+      name="portal:service=Controller,target=ObjectDeploymentFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject,type=global</depends>
-      <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance,type=global</depends>
-      <depends optional-attribute-name="PortalObjectPolicyConfig" proxy-type="attribute">portal:policy=PortalPolicyConfigStore,type=PortalObject</depends>
-      <depends optional-attribute-name="InstancePolicyConfig" proxy-type="attribute">portal:policy=PortalPolicyConfigStore,type=Instance</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
       <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.core.system.LifecycleInvoker"
+      name="portal:service=Controller,target=PortletAppDeploymentFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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">disableCreateInstance</attribute>
+      </mbean>
+   
+   -->
    <mbean
       code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
       name="portal:deploymentFactory=PortletApp"
-      xmbean-dd="org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+      <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
       <attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
-      <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="ComponentPolicyConfig" proxy-type="attribute">portal:policy=PortalPolicyConfigStore,type=Component</depends>
+      <!-- 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="org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/server/deployment/WebAppAdapter.xml">
-      <depends>portal:deploymentFactory=Object</depends>
-      <depends>portal:deploymentFactory=PortletApp</depends>
-      <depends>portal:deploymentFactory=Layout</depends>
-      <depends>portal:deploymentFactory=LayoutFeatures</depends>
-      <depends>portal:deploymentFactory=Theme</depends>
-      <depends>portal:service=Module,type=User</depends>
-      <depends>portal:service=Module,type=Role</depends>
-      <depends>portal:service=Module,type=Mail</depends>
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
    </mbean>
-
-   <!--
-      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
-      
-   <mbean
-      code="org.jboss.ha.singleton.HASingletonController"
-      name="portal:service=Controller,target=ObjectDeploymentFactory">
-      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
-      <depends>portal:deploymentFactory=Object</depends>
-      <attribute name="TargetName">portal:deploymentFactory=Object</attribute>
-      <attribute name="TargetStartMethod">registerFactory</attribute>
-      <attribute name="TargetStopMethod">unregisterFactory</attribute>
-   </mbean>
-   
-   -->
 </server>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/conf/config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/conf/config.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/conf/config.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -3,8 +3,10 @@
    <entry key="core.render.window_access_denied">show</entry>
    <!-- When a window is unavailable : show or hide values are permitted -->
    <entry key="core.render.window_unavailable">show</entry>
-   <!-- When a window produces an error : show or hide values are permitted -->
+   <!-- When a window produces an error : show, hide or message_only values are permitted -->
    <entry key="core.render.window_error">show</entry>
+   <!-- When a window produces an internal error : show, hide are permitted -->
+   <entry key="core.render.window_internal_error">show</entry>
    <!-- When a window is not found : show or hide values are permitted -->
    <entry key="core.render.window_not_found">show</entry>
 </properties>

Deleted: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,22 +0,0 @@
-<server>
-   <mbean
-      code="org.jboss.shotoku.portal.ShotokuCMS"
-      name="portal:service=CMS"
-      xmbean-dd="org/jboss/shotoku/portal/ShotokuCMS.xml">
-      <depends>shotoku:service=shotoku</depends>
-      <depends>shotoku:service=svn</depends>
-      <attribute name="RepositoryId">default</attribute>
-      <attribute name="RepositoryPrefix"></attribute>
-      <attribute name="DefaultLocale">en</attribute>
-   </mbean>
-
-   <mbean
-         code="org.jboss.portal.core.cms.CMSObjectCommandMapper"
-         name="portal:mapper=CMSObject"
-         xmbean-dd="org/jboss/portal/core/cms/CMSObjectCommandMapper.xml">
-      <attribute name="Prefix">content</attribute>
-      <attribute name="TargetWindowRef">default.default.DefaultCMSPortletWindow</attribute>
-      <depends optional-attribute-name="Mapper" proxy-type="attribute">portal:mapper=PrefixDelegating</depends>
-      <depends optional-attribute-name="CMSService" proxy-type="attribute">portal:service=CMS</depends>
-   </mbean>
-</server>

Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml.old (from rev 6034, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml)

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,24 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<portal-renderSet>
-   <renderSet name="divRenderer">
-      <set content-type="text/html">
-         <region-renderer>org.jboss.portal.theme.impl.render.DivRegionRenderer</region-renderer>
-         <window-renderer>org.jboss.portal.theme.impl.render.DivWindowRenderer</window-renderer>
-         <portlet-renderer>org.jboss.portal.theme.impl.render.DivPortletRenderer</portlet-renderer>
-         <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer>
-      </set>
-   </renderSet>
-   <renderSet name="emptyRenderer">
-      <set content-type="text/html">
-         <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
-         <window-renderer>org.jboss.portal.theme.impl.render.EmptyWindowRenderer</window-renderer>
-         <portlet-renderer>org.jboss.portal.theme.impl.render.EmptyPortletRenderer</portlet-renderer>
-         <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer>
-      </set>
+<?xml version="1.0" encoding="UTF-8"?>
+<portal-renderSet>
+   <renderSet name="divRenderer">
+      <set content-type="text/html">
+         <region-renderer>org.jboss.portal.theme.impl.render.DivRegionRenderer</region-renderer>
+         <window-renderer>org.jboss.portal.theme.impl.render.DivWindowRenderer</window-renderer>
+         <portlet-renderer>org.jboss.portal.theme.impl.render.DivPortletRenderer</portlet-renderer>
+         <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer>
+      </set>
    </renderSet>
-</portal-renderSet>
+   <renderSet name="emptyRenderer">
+      <set content-type="text/html">
+         <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
+         <window-renderer>org.jboss.portal.theme.impl.render.EmptyWindowRenderer</window-renderer>
+         <portlet-renderer>org.jboss.portal.theme.impl.render.EmptyPortletRenderer</portlet-renderer>
+         <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer>
+      </set>
+   </renderSet>
+</portal-renderSet>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -4,14 +4,11 @@
    "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
    <description>JBoss Portal</description>
-   <!--
-      | Uncomment in clustered mode : use http session replication
-      
+   <!-- Comment/Uncomment to enable portal session replication
    <distributable/>
-   
    -->
 
-   <!-- LABS FILTERS -->
+   !-- LABS FILTERS -->
    <filter>
       <filter-name>titleAndTimestampFilter</filter-name>
       <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
@@ -31,55 +28,55 @@
       <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>
 
-	<!-- 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>
-	-->
+   <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>
+   <!-- 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>
    
-   <!-- 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>
-
+   <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>
@@ -89,6 +86,11 @@
          <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>
@@ -105,6 +107,11 @@
          <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>
@@ -216,20 +223,20 @@
       <auth-method>FORM</auth-method>
       <realm-name>JBoss Portal</realm-name>
       <form-login-config>
-         <form-login-page>/login</form-login-page>
+         <form-login-page>/login.jsp</form-login-page>
          <form-error-page>/index.html?ctrl:cmd=render&amp;ctrl:window=default.login.LoginWindow&amp;action=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>
 -->
+   <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>

Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/portal-mysql-ds.xml.sample
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/portal-mysql-ds.xml.sample	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/portal-mysql-ds.xml.sample	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>PortalDS</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/jbossportal?useServerPrepStmts=false</connection-url>
+    <driver-class>org.gjt.mm.mysql.Driver</driver-class>
+    <user-name>portal</user-name>
+    <password>portalpassword</password>
+  </local-tx-datasource>
+</datasources>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -13,6 +13,8 @@
     <orderEntry type="module" module-name="shotoku-aop" />
     <orderEntry type="module" module-name="forge-common" />
     <orderEntry type="library" name="jboss" level="application" />
+    <orderEntry type="library" name="portal" level="application" />
+    <orderEntry type="library" name="portlet" level="application" />
     <orderEntryProperties />
   </component>
 </module>

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/ads-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/ads-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/ads-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>AdsPortletInstance</instance-name>
-         <component-ref>ads.AdsPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/ads-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/ads-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>AdsPortletInstance</instance-id>
+         <portlet-ref>AdsPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,69 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib 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-jsptaglibrary_2_0.xsd"
+  version="2.0">
+   <tlib-version>1.1</tlib-version>
+   <short-name>JBoss-Portal-tags</short-name>
 
-<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.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>
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
-   <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -73,84 +29,53 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
-   <tag>
 
-      <name>defineObjects</name>
-      <tag-class>org.jboss.portal.portlet.taglib.DefineObjectsTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.DefineObjectsTagTEI</tei-class>
-      <body-content>empty</body-content>
-
-   </tag>
    <tag>
-
-      <name>namespace</name>
-      <tag-class>org.jboss.portal.portlet.taglib.NamespaceTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
-      <name>renderURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.RenderURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+      <name>error</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
-         <name>portletMode</name>
+         <name>key</name>
+         <required>true</required>
          <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>errors</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
+   </tag>
 
-      <name>actionURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.ActionURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+   <tag>
+      <name>success</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
       <body-content>JSP</body-content>
+   </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
 
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-   </tag>
-
 </taglib>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -223,7 +223,7 @@
      * @param name
      *            Name of the page to display.
      */
-    void writePage(JBossRenderRequest request, JBossRenderResponse response,
+    private void writePage(JBossRenderRequest request, JBossRenderResponse response,
                    String name) {
         try {
             PortletRequestDispatcher rd = getPortletContext()

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/blog-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/blog-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/blog-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      	<instance>
-		<instance-name>BlogPortletInstance</instance-name>
-		<component-ref>blog.BlogPortlet</component-ref>
-		<preferences>
-			<preference>
-				<name>jsp</name>
-				<value>/blog/blog.jsp</value>
-			</preference>
-		</preferences>
-	</instance>
-   </deployment>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-	<instance>
-		<instance-name>PrjBlogPortletInstance</instance-name>
-		<component-ref>blog.BlogPortlet</component-ref>
-		<preferences>
-			<preference>
-				<name>jsp</name>
-				<value>/prj-blog/blog.jsp</value>
-			</preference>
-		</preferences>
-	</instance>
-   </deployment>
-</deployments>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/blog-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/blog-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      	<instance>
+		<instance-id>BlogPortletInstance</instance-id>
+		<portlet-ref>BlogPortlet</portlet-ref>
+		<preferences>
+			<preference>
+				<name>jsp</name>
+				<value>/blog/blog.jsp</value>
+			</preference>
+		</preferences>
+	</instance>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+	<instance>
+		<instance-id>PrjBlogPortletInstance</instance-id>
+		<portlet-ref>BlogPortlet</portlet-ref>
+		<preferences>
+			<preference>
+				<name>jsp</name>
+				<value>/prj-blog/blog.jsp</value>
+			</preference>
+		</preferences>
+	</instance>
+   </deployment>
+</deployments>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

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	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -102,7 +102,7 @@
 			String requestedFile = requestURI.substring(requestURI
 					.indexOf(ForgeHelper.REPO_ACCESS_DIR)
 					+ repoAccessDirLength + 1);
-			
+
 			Node requestedNode;
 			try {
 				requestedNode = contentManager.getNode(requestedFile);

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -40,8 +40,6 @@
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import javax.management.MalformedObjectNameException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.portlet.PortalContext;
 import javax.portlet.PortletRequest;
 import javax.servlet.ServletRequest;
@@ -49,10 +47,6 @@
 import org.jboss.forge.common.service.ForgeManagement;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.portal.core.model.NoSuchUserException;
-import org.jboss.portal.core.model.User;
-import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.core.modules.UserModule;
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.shotoku.ContentManager;
 import org.jboss.shotoku.tools.Tools;
@@ -122,8 +116,6 @@
 	private static Set<Integer> volatileTempFiles;
 	
 	private static VolatileTempFileRemover vtfRemover;
-	
-	private static final String userModuleCtx = "java:portal/UserModule";
 
 	static {
 		forgeManagement = null;

Added: 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	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,62 @@
+package org.jboss.forge.common;
+
+import org.jboss.portal.identity.*;
+import org.jboss.shotoku.tools.Tools;
+import org.jboss.logging.Logger;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class PermissionTools {
+    private static final Logger log = Logger.getLogger(PermissionTools.class);
+
+    private static RoleModule rm;
+
+    private static RoleModule getRm() {
+        if (rm == null) {
+            try {
+                InitialContext initialContext = new InitialContext();
+                rm = (RoleModule) initialContext
+                        .lookup("portal:service=Module,type=Role");
+            } catch (NamingException e) {
+                log.error("Exception while getting the role module", e);
+            }
+        }
+
+        return rm;
+    }
+
+    public static boolean isUserInRole(User user, String roleName) {
+        try {
+            for (Object roleObj : getRm().getRoles(user)) {
+                Role role = (Role) roleObj;
+
+                if (Tools.objectsEqual(roleName, role.getName())) {
+                    return true;
+                }
+            }
+        } catch (IdentityException e) {
+            return false;
+        }
+
+        return false;
+    }
+
+    public static List<String> getRoleNames(User user) {
+        List<String> ret = new ArrayList<String>();
+        try {
+            for (Object roleObj : getRm().getRoles(user)) {
+                ret.add(((Role) roleObj).getName());
+            }
+        } catch (IdentityException e) {
+            return ret;
+        }
+
+        return ret;
+    }
+}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -24,9 +24,10 @@
 import org.jboss.forge.common.XmlTools;
 import org.jboss.forge.common.Constants;
 import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.PermissionTools;
 import org.jboss.forge.common.projects.ProjectDescriptor;
 import org.jboss.portal.common.context.DelegateContext;
-import org.jboss.portal.core.model.User;
+import org.jboss.portal.identity.User;
 import org.jboss.portlet.JBossRenderRequest;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -179,7 +180,7 @@
             User user = request.getUser();
 
             if ((user == null) ||
-                    (!user.getRoleNames().contains(permission))) {
+                    (!PermissionTools.isUserInRole(user, permission))) {
                 // The user doesn't have the given role.
                 return;
             }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -307,7 +307,6 @@
         // Checking if any of the required permissions are satisfied.
 		for (String permission : properties.get(PROP_EDIT_PERM).getAllValues()) {
             if (pc.hasPermission(permission)) {
-                System.out.println("Found!");
                 return true;
 			}
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/AbstractRequestPermissionChecker.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/AbstractRequestPermissionChecker.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/AbstractRequestPermissionChecker.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -25,30 +25,31 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.portal.core.model.User;
+import org.jboss.portal.identity.User;
+import org.jboss.forge.common.PermissionTools;
 
 public class AbstractRequestPermissionChecker {
-	protected boolean checkUserRole(User user, String role) {
-		if (user == null) return false;
-		return user.getRoleNames().contains(role);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected String getDescriptorFromUser(User user) {
-		String descriptor;
+    protected boolean checkUserRole(User user, String role) {
+        if (user == null) return false;
+        return PermissionTools.isUserInRole(user, role);
+    }
 
-		if (user == null) {
-			descriptor = NullPermissionsChecker.NULL_DESCRIPTOR;
-		} else {
-			List roles = new ArrayList(user.getRoleNames());
-			Collections.sort(roles);
-			
-			descriptor = "";
-			for (Object roleName : roles) {
-				descriptor += roleName + "; ";
-			}
-		}
-		
-		return descriptor;
-	}
+    @SuppressWarnings("unchecked")
+    protected String getDescriptorFromUser(User user) {
+        String descriptor;
+
+        if (user == null) {
+            descriptor = NullPermissionsChecker.NULL_DESCRIPTOR;
+        } else {
+            List roles = new ArrayList(PermissionTools.getRoleNames(user));
+            Collections.sort(roles);
+
+            descriptor = "";
+            for (Object roleName : roles) {
+                descriptor += roleName + "; ";
+            }
+        }
+
+        return descriptor;
+    }
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -24,7 +24,6 @@
 
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map;
 
 import java.util.Set;
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimatesService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimatesService.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimatesService.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -22,7 +22,7 @@
   
 package org.jboss.forge.common.soa.primates;
 
-import org.jboss.portal.core.model.User;
+import org.jboss.portal.identity.User;
 
 /**
  * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -34,9 +34,9 @@
             <groupId>myfaces</groupId>
             <artifactId>myfaces-all</artifactId>
             <version>1.1.1</version>
-	    <properties>
+	    <!--<properties>
 		<war.bundle>true</war.bundle>
-	    </properties>
+	    </properties>-->
         </dependency>
 
 	<dependency>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -29,7 +29,6 @@
 import javax.faces.context.FacesContext;
 
 import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.common.SearchTools;
 
 /**

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -42,7 +42,7 @@
 import org.jboss.shotoku.aop.CacheItem;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
 import org.jboss.shotoku.exceptions.SaveException;
-import org.jboss.portlet.PortalNodeURL;
+import org.jboss.portal.api.node.PortalNodeURL;
 import org.xml.sax.InputSource;
 
 /**
@@ -287,7 +287,7 @@
 					messages.getString("adminMailSubject"),
 					getFormattedMessage("adminMailText", 
 							new Object[] { newXml, adminURL }),
-					"forge-robot at labs.jboss.com");
+					"labs-admin at jboss.com");
 		} catch (Exception e) {
 			return messages.getString("unableToConfirm");
 		} 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -26,7 +26,12 @@
 
 import org.jboss.forge.common.Constants;
 import org.jboss.forge.common.ForgeHelper;
-import org.jboss.portlet.*;
+import org.jboss.forge.common.PermissionTools;
+import org.jboss.portal.api.node.PortalNodeURL;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.portlet.JBossRenderResponse;
+import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author adamw
@@ -81,19 +86,19 @@
     static boolean hasPermission(String permission) {
         Object request = getExternalContext().getRequest();
         if (request instanceof JBossActionRequest) {
-            org.jboss.portal.core.model.User u = ((JBossActionRequest) request).getUser();
+            org.jboss.portal.identity.User u = ((JBossActionRequest) request).getUser();
             if (u == null) {
                 return false;
             }
 
-            return u.getRoleNames().contains(permission);
+            return PermissionTools.isUserInRole(u, permission);
         } else if (request instanceof JBossRenderRequest) {
-            org.jboss.portal.core.model.User u = ((JBossRenderRequest) request).getUser();
+            org.jboss.portal.identity.User u = ((JBossRenderRequest) request).getUser();
             if (u == null) {
                 return false;
             }
 
-            return u.getRoleNames().contains(permission);
+            return PermissionTools.isUserInRole(u, permission);
         } else return false;
     }
 

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/con-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/con-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/con-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>ConPortletInstance</instance-name>
-         <component-ref>con.ConPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/con-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/con-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>ConPortletInstance</instance-id>
+         <portlet-ref>ConPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -9,7 +9,7 @@
             	<name>default-view</name>
             	<value>/repo-access/default/contributor/contributor.jsp</value>
             </init-param>
-            <expiration-cache>-1</expiration-cache>
+            <expiration-cache>0</expiration-cache>
 	<supported-locale>en</supported-locale>
       <supports>
          <mime-type>text/html</mime-type>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/downloads-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/downloads-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/downloads-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>DownloadCounterPortletInstance</instance-name>
-         <component-ref>counter.DownloadCounterPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,7 +1,10 @@
-<?xml version="1.0" standalone="yes"?>
-<instances>
-   <instance>
-      <instance-name>DownloadCounterPortletInstance</instance-name>
-      <component-ref>DownloadCounterPortlet</component-ref>
-   </instance>
-</instances>
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>DownloadCounterPortletInstance</instance-id>
+         <portlet-ref>DownloadCounterPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,69 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib 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-jsptaglibrary_2_0.xsd"
+  version="2.0">
+   <tlib-version>1.1</tlib-version>
+   <short-name>JBoss-Portal-tags</short-name>
 
-<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.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>
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
-   <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -73,84 +29,53 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
-   <tag>
 
-      <name>defineObjects</name>
-      <tag-class>org.jboss.portal.portlet.taglib.DefineObjectsTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.DefineObjectsTagTEI</tei-class>
-      <body-content>empty</body-content>
-
-   </tag>
    <tag>
-
-      <name>namespace</name>
-      <tag-class>org.jboss.portal.portlet.taglib.NamespaceTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
-      <name>renderURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.RenderURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+      <name>error</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
-         <name>portletMode</name>
+         <name>key</name>
+         <required>true</required>
          <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>errors</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
+   </tag>
 
-      <name>actionURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.ActionURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+   <tag>
+      <name>success</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
       <body-content>JSP</body-content>
+   </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
 
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-   </tag>
-
 </taglib>

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/freezone-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/freezone-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/freezone-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-        <instance-name>PrjFreezonePortletInstance</instance-name>
-        <component-ref>prj-freezone.PrjFreezonePortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-        <instance-name>FreezoneDefaultPagePortletInstance</instance-name>
-        <component-ref>prj-freezone.PrjFreezonePortlet</component-ref>
-	<preferences>
-		<preference>
- 	            <name>page</name>
- 	            <value>default/members/default/freezone/welcome.html</value>
-		</preference>
-	</preferences>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-        <instance-name>FreezoneRightPanelPortletInstance</instance-name>
-        <component-ref>prj-freezone.PrjFreezonePortlet</component-ref>
-	<preferences>
-		<preference>
- 	            <name>page</name>
- 	            <value>default/members/default/freezone/rightPanelContent.html</value>
-		</preference>
-	</preferences>
-      </instance>
-   </deployment>
-   <deployment>
-	   <if-exists>overwrite</if-exists>
-	   <instance>
-		   <instance-name>FreezoneMostDownloadedPortletInstance</instance-name>
-		   <component-ref>prj-freezone.PrjFreezonePortlet</component-ref>
-		   <preferences>
-			   <preference>
-				   <name>page</name>
-				   <value>default/members/default/freezone/mostdownloaded.html</value>
-			   </preference>
-		   </preferences>
-	   </instance>
-   </deployment>
-</deployments>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/freezone-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/freezone-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+        <instance-id>PrjFreezonePortletInstance</instance-id>
+        <portlet-ref>PrjFreezonePortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+        <instance-id>FreezoneDefaultPagePortletInstance</instance-id>
+        <portlet-ref>PrjFreezonePortlet</portlet-ref>
+	<preferences>
+		<preference>
+ 	            <name>page</name>
+ 	            <value>default/members/default/freezone/welcome.html</value>
+		</preference>
+	</preferences>
+      </instance>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+        <instance-id>FreezoneRightPanelPortletInstance</instance-id>
+        <portlet-ref>PrjFreezonePortlet</portlet-ref>
+	<preferences>
+		<preference>
+ 	            <name>page</name>
+ 	            <value>default/members/default/freezone/rightPanelContent.html</value>
+		</preference>
+	</preferences>
+      </instance>
+   </deployment>
+   <deployment>
+	   <if-exists>overwrite</if-exists>
+	   <instance>
+		   <instance-id>FreezoneMostDownloadedPortletInstance</instance-id>
+		   <portlet-ref>PrjFreezonePortlet</portlet-ref>
+		   <preferences>
+			   <preference>
+				   <name>page</name>
+				   <value>default/members/default/freezone/mostdownloaded.html</value>
+			   </preference>
+		   </preferences>
+	   </instance>
+   </deployment>
+</deployments>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -46,20 +46,20 @@
 
 	<!-- Deploying new packages -->
 
-	<ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
+<!--	<ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
 	    <ant:fileset dir="target">
 		<ant:filename name="kosmos*/**" />
 	    </ant:fileset>
-	</ant:copy>
+	</ant:copy>-->
 
 	<!-- Deleting log4j jars to avoid classloader issues -->
 
-	<ant:delete file="../${forge.sar.dir}/target/kosmos-server.war/WEB-INF/lib/log4j-1.2.8.jar" />
+<!--	<ant:delete file="../${forge.sar.dir}/target/kosmos-server.war/WEB-INF/lib/log4j-1.2.8.jar" />
 	<ant:delete file="../${forge.sar.dir}/target/kosmos-portlet.war/WEB-INF/lib/log4j-1.2.8.jar" />
 
 	<ant:copy todir="${local.deploy.dir}"
               file="${maven.repo.local}/com.lowagie/jars/itext-1.4.jar"
-	      overwrite="true" />
+	      overwrite="true" />-->
 
     </goal>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-links/forge-links.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-links/forge-links.iml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-links/forge-links.iml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -10,10 +10,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jboss" level="application" />
+    <orderEntry type="library" name="portal" level="application" />
     <orderEntry type="module" module-name="forge-common" />
+    <orderEntry type="module" module-name="shotoku-base" />
     <orderEntry type="module" module-name="shotoku-aop" />
-    <orderEntry type="module" module-name="shotoku-base" />
-    <orderEntry type="library" name="portal" level="application" />
     <orderEntryProperties />
   </component>
 </module>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -4,13 +4,6 @@
   See terms of license at gnu.org. 
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-
-	<goal name="prj-install">
-<!--		<ant:copy todir="${local.deploy.dir}" overwrite="true">
-				<ant:fileset dir="to-copy" excludes="portal-login-ds.xml.sample" />
-		</ant:copy>-->
-	</goal>
-	
     <goal name="all">
     	<attainGoal name="build" />
     	<attainGoal name="deploy" />
@@ -21,15 +14,15 @@
     </goal>
 
     <goal name="build">
-    	<attainGoal name="jar" />
+    	<!--<attainGoal name="jar" />-->
     </goal>
     
     <goal name="deploy">
-		<ant:copy todir="${local.deploy.dir}" flatten="true">
+	<!--<ant:copy todir="${local.deploy.dir}" flatten="true">
 	    	<ant:fileset dir=".">
 				<ant:filename name="target/*.jar" />
 	    	</ant:fileset>
-		</ant:copy>
+	</ant:copy>-->
     </goal> 
     
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -40,13 +40,7 @@
 import javax.transaction.TransactionManager;
 
 import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.portal.core.model.NoSuchUserException;
-import org.jboss.portal.core.model.Role;
-import org.jboss.portal.core.model.User;
-import org.jboss.portal.core.modules.ModuleConstants;
-import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.core.modules.RoleModule;
-import org.jboss.portal.core.modules.UserModule;
+import org.jboss.portal.identity.*;
 import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
 import org.jboss.security.SimpleGroup;
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/portal/core/security/jaas/ForgeHibernateLoginModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/portal/core/security/jaas/ForgeHibernateLoginModule.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/portal/core/security/jaas/ForgeHibernateLoginModule.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -20,8 +20,7 @@
 import javax.transaction.TransactionManager;
 
 import org.jboss.portal.core.modules.*;
-import org.jboss.portal.core.model.Role;
-import org.jboss.portal.core.model.User;
+import org.jboss.portal.identity.*;
 import org.jboss.portal.core.portlet.user.UserPortletConstants;
 
 import javax.sql.DataSource;

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/login-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/login-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/login-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>LoginInstance</instance-name>
-         <component-ref>forgeLogin.Login</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/login-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/login-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>LoginInstance</instance-id>
+         <portlet-ref>Login</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/map-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/map-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/map-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>MapPortletInstance</instance-name>
-         <component-ref>map.MapPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/map-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/map-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>MapPortletInstance</instance-id>
+         <portlet-ref>MapPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-map/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/project.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/project.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -35,6 +35,12 @@
             </dependency>
 	    <dependency>
                 <groupId>jboss</groupId>
+                <artifactId>portal-theme-lib</artifactId>
+                <version>1.0</version>
+                <jar>portal-theme-lib.jar</jar>
+            </dependency>
+	    <dependency>
+                <groupId>jboss</groupId>
                 <artifactId>jboss-system</artifactId>
                 <version>1.0</version>
                 <jar>jboss-system.jar</jar>

Added: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,313 @@
+package org.jboss.labs.mapper;
+
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.command.mapper.AbstractCommandFactory;
+import org.jboss.portal.core.command.mapper.CommandFactory;
+import org.jboss.portal.core.command.ControllerCommand;
+import org.jboss.portal.core.command.InvokeWindowActionCommand;
+import org.jboss.portal.core.command.RenderPageCommand;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.PortletRequestDecoder;
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.tools.Tools;
+import org.jboss.forge.common.projects.ProjectsHelper;
+import org.jboss.forge.common.projects.Projects;
+import org.jboss.forge.common.Constants;
+import org.jboss.forge.common.ForgeHelper;
+
+import java.io.IOException;
+
+/**
+ * Command factory for labs. Uses following rules for URLs:
+ * - / -> default page
+ * - /projectId/pageName -> sets projectId as the selected project, goes to
+ *   page pageName
+ * - /projectId/otherPath -> sets projectId as the selected project, invokes
+ *   freezone with otherPath
+ * - /pageName -> goes to page pageName
+ * - /otherPath -> invokes freezone with otherPath
+ *
+ * Currently, this supports only 1 portal (as set in
+ * org.jboss.forge.common.Constants).
+ *
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class LabsCommandFactory extends AbstractCommandFactory {
+    private PortalObjectContainer container;
+    private CommandFactory nextFactory;
+    private ContentManager cm;
+
+    /*
+     * Getters and setters.
+     */
+
+    public PortalObjectContainer getContainer() {
+        return container;
+    }
+
+    public void setContainer(PortalObjectContainer container) {
+        this.container = container;
+    }
+
+    public CommandFactory getNextFactory() {
+        return nextFactory;
+    }
+
+    public void setNextFactory(CommandFactory nextFactory) {
+        this.nextFactory = nextFactory;
+    }
+
+    /*
+     * Helper methods.
+     */
+
+    private void setParamIfNotNull(Parameters params, String name, String value) {
+        if (value != null) {
+            params.setValue(name, value);
+        }
+    }
+
+    /**
+     * Gets a command to render a page with the given name.
+     */
+    private ControllerCommand getPageCommand(ServerInvocation invocation, String name) {
+        Page p = container.getContext().getDefaultPortal().getPage(name);
+
+        if (p == null) {
+            return null;
+        }
+
+        if ("wiki".equals(name)) {
+            /* TODO remove
+            System.out.println("WIKI PAGE! " + getParameter(invocation, "page"));*/
+
+            Parameters params = new Parameters();
+            setParamIfNotNull(params, "page", getParameter(invocation, "page"));
+            setParamIfNotNull(params, "language", getParameter(invocation, "language"));
+
+            return new InvokeWindowActionCommand("default.wiki.WikiPortletWindow", null,
+                    null, null, null, params);
+        }
+
+        return new RenderPageCommand(p.getId());
+    }
+
+    /**
+     * Gets path to the resource definied by the given parameters in the CMS.
+     */
+    private String getCmsPath(String portalName, String projectId, String path) {
+        /*
+           * If the requested path references a project, getting the page from
+           * the project's freezone dir. Otherwise, getting the page from the
+           * default directory.
+           */
+        String cmsPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR + "/" +
+                projectId + "/" + ProjectsHelper.FREEZONE_DIR + "/" + path;
+
+        /*
+           * Checking if we don't have to add a default page to the constructed
+           * path.
+           */
+        if (!cmsPath.contains(".")) {
+            if (!cmsPath.endsWith("/"))
+                cmsPath += "/";
+
+            cmsPath += Constants.DEFAULT_FREEZONE_PAGE;
+        }
+
+        return cmsPath;
+    }
+
+    /**
+     * Gets a request attribute of the given name.
+     */
+    private String getParameter(ServerInvocation invocation, String name) {
+        return invocation.getRequest().getContext().getClientRequest().getParameter(name);
+    }
+
+    /**
+     * Sets an attribute of the given  and value both in session and request.
+     */
+    private void setAttribute(ServerInvocation invocation, String name, String value) {
+        invocation.getRequest().getContext().getClientRequest().setAttribute(name, value);
+        invocation.getRequest().getContext().getClientRequest().getSession().setAttribute(name, value);
+    }
+
+    /**
+     * Sets the response to be a redirect to the given location/
+     */
+    private void sendRedirect(ServerInvocation invocation, String where) throws IOException {
+        invocation.getResponse().getContext().getClientResponse().sendRedirect(where);
+    }
+
+    /**
+     * Gets the appropriate command basing on the given path and the selected
+     * project. Path must not be empty.
+     */
+    private ControllerCommand getCommand(ServerInvocation invocation, String path,
+                                         String projectId) {
+        String[] tokens = path.split("[/]", 2);
+
+        ControllerCommand c = getPageCommand(invocation, tokens[0]);
+        if (c == null) {
+            /*
+             * No such page. In this case, we have to invoke freezone. There
+             * are two possibilities:
+             * - the requested resource has an appropriate mime type to display
+             *   it (typically text/html) - then we call the freezone portlet.
+             * - the requested resource is of another mime type - in this case,
+             *   we send a redirect to the file-access servlet.
+             */
+            String cmsPath = getCmsPath(ForgeHelper.LABS_PORTAL, projectId, path);
+
+            try {
+                if (!Constants.PAGES_MIME_TYPE.equalsIgnoreCase(cm.getNode(cmsPath).getMimeType())) {
+                    sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath);
+                    return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
+                }
+            } catch (Exception e) {
+                return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
+            }
+
+            setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath);
+
+            return getPageCommand(invocation, Constants.FREEZONE_PAGE);
+        } else {
+            if (tokens.length == 2) {
+                /*
+                     * Setting the rest of the path as an attribute so the portlets
+                     * can use it.
+                     */
+                setAttribute(invocation, Constants.ATTR_REQ_PATH, tokens[1]);
+            }
+
+            return c;
+        }
+    }
+
+    /**
+     * Gets a command that should be executed, given the request path, if no
+     * project is selected.
+     */
+    private ControllerCommand getNormalCommand(ServerInvocation invocation, String path) {
+        if (Tools.isEmpty(path)) {
+            return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
+        }
+
+        return getCommand(invocation, path, Constants.GLOBAL_FREEZONE_PRJ);
+    }
+
+    /**
+     * Gets a command that should be executed, given the request path, if a
+     * project is selected.
+     */
+    private ControllerCommand getProjectCommand(ServerInvocation invocation, String path,
+                                                String projectId, Projects projects)
+            throws IOException {
+        if (Tools.isEmpty(path)) {
+            /*
+             * If the path is empty, we have to show the project's default
+             * page. This can be:
+             * - a normal info page
+             * - a freezone page - in this case we just redirect to a
+             *   freezone
+             * - an outside page - in this case, we redirect to this
+             *   outside page.
+             */
+            String freezonePage = projects.getProjectPageFreezone(projectId);
+            if (!Tools.isEmpty(freezonePage)) {
+                String redirect;
+                if (Tools.isOutsideLink(freezonePage)) {
+                    redirect = freezonePage;
+                } else {
+                    redirect = ProjectsHelper.createFreezonePageLink(
+                            ForgeHelper.LABS_PORTAL, projectId, freezonePage);
+                }
+
+                sendRedirect(invocation, redirect);
+            }
+
+            return getPageCommand(invocation, Constants.DEFAULT_PROJECT_PAGE);
+        }
+
+        return getCommand(invocation, path, projectId);
+    }
+
+    public ControllerCommand doMapping(ServerInvocation invocation, String portalContextPath,
+                                       String portalRequestPath) {
+        // TODO temporary for freezone
+        String projectParam = invocation.getRequest().getContext().getClientRequest()
+                .getParameter(Constants.PROJECT_PARAM);
+        if (projectParam != null) {
+            setAttribute(invocation, Constants.PROJECT_PARAM, projectParam);
+        }
+
+        // Removing unnecessary /.
+        while (portalRequestPath.indexOf("//") != -1) {
+            portalRequestPath = portalRequestPath.replace("//", "/");
+        }
+
+        /*
+         * If this is an action/ nav etc request (in canonical form), path
+         * parsing is not only not appropriate, it is not possible. So passing
+         * it higher.
+         */
+        if (invocation.getRequest().getContext().getParameterMap().get(
+                PortletRequestDecoder.META_PARAMETER) != null) {
+            return nextFactory.doMapping(invocation, portalContextPath, portalRequestPath);
+        }
+
+        /*
+         * If the user just logged in, showing the default page.
+         */
+        if (portalRequestPath.startsWith("/portal")) {
+            portalRequestPath = portalRequestPath.substring(7);
+            try {
+                sendRedirect(invocation, portalRequestPath);
+            } catch (IOException e) {
+                throw new InvocationException(e);
+            }
+            return nextFactory.doMapping(invocation, portalContextPath, portalRequestPath);
+        }
+
+        ControllerCommand c;
+        String[] tokens = portalRequestPath.split("[/]", 3);
+        Projects projects = ProjectsHelper.getProjects(ForgeHelper.LABS_PORTAL);
+        if ((tokens.length > 1) && (projects.projectExists(tokens[1]))) {
+            /*
+             * The user requested a project page (/projectId). It will be
+             * unset, if necessary, in the AttributesFilter.
+             */
+            setAttribute(invocation, Constants.PROJECT_PARAM, tokens[1]);
+
+            try {
+                c = getProjectCommand(invocation, tokens.length > 2 ? tokens[2] : null,
+                        tokens[1], projects);
+            } catch (IOException e) {
+                throw new InvocationException(e);
+            }
+        } else {
+            tokens = portalRequestPath.split("[/]", 2);
+            // The user requested a non-project page - default, portlet page or
+            // global freezone.
+            c = getNormalCommand(invocation, tokens.length > 1 ? tokens[1] : null);
+        }
+
+        return c;
+    }
+
+    /*
+     * Service management methods
+     */
+
+    protected void startService() throws Exception {
+        cm = ContentManager.getContentManager();
+    }
+
+    protected void stopService() throws Exception {
+
+    }
+}

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,439 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., 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.
- */
-package org.jboss.labs.mapper;
-
-import java.io.IOException;
-
-import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.portal.core.command.*;
-import org.jboss.portal.core.command.mapper.AbstractCommandMapper;
-import org.jboss.portal.core.command.mapper.URLParameters;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.invocation.InvocationException;
-import org.jboss.portal.server.invocation.InvocationRuntimeException;
-import org.jboss.portal.server.util.URLInfo;
-import org.jboss.portal.server.util.Parameters;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.tools.Tools;
-import org.jboss.shotoku.aop.Inject;
-
-/**
- * Command mapper for labs. Uses following rules for URLs:
- * - / -> default page
- * - /projectId/pageName -> sets projectId as the selected project, goes to
- *   page pageName
- * - /projectId/otherPath -> sets projectId as the selected project, invokes
- *   freezone with otherPath
- * - /pageName -> goes to page pageName
- * - /otherPath -> invokes freezone with otherPath
- * 
- * Currently, this supports only 1 portal (as set in 
- * org.jboss.forge.common.Constants).
- * 
- * @jmx.mbean
- * @jboss.xmbean
- * 
- * @author Adam Warski (adamw at aster.pl)
- */
-public class LabsCommandMapper extends AbstractCommandMapper {
-    private CommandMapper nextMapper;
-    private PortalObjectContainer container;
-
-    /**
-     * @jmx.managed-attribute
-     */
-    public CommandMapper getNextMapper()
-    {
-        return nextMapper;
-    }
-
-    /**
-     * @jmx.managed-attribute
-     */
-    public void setNextMapper(CommandMapper nextMapper)
-    {
-        this.nextMapper = nextMapper;
-    }
-
-    /**
-     * @jmx.managed-attribute
-     */
-    public PortalObjectContainer getContainer()
-    {
-        return container;
-    }
-
-    /**
-     * @jmx.managed-attribute
-     */
-    public void setContainer(PortalObjectContainer container)
-    {
-        this.container = container;
-    }
-
-    /**
-     * Checks if the given string is empty (null or "").
-     */
-    private boolean isEmpty(String s) {
-        return (s == null) || ("".equals(s));
-    }
-
-    private ContentManager cm;
-
-    private void setParamIfNotNull(Parameters params, String name, String value) {
-        if (value != null) {
-            params.setValue(name, value);
-        }
-    }
-
-    /**
-     * Gets a command to render a page with the given name.
-     */
-    private ControllerCommand getPageCommand(ServerInvocation invocation, String name) throws IOException {
-        Page p = container.getContext().getDefaultPortal().getPage(name);
-
-        if (p == null) {
-            return null;
-        }
-
-        if ("wiki".equals(name)) {
-            /* TODO remove
-            System.out.println("WIKI PAGE! " + getParameter(invocation, "page"));*/
-
-            Parameters params = new Parameters();
-            setParamIfNotNull(params, "page", getParameter(invocation, "page"));
-            setParamIfNotNull(params, "language", getParameter(invocation, "language"));
-
-            return new InvokeWindowActionCommand("default.wiki.WikiPortletWindow", null,
-                    null, params);
-        }
-
-        return new RenderPageCommand(p.getId());
-    }
-
-    /**
-     * Gets path to the resource definied by the given parameters in the CMS.
-     */
-    private String getCmsPath(String portalName, String projectId, String path) {
-        /*
-           * If the requested path references a project, getting the page from
-           * the project's freezone dir. Otherwise, getting the page from the
-           * default directory.
-           */
-        String cmsPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR + "/" +
-                projectId + "/" + ProjectsHelper.FREEZONE_DIR + "/" + path;
-
-        /*
-           * Checking if we don't have to add a default page to the constructed
-           * path.
-           */
-        if (!cmsPath.contains(".")) {
-            if (!cmsPath.endsWith("/"))
-                cmsPath += "/";
-
-            cmsPath += Constants.DEFAULT_FREEZONE_PAGE;
-        }
-
-        return cmsPath;
-    }
-
-    /**
-     * Gets a request attribute of the given name.
-     */
-    private String getParameter(ServerInvocation invocation, String name) {
-        return invocation.getRequest().getContext().getClientRequest().getParameter(name);
-    }
-
-    /**
-     * Sets an attribute of the given  and value both in session and request.
-     */
-    private void setAttribute(ServerInvocation invocation, String name, String value) {
-        invocation.getRequest().getContext().getClientRequest().setAttribute(name, value);
-        invocation.getRequest().getContext().getClientRequest().getSession().setAttribute(name, value);
-    }
-
-    /**
-     * Sets the response to be a redirect to the given location/
-     */
-    private void sendRedirect(ServerInvocation invocation, String where) throws IOException {
-        invocation.getResponse().getContext().getClientResponse().sendRedirect(where);
-    }
-
-    /**
-     * Gets the appropriate command basing on the given path and the selected
-     * project. Path must not be empty.
-     */
-    private ControllerCommand getCommand(ServerInvocation invocation, String path,
-                                         String projectId) throws IOException {
-        String[] tokens = path.split("[/]", 2);
-
-        ControllerCommand c = getPageCommand(invocation, tokens[0]);
-        if (c == null) {
-            /*
-             * No such page. In this case, we have to invoke freezone. There
-             * are two possibilities:
-             * - the requested resource has an appropriate mime type to display
-             *   it (typically text/html) - then we call the freezone portlet.
-             * - the requested resource is of another mime type - in this case,
-             *   we send a redirect to the file-access servlet.
-             */
-            String cmsPath = getCmsPath(ForgeHelper.LABS_PORTAL, projectId, path);
-
-            try {
-                if (!Constants.PAGES_MIME_TYPE.equalsIgnoreCase(cm.getNode(cmsPath).getMimeType())) {
-                    sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath);
-                    return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
-                }
-            } catch (Exception e) {
-                return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
-            }
-
-            setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath);
-
-            return getPageCommand(invocation, Constants.FREEZONE_PAGE);
-        } else {
-            if (tokens.length == 2) {
-                /*
-                     * Setting the rest of the path as an attribute so the portlets
-                     * can use it.
-                     */
-                setAttribute(invocation, Constants.ATTR_REQ_PATH, tokens[1]);
-            }
-
-            return c;
-        }
-    }
-
-    /**
-     * Gets a command that should be executed, given the request path, if no
-     * project is selected.
-     */
-    private ControllerCommand getNormalCommand(ServerInvocation invocation, String path)
-            throws IOException {
-        if (isEmpty(path)) {
-            return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
-        }
-
-        return getCommand(invocation, path, Constants.GLOBAL_FREEZONE_PRJ);
-    }
-
-    /**
-     * Gets a command that should be executed, given the request path, if a
-     * project is selected.
-     */
-    private ControllerCommand getProjectCommand(ServerInvocation invocation, String path,
-                                                String projectId, Projects projects) throws IOException {
-        if (isEmpty(path)) {
-            /*
-             * If the path is empty, we have to show the project's default
-             * page. This can be:
-             * - a normal info page
-             * - a freezone page - in this case we just redirect to a
-             *   freezone
-             * - an outside page - in this case, we redirect to this
-             *   outside page.
-             */
-            String freezonePage = projects.getProjectPageFreezone(projectId);
-            if (!isEmpty(freezonePage)) {
-                String redirect;
-                if (Tools.isOutsideLink(freezonePage)) {
-                    redirect = freezonePage;
-                } else {
-                    redirect = ProjectsHelper.createFreezonePageLink(
-                            ForgeHelper.LABS_PORTAL, projectId, freezonePage);
-                }
-
-                sendRedirect(invocation, redirect);
-            }
-
-            return getPageCommand(invocation, Constants.DEFAULT_PROJECT_PAGE);
-        }
-
-        return getCommand(invocation, path, projectId);
-    }
-
-    @Override
-    public ControllerCommand doMapping(ServerInvocation invocation,
-                                       String portalContextPath, String portalRequestPath)
-            throws InvocationException, InvocationRuntimeException {
-        // TODO temporary for freezone
-        String projectParam = invocation.getRequest().getContext().getClientRequest()
-                .getParameter(Constants.PROJECT_PARAM);
-        if (projectParam != null) {
-            setAttribute(invocation, Constants.PROJECT_PARAM, projectParam);
-        }
-
-
-
-        // Removing unnecessary /.
-        while (portalRequestPath.indexOf("//") != -1) {
-            portalRequestPath = portalRequestPath.replace("//", "/");
-        }
-
-        /*
-         * If this is an action/ nav etc request (in canonical form), path
-         * parsing is not only not appropriate, it is not possible. So passing
-         * it higher.
-         */
-        if ("/index.html".equals(portalRequestPath)) {
-            return nextMapper.doMapping(invocation, portalContextPath, portalRequestPath);
-        }
-
-        /*
-         * If the user just logged in, showing the default page.
-         */
-        if (portalRequestPath.startsWith("/portal")) {
-            portalRequestPath = portalRequestPath.substring(7);
-            try {
-                sendRedirect(invocation, portalRequestPath);
-            } catch (IOException e) {
-                throw new InvocationException(e);
-            }
-            return nextMapper.doMapping(invocation, portalContextPath, portalRequestPath);
-        }
-
-        ControllerCommand c;
-        String[] tokens = portalRequestPath.split("[/]", 3);
-        Projects projects = ProjectsHelper.getProjects(ForgeHelper.LABS_PORTAL);
-        if ((tokens.length > 1) && (projects.projectExists(tokens[1]))) {
-            /*
-             * The user requested a project page (/projectId). It will be
-             * unset, if necessary, in the AttributesFilter.
-             */
-            setAttribute(invocation, Constants.PROJECT_PARAM, tokens[1]);
-
-            try {
-                c = getProjectCommand(invocation, tokens.length > 2 ? tokens[2] : null,
-                        tokens[1], projects);
-            } catch (IOException e) {
-                throw new InvocationException(e);
-            }
-        } else {
-            tokens = portalRequestPath.split("[/]", 2);
-            // The user requested a non-project page - default, portlet page or
-            // global freezone.
-            try {
-                c = getNormalCommand(invocation, tokens.length > 1 ? tokens[1] : null);
-            } catch (IOException e) {
-                throw new InvocationException(e);
-            }
-        }
-
-        return c;
-    }
-
-    @Override
-    public String doMapping(ServerInvocation invocation, ControllerCommand cmd,
-                            URLInfo urlInfo) {
-        return nextMapper.doMapping(invocation, cmd, urlInfo);
-
-        // TODO: fix this sometime in the future ...
-
-        /*
-         * If this is a render page command, we construct the URL ourselves, using
-         * labs-rules: first project id (if a project is selected), then the page
-         * name (this omits portal name).
-         */
-
-        /*String pageHandle = "";
-        boolean passHigher = true;
-
-        if (cmd instanceof RenderPageCommand) {
-            pageHandle = ((RenderPageCommand) cmd).getPageHandle();
-            passHigher = false;
-        } else if (cmd instanceof InvokeWindowActionCommand) {
-            InvokeWindowActionCommand iwacCmd = (InvokeWindowActionCommand) cmd;
-            System.out.println("IWAC: " + iwacCmd.getPage().getName());
-            if ("wiki".equals(iwacCmd.getPage().getName())) {
-                pageHandle = iwacCmd.getPage().getId();
-                passHigher = false;
-            }
-        }
-
-        if (passHigher) {
-            return nextMapper.doMapping(invocation, cmd, urlInfo);
-        }
-
-        StringBuffer buffer = urlInfo.encode(invocation);
-        buffer.append('/');
-
-        String projectId = getAttribute(invocation, Constants.ATTR_PROJECT);
-        if (projectId != null) {
-            buffer.append(projectId);
-            buffer.append('/');
-        }
-
-        /*
-         * Now getting the page name; page handles normally come in form:
-         * <portal name>.<page name>.
-         */
-        /*int dotIndex = pageHandle.indexOf('.');
-        if (dotIndex != -1) {
-            pageHandle = pageHandle.substring(dotIndex + 1);
-        }
-
-        buffer.append(pageHandle);
-
-        String url = buffer.toString();
-        url = invocation.getResponse().getContext().getClientResponse().encodeURL(url);
-
-        /* Building and adding a query string. */
-        /*String toAdd = "";
-        String queryString = invocation.getRequest().getContext().getClientRequest().
-                getQueryString();
-        String[] tokens = (queryString == null ? "" : queryString).split("[&]");
-
-        for (String token : tokens) {
-            if (!token.startsWith("ctrl:")) {
-                // Adding the parameter.
-                if ("".equals(toAdd)) {
-                    // First parameter.
-                    toAdd = "?" + token;
-                } else {
-                    toAdd += "&" + token;
-                }
-            }
-        }
-
-        url += toAdd;
-
-        // TODO remove
-        //System.out.println("REVERSE MAPPING " + url + "; " +
-        //        invocation.getRequest().getContext().getClientRequest().getQueryString());
-        return url;*/
-    }
-
-    @Override
-    protected void startService() throws Exception {
-        cm = ContentManager.getContentManager();
-    }
-
-    @Override
-    protected void stopService() throws Exception {
-
-    }
-}

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/navigation-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/navigation-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/navigation-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>NavigationPortletInstance</instance-name>
-         <component-ref>navigation.NavigationPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/navigation-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/navigation-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>NavigationPortletInstance</instance-id>
+         <portlet-ref>NavigationPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/podcast-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/podcast-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/podcast-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>PodcastPortletInstance</instance-name>
-         <component-ref>podcast.PodcastPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>PodcastPortletInstanceSmall</instance-name>
-         <component-ref>podcast.PodcastPortlet</component-ref>
-	 <preferences>
-		<preference>
- 	            <name>small</name>
- 	            <value>yes</value>
-		</preference>
-	</preferences>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/podcast-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/podcast-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>PodcastPortletInstance</instance-id>
+         <portlet-ref>PodcastPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>PodcastPortletInstanceSmall</instance-id>
+         <portlet-ref>PodcastPortlet</portlet-ref>
+	 <preferences>
+		<preference>
+ 	            <name>small</name>
+ 	            <value>yes</value>
+		</preference>
+	</preferences>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,43 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -47,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -57,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -67,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/prj-downloads-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/prj-downloads-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>PrjDownloadsPortletInstance</instance-id>
+         <portlet-ref>PrjDownloadsPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/prj-downloads-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/prj-downloads-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/prj-downloads-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>PrjDownloadsPortletInstance</instance-name>
-         <component-ref>prj-downloads.PrjDownloadsPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-downloads/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/prj-info-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/prj-info-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>PrjInfoPortletInstance</instance-id>
+         <portlet-ref>PrjInfoPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/prj-info-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/prj-info-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/prj-info-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>PrjInfoPortletInstance</instance-name>
-         <component-ref>prj-info.PrjInfoPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,43 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -47,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -57,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -67,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-speller/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-speller/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-speller/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,69 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib 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-jsptaglibrary_2_0.xsd"
+  version="2.0">
+   <tlib-version>1.1</tlib-version>
+   <short-name>JBoss-Portal-tags</short-name>
 
-<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.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>
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
-   <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -73,84 +29,53 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
-   <tag>
 
-      <name>defineObjects</name>
-      <tag-class>org.jboss.portal.portlet.taglib.DefineObjectsTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.DefineObjectsTagTEI</tei-class>
-      <body-content>empty</body-content>
-
-   </tag>
    <tag>
-
-      <name>namespace</name>
-      <tag-class>org.jboss.portal.portlet.taglib.NamespaceTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
-      <name>renderURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.RenderURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+      <name>error</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
-         <name>portletMode</name>
+         <name>key</name>
+         <required>true</required>
          <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>errors</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
+   </tag>
 
-      <name>actionURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.ActionURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+   <tag>
+      <name>success</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
       <body-content>JSP</body-content>
+   </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
 
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-   </tag>
-
 </taglib>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/status-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/status-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>StatusPortletInstance</instance-id>
+         <portlet-ref>StatusPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/status-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/status-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/status-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>StatusPortletInstance</instance-name>
-         <component-ref>status.StatusPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,43 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -47,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -57,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -67,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -3,7 +3,7 @@
 import javax.management.MalformedObjectNameException;
 
 import org.jboss.forge.common.soa.LabsServices;
-import org.jboss.portal.core.model.User;
+import org.jboss.portal.identity.User;
 
 public class TagMeTools {
 

Added: labs/jbosslabs/trunk/portal-extensions/forge-theme/forge-theme.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/forge-theme.iml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/forge-theme.iml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="forge-common" />
+    <orderEntry type="library" name="jboss" level="application" />
+    <orderEntry type="library" name="portal" level="application" />
+    <orderEntry type="library" name="portlet" level="application" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -17,20 +17,20 @@
 	</goal>
 
 	<goal name="build">
-	    <attainGoal name="jar" />
+	    <!--<attainGoal name="jar" />
 	    
 	    <ant:copy todir="jbossForgeLayout.war/WEB-INF/lib" overwrite="true">
 			<ant:fileset dir="target">
 				<ant:include name="*.jar" />
 			</ant:fileset>
-		</ant:copy>
+		</ant:copy>-->
 	</goal>
     
 	<goal name="deploy">
-		<ant:copy todir="${local.deploy.dir}" overwrite="true">
+<!--		<ant:copy todir="${local.deploy.dir}" overwrite="true">
 			<ant:fileset dir=".">
 				<ant:include name="jbossForgeLayout.war/**" />
 			</ant:fileset>
-		</ant:copy>
+		</ant:copy>-->
 	</goal>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -14,85 +14,83 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.portal.theme.ThemeException;
-import org.jboss.portal.theme.page.PortletContext;
 import org.jboss.portal.theme.page.WindowResult;
+import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.render.DecorationRenderer;
 import org.jboss.portal.theme.render.RenderContext;
 import org.jboss.portal.theme.render.RenderException;
 
+import javax.portlet.PortletContext;
+
 /**
  * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
  * 
  */
 public class JBFDecorationRenderer implements DecorationRenderer {
 
-	private static final Object SHOW_DECORATION_PORPERTY = "decorationVisible";
+    private static final Object SHOW_DECORATION_PORPERTY = "decorationVisible";
 
-	private static Logger log = Logger.getLogger(JBFDecorationRenderer.class);
+    private static Logger log = Logger.getLogger(JBFDecorationRenderer.class);
 
-	/**
-	 * @see org.jboss.portal.theme.render.Renderer#renderStart
-	 */
-	public void renderStart(RenderContext ctx) {
-	}
+    /**
+     * @see org.jboss.portal.theme.render.Renderer#renderStart
+     */
+    public void renderStart(RenderContext ctx) {
+    }
 
-	/**
-	 * @see org.jboss.portal.theme.render.Renderer#renderEnd
-	 */
-	public void renderEnd(RenderContext ctx) {
-	}
+    /**
+     * @see org.jboss.portal.theme.render.Renderer#renderEnd
+     */
+    public void renderEnd(RenderContext ctx) {
+    }
 
-	/**
-	 * @see DecorationRenderer#render
-	 */
-	public void render(RenderContext renderContext,
-			PortletContext portletContext, WindowResult result)
-			throws RenderException {
-		
-		if (result.getWindowProperties().get(SHOW_DECORATION_PORPERTY) != null
-				&& result.getWindowProperties().get(
-						SHOW_DECORATION_PORPERTY).equals("true")) {
-			log.debug("decorate " + result.getTitle());
+    public void render(RenderContext renderContext, WindowContext windowContext,
+                       WindowResult result) throws RenderException {
 
-			//StringBuffer markup = renderContext.getMarkupFragment();
-			//markup.append("<tr><td class=\"portlet-titlebar-left\"></td>");
-			//markup.append("<td class=\"portlet-titlebar-center\">");
-			// renderTitle(renderContext, result);
-			//markup.append("<div class=\"portlet-mode-container\">");
-			renderModeAndStateLinks(renderContext, result, "mode", portletContext);
-			renderModeAndStateLinks(renderContext, result, "windowstate", portletContext);
+        if (result.getWindowProperties().get(SHOW_DECORATION_PORPERTY) != null
+                && result.getWindowProperties().get(
+                SHOW_DECORATION_PORPERTY).equals("true")) {
+            log.debug("decorate " + result.getTitle());
 
-			//markup
-			//		.append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>");
+            //StringBuffer markup = renderContext.getMarkupFragment();
+            //markup.append("<tr><td class=\"portlet-titlebar-left\"></td>");
+            //markup.append("<td class=\"portlet-titlebar-center\">");
+            // renderTitle(renderContext, result);
+            //markup.append("<div class=\"portlet-mode-container\">");
+            renderModeAndStateLinks(renderContext, result, "mode", windowContext);
+            renderModeAndStateLinks(renderContext, result, "windowstate", windowContext);
 
-			log.debug("decoration is done");
-		}
-	}
+            //markup
+            //		.append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>");
 
-	private static void renderTitle(RenderContext ctx, WindowResult result) {
-		ctx.getMarkupFragment().append(
-				"<div class=\"portlet-titlebar-decoration\">");
-		ctx.getMarkupFragment().append(
-				"<span  class=\"portlet-titlebar-title\">");
-		ctx.getMarkupFragment().append(result.getTitle());
-		ctx.getMarkupFragment().append("</span></div>");
-	}
+            log.debug("decoration is done");
+        }
+    }
 
-	private static void renderModeAndStateLinks(RenderContext ctx,
-			WindowResult result, String selector, PortletContext portletContext) {
-		log.debug("render modes and states");
-		Collection modes = result.getTriggerableActions(selector);
-		for (Iterator i = modes.iterator(); i.hasNext();) {
-			WindowResult.Action action = (WindowResult.Action) i.next();
-			
-			if (action.isEnabled()) {
-				log.debug("action is enabled: " + action.getName());
-				ctx.getMarkupFragment().append("<a class=\"portlet-mode-")
-						.append(action.getName());
-				ctx.getMarkupFragment().append("\" href=\"")
-						.append(action.getURL()).append("\">").append(
-								action.getName()).append("</a> ");
-			}
-		}
-	}
+    private static void renderTitle(RenderContext ctx, WindowResult result) {
+        ctx.getMarkupFragment().append(
+                "<div class=\"portlet-titlebar-decoration\">");
+        ctx.getMarkupFragment().append(
+                "<span  class=\"portlet-titlebar-title\">");
+        ctx.getMarkupFragment().append(result.getTitle());
+        ctx.getMarkupFragment().append("</span></div>");
+    }
+
+    private static void renderModeAndStateLinks(RenderContext ctx,
+                                                WindowResult result, String selector, WindowContext portletContext) {
+        log.debug("render modes and states");
+        Collection modes = result.getTriggerableActions(selector);
+        for (Iterator i = modes.iterator(); i.hasNext();) {
+            WindowResult.Action action = (WindowResult.Action) i.next();
+
+            if (action.isEnabled()) {
+                log.debug("action is enabled: " + action.getName());
+                ctx.getMarkupFragment().append("<a class=\"portlet-mode-")
+                        .append(action.getName());
+                ctx.getMarkupFragment().append("\" href=\"")
+                        .append(action.getURL()).append("\">").append(
+                        action.getName()).append("</a> ");
+            }
+        }
+    }
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -9,12 +9,14 @@
 
 package org.jboss.portal.core.theme.render.impl;
 
-import org.jboss.portal.theme.page.PortletContext;
 import org.jboss.portal.theme.page.WindowResult;
+import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.render.PortletRenderer;
 import org.jboss.portal.theme.render.RenderContext;
 import org.jboss.portal.theme.render.RenderException;
 
+import javax.portlet.PortletContext;
+
 /**
  * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
  *
@@ -23,31 +25,30 @@
     implements PortletRenderer
 {
 
-	/**
-	    * @see PortletRenderer#render
-	    */
-	   public void render(RenderContext renderContext, PortletContext state, WindowResult result)
-	      throws RenderException
-	   {
-	      renderStart(renderContext);
-	      renderContext.getMarkupFragment().append(result.getContent());
-	      renderEnd(renderContext);
-	   }
+    /**
+        * @see PortletRenderer#render
+        */
+       public void render(RenderContext renderContext, WindowContext windowContext,
+                       WindowResult result) throws RenderException {
+          renderStart(renderContext);
+          renderContext.getMarkupFragment().append(result.getContent());
+          renderEnd(renderContext);
+       }
 
-	   /**
-	    * @see org.jboss.portal.theme.render.Renderer#renderStart
-	    */
-	   public void renderStart(RenderContext ctx)
-	   {
-	      ctx.getMarkupFragment().append("<tr><td class=\"portlet-content-left\"></td>");
-	      ctx.getMarkupFragment().append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">");
-	   }
+       /**
+        * @see org.jboss.portal.theme.render.Renderer#renderStart
+        */
+       public void renderStart(RenderContext ctx)
+       {
+          ctx.getMarkupFragment().append("<tr><td class=\"portlet-content-left\"></td>");
+          ctx.getMarkupFragment().append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">");
+       }
 
-	   /**
-	    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-	    */
-	   public void renderEnd(RenderContext ctx)
-	   {
-	      ctx.getMarkupFragment().append("</div></td><td class=\"portlet-content-right\"></td></tr>");
-	   }
+       /**
+        * @see org.jboss.portal.theme.render.Renderer#renderEnd
+        */
+       public void renderEnd(RenderContext ctx)
+       {
+          ctx.getMarkupFragment().append("</div></td><td class=\"portlet-content-right\"></td></tr>");
+       }
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -12,7 +12,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.jboss.portal.theme.page.PortletContext;
 import org.jboss.portal.theme.page.Region;
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
@@ -20,6 +19,8 @@
 import org.jboss.portal.theme.render.RenderContext;
 import org.jboss.portal.theme.render.RenderException;
 
+import javax.portlet.PortletContext;
+
 /**
  * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
  *
@@ -27,54 +28,53 @@
 public class JBFRegionRenderer
     implements RegionRenderer
 {
-	 /**
-	    * @see RegionRenderer#render
-	    */
-	   public void render(RenderContext renderContext, Region region, Map portletContexts, Map windowResults) throws RenderException
-	   {
-	      StringBuffer markup = renderContext.getMarkupFragment();
-	      markup.append("<div");
+     /**
+        * @see RegionRenderer#render
+        */
+       public void render(RenderContext renderContext, Region region, Map portletContexts, Map windowResults) throws RenderException
+       {
+          StringBuffer markup = renderContext.getMarkupFragment();
+          markup.append("<div");
 
-	      if (region == null || region.getWindows().size() <=0){
-	         markup.append(" class='empty-region' />");
-	         return;
-	      }else{
-	         if (renderContext.getRegionID() != null){
-	            markup.append(" id='").append(renderContext.getRegionID()).append("'>");
-	         }
-	         else {
-	        	 markup.append(">");
-	         }
-	      }
+          if (region == null || region.getWindows().size() <=0){
+             markup.append(" class='empty-region' />");
+             return;
+          }else{
+             if (renderContext.getRegionID() != null){
+                markup.append(" id='").append(renderContext.getRegionID()).append("'>");
+             }
+             else {
+                 markup.append(">");
+             }
+          }
 
-	      for (Iterator i = region.getWindows().iterator(); i.hasNext();)
-	      {
-	         WindowContext window = (WindowContext)i.next();
-	         PortletContext portletContext = (PortletContext)portletContexts.get(window.getWindowID());
-	         WindowResult result = (WindowResult)windowResults.get(window.getWindowID());
+          for (Iterator i = region.getWindows().iterator(); i.hasNext();)
+          {
+             WindowContext windowContext = (WindowContext)i.next();
+             WindowResult result = (WindowResult) windowResults.get(windowContext.getId());
 
-	         // The result may be null if it has not been added to the page for some reason
-	         if (result != null)
-	         {
-	            renderContext.getWindowRenderer(result).render(renderContext, portletContext, result);
-	         }
-	      }
+             // The result may be null if it has not been added to the page for some reason
+             if (result != null)
+             {
+                renderContext.getWindowRenderer(result).render(renderContext, windowContext, result);
+             }
+          }
 
-	      markup.append("</div>");
-	   }
+          markup.append("</div>");
+       }
 
-	   /**
-	    * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
-	    */
-	   public void renderStart(RenderContext ctx)
-	   {
-	   }
+       /**
+        * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
+        */
+       public void renderStart(RenderContext ctx)
+       {
+       }
 
-	   /**
-	    * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
-	    */
-	   public void renderEnd(RenderContext ctx)
-	   {
-	   }
+       /**
+        * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
+        */
+       public void renderEnd(RenderContext ctx)
+       {
+       }
 
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -31,6 +31,7 @@
 import org.jboss.portal.theme.strategy.StrategyException;
 import org.jboss.portal.theme.strategy.StrategyResponse;
 
+import javax.portlet.PortletContext;
 import java.util.ArrayList;
 import java.util.Iterator;
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -12,8 +12,8 @@
 import org.jboss.logging.Logger;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.theme.ThemeException;
-import org.jboss.portal.theme.page.PortletContext;
 import org.jboss.portal.theme.page.WindowResult;
+import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.render.DecorationRenderer;
 import org.jboss.portal.theme.render.PortletRenderer;
 import org.jboss.portal.theme.render.RenderContext;
@@ -32,7 +32,7 @@
 	 * @see WindowRenderer#render
 	 */
 	public void render(RenderContext renderContext,
-			PortletContext portletContext, WindowResult result)
+			WindowContext windowContext, WindowResult result)
 			throws RenderException {
 		renderStart(renderContext);
 
@@ -41,15 +41,15 @@
 					.getDecorationRenderer(result);
 			if (decorationRenderer != null) {
 				decorationRenderer
-						.render(renderContext, portletContext, result);
+						.render(renderContext, windowContext, result);
 			}
 
-			WindowState windowState = portletContext.getWindowState();
+			WindowState windowState = windowContext.getWindowState();
 			if (!WindowState.MINIMIZED.equals(windowState)) {
 				PortletRenderer portletRenderer = renderContext
 						.getPortletRenderer(result);
 				if (portletRenderer != null) {
-					portletRenderer.render(renderContext, portletContext,
+					portletRenderer.render(renderContext, windowContext,
 							result);
 				}
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/portlet-instances.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="yes"?>
 <instances>
    <instance>
-      <instance-name>TimetrackerPortletInstance</instance-name>
-      <component-ref>TimetrackerPortlet</component-ref>
+      <instance-id>TimetrackerPortletInstance</instance-id>
+      <portlet-ref>TimetrackerPortlet</portlet-ref>
    </instance>
 </instances>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,69 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib 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-jsptaglibrary_2_0.xsd"
+  version="2.0">
+   <tlib-version>1.1</tlib-version>
+   <short-name>JBoss-Portal-tags</short-name>
 
-<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.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>
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
-   <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -73,84 +29,53 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
-   <tag>
 
-      <name>defineObjects</name>
-      <tag-class>org.jboss.portal.portlet.taglib.DefineObjectsTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.DefineObjectsTagTEI</tei-class>
-      <body-content>empty</body-content>
-
-   </tag>
    <tag>
-
-      <name>namespace</name>
-      <tag-class>org.jboss.portal.portlet.taglib.NamespaceTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
-      <name>renderURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.RenderURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+      <name>error</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
-         <name>portletMode</name>
+         <name>key</name>
+         <required>true</required>
          <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>errors</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
+   </tag>
 
-      <name>actionURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.ActionURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+   <tag>
+      <name>success</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
       <body-content>JSP</body-content>
+   </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
 
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-   </tag>
-
 </taglib>

Copied: labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/wiki-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/wiki-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>WikiPortletInstance</instance-id>
+         <portlet-ref>WikiPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/wiki-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/wiki-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/forge-wiki/src/web/WEB-INF/wiki-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>WikiPortletInstance</instance-name>
-         <component-ref>wikiportlet.WikiPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/wiki-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/wiki-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-id>WikiPortletInstance</instance-id>
+         <portlet-ref>WikiPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/wiki-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/wiki-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/wiki-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>WikiPortletInstance</instance-name>
-         <component-ref>wikiportlet.WikiPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -9,14 +9,14 @@
 	-->
 	
 	<goal name="build">
-		<attainGoal name="wiki:build" />
+	<!--	<attainGoal name="wiki:build" />-->
 	</goal>
 
  	<goal name="prj-install">
         </goal>
 	
 	<goal name="deploy">
-		<attainGoal name="wiki:deploy" />
+	<!--	<attainGoal name="wiki:deploy" />-->
 	</goal>
 	
 	<goal name="clean">

Modified: labs/jbosslabs/trunk/portal-extensions/labs.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/labs.iml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/labs.iml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -5,20 +5,22 @@
     <output url="file://$MODULE_DIR$" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/ajax-portal" />
       <excludeFolder url="file://$MODULE_DIR$/binaries" />
       <excludeFolder url="file://$MODULE_DIR$/configuration" />
+      <excludeFolder url="file://$MODULE_DIR$/counters-ejb3" />
       <excludeFolder url="file://$MODULE_DIR$/federation-register" />
       <excludeFolder url="file://$MODULE_DIR$/forge-ads" />
       <excludeFolder url="file://$MODULE_DIR$/forge-blog" />
       <excludeFolder url="file://$MODULE_DIR$/forge-common" />
       <excludeFolder url="file://$MODULE_DIR$/forge-contributor" />
-      <excludeFolder url="file://$MODULE_DIR$/forge-ear" />
       <excludeFolder url="file://$MODULE_DIR$/forge-feeds" />
       <excludeFolder url="file://$MODULE_DIR$/forge-file-access" />
       <excludeFolder url="file://$MODULE_DIR$/forge-forums" />
       <excludeFolder url="file://$MODULE_DIR$/forge-freezone" />
       <excludeFolder url="file://$MODULE_DIR$/forge-jspwiki" />
       <excludeFolder url="file://$MODULE_DIR$/forge-kosmos" />
+      <excludeFolder url="file://$MODULE_DIR$/forge-links" />
       <excludeFolder url="file://$MODULE_DIR$/forge-login" />
       <excludeFolder url="file://$MODULE_DIR$/forge-login-portlet" />
       <excludeFolder url="file://$MODULE_DIR$/forge-map" />
@@ -29,9 +31,11 @@
       <excludeFolder url="file://$MODULE_DIR$/forge-prj-downloads" />
       <excludeFolder url="file://$MODULE_DIR$/forge-prj-info" />
       <excludeFolder url="file://$MODULE_DIR$/forge-root-redirect" />
+      <excludeFolder url="file://$MODULE_DIR$/forge-sar" />
       <excludeFolder url="file://$MODULE_DIR$/forge-service" />
       <excludeFolder url="file://$MODULE_DIR$/forge-speller" />
       <excludeFolder url="file://$MODULE_DIR$/forge-status" />
+      <excludeFolder url="file://$MODULE_DIR$/forge-tagme" />
       <excludeFolder url="file://$MODULE_DIR$/forge-theme" />
       <excludeFolder url="file://$MODULE_DIR$/forge-timetracker" />
       <excludeFolder url="file://$MODULE_DIR$/forge-wiki" />
@@ -44,7 +48,7 @@
       <excludeFolder url="file://$MODULE_DIR$/portal-federation" />
       <excludeFolder url="file://$MODULE_DIR$/primates" />
       <excludeFolder url="file://$MODULE_DIR$/shotoku" />
-      <excludeFolder url="file://$MODULE_DIR$/shotoku-old" />
+      <excludeFolder url="file://$MODULE_DIR$/svn-hooks" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Deleted: labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/polls-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/polls-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/polls-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-        <instance-name>PollsPortletInstance</instance-name>
-        <component-ref>polls.PollsPortlet</component-ref>
-     </instance>
-   </deployment>
-   <deployment>
-     <if-exists>overwrite</if-exists>
-     <instance>
-      <instance-name>PollsPortletInstanceRandom</instance-name>
-      <component-ref>polls.PollsPortlet</component-ref>
-      <preferences>
-		<preference>
- 	            <name>random</name>
- 	            <value>1</value>
-		</preference>
-	</preferences>
-     </instance>
-   </deployment>
-</deployments>

Copied: labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/polls-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/polls-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+        <instance-id>PollsPortletInstance</instance-id>
+        <portlet-ref>PollsPortlet</portlet-ref>
+     </instance>
+   </deployment>
+   <deployment>
+     <if-exists>overwrite</if-exists>
+     <instance>
+      <instance-id>PollsPortletInstanceRandom</instance-id>
+      <portlet-ref>PollsPortlet</portlet-ref>
+      <preferences>
+		<preference>
+ 	            <name>random</name>
+ 	            <value>1</value>
+		</preference>
+	</preferences>
+     </instance>
+   </deployment>
+</deployments>

Modified: labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,25 @@
 <taglib 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 web-jsptaglibrary_2_0.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-  <!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
    <tlib-version>1.1</tlib-version>
-   <jsp-version>2.0</jsp-version>
-   <shortname>JBoss Portal tags</shortname>
-   <info>JBoss Portal tags</info>
+   <short-name>JBoss-Portal-tags</short-name>
 
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
    <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -52,7 +29,8 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
@@ -62,7 +40,8 @@
 
    <tag>
       <name>error</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>key</name>
          <required>true</required>
@@ -72,11 +51,31 @@
 
    <tag>
       <name>errors</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
 
    <tag>
       <name>success</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
+      <body-content>JSP</body-content>
    </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
+
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
+
 </taglib>

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_06-64 ("Apple Computer, Inc.")
-

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -5,518 +5,434 @@
    <mbean
       code="org.jboss.portal.server.config.ServerConfigService"
       name="portal:service=ServerConfig"
-      xmbean-dd="org/jboss/portal/server/config/ServerConfigService.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <attribute name="ConfigLocation">conf/config.xml</attribute>
    </mbean>
 
-   <!-- Jacc policy configuration -->
+   <!-- Portal security services-->
    <mbean
-      code="org.jboss.portal.security.impl.jacc.PortalJaccPolicy"
-      name="jboss.security:service=JaccPolicyProvider"
-      xmbean-dd="org/jboss/portal/security/impl/jacc/PortalJaccPolicy.xml">
-      <attribute name="ExternalPermissionTypes">
-         org.jboss.portal.core.security.PortalObjectPermission,
-         org.jboss.portal.core.security.InstancePermission,
-         org.jboss.portal.core.security.ComponentPermission
-      </attribute>
+      code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
+      name="portal:service=AuthorizationDomainRegistry"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/> 
    </mbean>
-
-   <!-- Security provider -->
-   <!-- todo when the xmbean loading is fixed in JBoss move the xmbean descriptor to a resource file : http://jira.jboss.com/jira/browse/JBAS-2501 -->
    <mbean
-      code="org.jboss.portal.security.impl.jacc.JBossSecurityProviderImpl"
-      name="portal:service=SecurityProvider"
-      xmbean-dd="">
-      <xmbean>
-         <descriptors>
-            <injection id="MBeanServerType" setMethod="setMBeanServer"/>
-            <injection id="ObjectNameType" setMethod="setObjectName"/>
-         </descriptors>
-         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
-            <description>The policy provider MBean name</description>
-            <name>PolicyName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getPolicyAttributeName" setMethod="setPolicyAttributeName">
-            <description>The Policy attribute name on the PolicyName MBean</description>
-            <name>PolicyAttributeName</name>
-            <type>java.lang.String</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getConfig" setMethod="setConfig">
-            <description>The Server Config</description>
-            <name>ConfigName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-        <attribute access="read-write" getMethod="getServerConfig">
-          <description>(no description)</description>
-          <name>ServerConfig</name>
-          <type>org.jboss.portal.server.config.ServerConfig</type>
-          <descriptors>
-            <persistence/>
-          </descriptors>
-        </attribute>
-        <attribute access="read-write" getMethod="getPolicy">
-          <description>(no description)</description>
-          <name>Policy</name>
-          <type>java.security.Policy</type>
-          <descriptors>
-            <persistence/>
-          </descriptors>
-        </attribute>
-        <operation impact="ACTION_INFO">
-          <description>(no description)</description>
-          <name>inService</name>
-          <parameter>
-            <description>(no description)</description>
-            <name>policyContextID</name>
-            <type>java.lang.String</type>
-          </parameter>
-          <return-type>boolean</return-type>
-          <descriptors>
-          </descriptors>
-        </operation>
-        <operation impact="ACTION_INFO">
-          <description>(no description)</description>
-          <name>getPolicyConfiguration</name>
-          <parameter>
-            <description>(no description)</description>
-            <name>policyContextID</name>
-            <type>java.lang.String</type>
-          </parameter>
-          <parameter>
-            <description>(no description)</description>
-            <name>remove</name>
-            <type>boolean</type>
-          </parameter>
-          <return-type>javax.security.jacc.PolicyConfiguration</return-type>
-          <descriptors>
-          </descriptors>
-        </operation>
-         <operation>
-            <name>start</name>
-         </operation>
-         <operation>
-            <name>stop</name>
-         </operation>
-      </xmbean>
-      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
-      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
-      <attribute name="ConfigName">portal:service=ServerConfig</attribute>
+      code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
+      name="portal:service=PortalAuthorizationManagerFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="AuthorizationDomainRegistry"
+         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.security.impl.jacc.PortalPolicyServiceImpl"
-      name="portal:service=PolicyService"
-      xmbean-dd="org/jboss/portal/security/impl/jacc/PortalPolicyServiceImpl.xml">
-      <depends optional-attribute-name="SecurityProvider" proxy-type="attribute">portal:service=SecurityProvider</depends>
+      code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
+      name="portal:service=PortletSecurityService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
-   <mbean
-      code="org.jboss.portal.security.impl.jacc.JaccPortalPolicyConfigurator"
-      name="portal:policy=JaccPortalPolicyConfigurator"
-      xmbean-dd="org/jboss/portal/security/impl/jacc/JaccPortalPolicyConfigurator.xml">
-      <depends optional-attribute-name="JBossSecurityProvider" proxy-type="attribute">portal:service=SecurityProvider</depends>
-      <depends optional-attribute-name="PermissionFactory" proxy-type="attribute">portal:service=PortalPermissionFactory</depends>
-   </mbean>
 
-   <!-- Persistent cache for portal objeccts and instances security stores -->
+   <!-- Portlet state -->
    <mbean
-      code="org.jboss.cache.TreeCache"
-      name="portal:service=TreeCache,type=persistent">
-      <depends>jboss:service=TransactionManager</depends>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-      <!-- Set to REPL_SYNC in clustered mode, otherwise LOCAL -->
-      <attribute name="CacheMode">LOCAL</attribute>
-      <attribute name="ClusterName">portal.security</attribute>
-      <attribute name="FetchStateOnStartup">true</attribute>
-      <attribute name="CacheLoaderClass">org.jboss.portal.core.security.store.HibernateCacheLoader</attribute>
-      <attribute name="CacheLoaderConfig">config.location=conf/hibernate/security/hibernate.cfg.xml</attribute>
-      <attribute name="CacheLoaderShared">true</attribute>
-      <attribute name="CacheLoaderFetchTransientState">false</attribute>
-      <attribute name="CacheLoaderFetchPersistentState">true</attribute>
-      <attribute name="CacheLoaderPreload">/</attribute>
-      <depends>portal:policy=JaccPortalPolicyConfigurator</depends>
+      code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
+      name="portal:service=StateStore,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=Portlet</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
    </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.store.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=persistent"
-      xmbean-dd="org/jboss/portal/security/impl/store/JBossTreeCacheProvider.xml">
-      <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=persistent</depends>
-   </mbean>
 
-   <!-- Transient cache for component security store -->
-   <mbean
-      code="org.jboss.cache.TreeCache"
-      name="portal:service=TreeCache,type=transient">
-      <depends>jboss:service=TransactionManager</depends>
-      <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-      <attribute name="CacheMode">LOCAL</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.store.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=transient"
-      xmbean-dd="org/jboss/portal/security/impl/store/JBossTreeCacheProvider.xml">
-      <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=transient</depends>
-   </mbean>
-
-   <!-- -->
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigServiceImpl"
-      name="portal:policy=PortalPolicyConfigService"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigServiceImpl.xml">
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigStoreImpl"
-      name="portal:policy=PortalPolicyConfigStore,type=PortalObject"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigStoreImpl.xml">
-      <depends optional-attribute-name="ConfigListener" proxy-type="attribute">portal:policy=JaccPortalPolicyConfigurator</depends>
-      <depends optional-attribute-name="CacheProvider" proxy-type="attribute">portal:service=TreeCacheProvider,type=persistent</depends>
-      <depends optional-attribute-name="PortalPolicyConfigService" proxy-type="attribute">portal:policy=PortalPolicyConfigService</depends>
-      <attribute name="PermissionType">portalobject</attribute>
-      <attribute name="Prefix">portalobject</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigStoreImpl"
-      name="portal:policy=PortalPolicyConfigStore,type=Instance"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigStoreImpl.xml">
-      <depends optional-attribute-name="ConfigListener" proxy-type="attribute">portal:policy=JaccPortalPolicyConfigurator</depends>
-      <depends optional-attribute-name="CacheProvider" proxy-type="attribute">portal:service=TreeCacheProvider,type=persistent</depends>
-      <depends optional-attribute-name="PortalPolicyConfigService" proxy-type="attribute">portal:policy=PortalPolicyConfigService</depends>
-      <attribute name="PermissionType">instance</attribute>
-      <attribute name="Prefix">instance</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPolicyConfigStoreImpl"
-      name="portal:policy=PortalPolicyConfigStore,type=Component"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPolicyConfigStoreImpl.xml">
-      <depends optional-attribute-name="ConfigListener" proxy-type="attribute">portal:policy=JaccPortalPolicyConfigurator</depends>
-      <depends optional-attribute-name="CacheProvider" proxy-type="attribute">portal:service=TreeCacheProvider,type=transient</depends>
-      <depends optional-attribute-name="PortalPolicyConfigService" proxy-type="attribute">portal:policy=PortalPolicyConfigService</depends>
-      <attribute name="PermissionType">component</attribute>
-      <attribute name="Prefix">component</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.JBossPortalPermissionFactory"
-      name="portal:service=PortalPermissionFactory"
-      xmbean-dd="org/jboss/portal/security/impl/JBossPortalPermissionFactory.xml">
-      <attribute name="Config">
-         portalobject=org.jboss.portal.core.security.PortalObjectPermission
-         instance=org.jboss.portal.core.security.InstancePermission
-         component=org.jboss.portal.core.security.ComponentPermission
-      </attribute>
-   </mbean>
-
    <!-- Server stack -->
    <mbean
       code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
       name="portal:service=Interceptor,type=Server,name=Transaction"
-      xmbean-dd="org/jboss/portal/core/aspects/server/TransactionInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
       name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
-      xmbean-dd="org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.server.UserInterceptor"
       name="portal:service=Interceptor,type=Server,name=User"
-      xmbean-dd="org/jboss/portal/core/aspects/server/UserInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="UserModule"
+         proxy-type="attribute">portal:service=Module,type=User</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
       name="portal:service=Interceptor,type=Server,name=Locale"
-      xmbean-dd="org/jboss/portal/core/aspects/server/LocaleInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
       name="portal:service=Interceptor,type=Server,name=ContentType"
-      xmbean-dd="org/jboss/portal/server/aspects/server/ContentTypeInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.server.PolicyAssociationInterceptor"
-      name="portal:service=Interceptor,type=Server,name=PolicyAssociation"
-      xmbean-dd="org/jboss/portal/core/aspects/server/PolicyAssociationInterceptor.xml">
-      <depends optional-attribute-name="PolicyService" proxy-type="attribute">portal:service=PolicyService</depends>
+      code="org.jboss.portal.server.aspects.server.NavigationInterceptor"
+      name="portal:service=Interceptor,type=Server,name=Navigation"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.server.SubjectAssociationInterceptor"
-      name="portal:service=Interceptor,type=Server,name=SubjectAssociation"
-      xmbean-dd="org/jboss/portal/core/aspects/server/SubjectAssociationInterceptor.xml">
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
       name="portal:service=InterceptorStack,type=Server"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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=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-element>portal:service=Interceptor,type=Server,name=PolicyAssociation</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Server,name=SubjectAssociation</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Server,name=Navigation</depends-list-element>
       </depends-list>
    </mbean>
 
    <!-- Command stack -->
    <mbean
-      code="org.jboss.portal.core.aspects.controller.NavigationInterceptor"
-      name="portal:service=Interceptor,type=Command,name=Navigation"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/NavigationInterceptor.xml">
+      code="org.jboss.portal.core.aspects.controller.PageNavigationInterceptor"
+      name="portal:service=Interceptor,type=Command,name=PageNavigation"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.controller.PortalNodeInterceptor"
       name="portal:service=Interceptor,type=Command,name=PortalNode"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/PortalNodeInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
       name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.xml">
-      <depends optional-attribute-name="PortalPermissionFactory" proxy-type="attribute">portal:service=PortalPermissionFactory</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.core.aspects.controller.EventBroadcasterInterceptor"
       name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
-      xmbean-dd="org/jboss/portal/core/aspects/controller/EventBroadcasterInterceptor.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
       name="portal:service=InterceptorStack,type=Command"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Command,name=Navigation</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=PageNavigation</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
       </depends-list>
    </mbean>
 
-   <!-- Portlet stack -->
+   <!-- Consumer stack -->
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.ValveInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Valve"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/ValveInterceptor.xml">
+      code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.ContextTrackerInterceptor"
-      name="portal:service=Interceptor,type=Component,name=ContextTracker"
-      xmbean-dd="org/jboss/portal/server/aspects/component/ContextTrackerInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.SecureTransportInterceptor"
-      name="portal:service=Interceptor,type=Component,name=SecureTransport"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/SecureTransportInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.SessionPreDispatchInterceptor"
-      name="portal:service=Interceptor,type=Component,name=SessionPreDispatch"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/SessionPreDispatchInterceptor.xml">
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
+      name="portal:service=InterceptorStack,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</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.server.aspects.component.ContextDispatcherInterceptor"
-      name="portal:service=Interceptor,type=Component,name=ContextDispatcher"
-      xmbean-dd="org/jboss/portal/server/aspects/component/ContextDispatcherInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Valve"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.portlet.aspects.component.SessionPostDispatchInterceptor"
-      name="portal:service=Interceptor,type=Component,name=SessionPostDispatch"
-      xmbean-dd="org/jboss/portal/portlet/aspects/component/SessionPostDispatchInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.bridge.BridgeInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Bridge"
-      xmbean-dd="org/jboss/portal/bridge/BridgeInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.WindowStatesInterceptor"
-      name="portal:service=Interceptor,type=Component,name=WindowStates"
-      xmbean-dd="org/jboss/portal/server/aspects/component/WindowStatesInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.ModesInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Modes"
-      xmbean-dd="org/jboss/portal/server/aspects/component/ModesInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.CacheInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Cache"
-      xmbean-dd="org/jboss/portal/server/aspects/component/CacheInterceptor.xml">
+      code="org.jboss.portal.bridge.BridgeInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Bridge"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.component.NavigationInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Navigation"
-      xmbean-dd="org/jboss/portal/server/aspects/component/NavigationInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=WindowStates"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.component.TransactionInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Transaction"
-      xmbean-dd="org/jboss/portal/core/aspects/component/TransactionInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Modes"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.aspects.component.HeaderInterceptor"
-      name="portal:service=Interceptor,type=Component,name=Header"
-      xmbean-dd="org/jboss/portal/core/aspects/component/HeaderInterceptor.xml">
+      code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
-      name="portal:service=InterceptorStack,type=Component"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
-      <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Valve</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=SecureTransport</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=ContextTracker</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=SessionPreDispatch</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=ContextDispatcher</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=SessionPostDispatch</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Bridge</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=WindowStates</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Modes</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Cache</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Navigation</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Header</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Component,name=Transaction</depends-list-element>
-      </depends-list>
+      code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Transaction"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
-
-   <!-- Theme and layout services -->
    <mbean
-      code="org.jboss.portal.theme.invocation.LayoutInterceptor"
-      name="portal:service=Interceptor,type=Page,name=Layout"
-      xmbean-dd="org/jboss/portal/theme/invocation/LayoutInterceptor.xml">
+      code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Header"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.theme.invocation.ThemeInterceptor"
-      name="portal:service=Interceptor,type=Page,name=Theme"
-      xmbean-dd="org/jboss/portal/theme/invocation/ThemeInterceptor.xml">
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.invocation.RenderSetInterceptor"
-      name="portal:service=Interceptor,type=Page,name=RenderSet"
-      xmbean-dd="org/jboss/portal/theme/invocation/RenderSetInterceptor.xml">
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.invocation.StrategyInterceptor"
-      name="portal:service=Interceptor,type=Page,name=Strategy"
-      xmbean-dd="org/jboss/portal/theme/invocation/StrategyInterceptor.xml">
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
-      name="portal:service=InterceptorStack,type=Page"
-      xmbean-dd="org/jboss/portal/server/impl/invocation/JBossInterceptorStack.xml">
+      name="portal:service=InterceptorStack,type=Producer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Page,name=Layout</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Page,name=Theme</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Page,name=RenderSet</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Page,name=Strategy</depends-list-element>
+         <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=ContextTracker</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=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="org/jboss/portal/theme/impl/ThemeServiceImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.theme.impl.LayoutServiceImpl"
       name="portal:service=LayoutService"
-      xmbean-dd="org/jboss/portal/theme/impl/LayoutServiceImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
       code="org.jboss.portal.theme.impl.page.PageServiceImpl"
       name="portal:service=PageService"
-      xmbean-dd="org/jboss/portal/theme/impl/page/PageServiceImpl.xml">
-      <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
-      <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
-      <depends optional-attribute-name="PageStack" proxy-type="attribute">portal:service=InterceptorStack,type=Page</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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
+      <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.security.impl.store.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=hibernate"
-      xmbean-dd="org/jboss/portal/security/impl/store/JBossTreeCacheProvider.xml">
+      </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>
+      </mbean>
    
    -->
 
    <!-- Session factories -->
    <mbean
-      code="org.jboss.portal.core.hibernate.SessionFactoryBinder"
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
       name="portal:service=Hibernate"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+         <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/UserSessionFactory</attribute>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=globalinstance"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+         <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.core.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=globalportal"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+         <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.common.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>
 
    <!-- Modules -->
    <mbean
-      code="org.jboss.portal.core.impl.user.UserModuleImpl"
+      code="org.jboss.portal.identity.db.UserModuleImpl"
       name="portal:service=Module,type=User"
-      xmbean-dd="org/jboss/portal/core/impl/user/UserModuleImpl.xml">
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate</depends>
-      <attribute name="JNDIName">java:portal/UserModule</attribute>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate</depends>
+      <attribute name="JNDIName">java:/portal/UserModule</attribute>
+      <attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.impl.role.RoleModuleImpl"
+      code="org.jboss.portal.identity.db.RoleModuleImpl"
       name="portal:service=Module,type=Role"
-      xmbean-dd="org/jboss/portal/core/impl/role/RoleModuleImpl.xml">
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate</depends>
-      <attribute name="JNDIName">java:portal/RoleModule</attribute>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate</depends>
+      <attribute name="JNDIName">java:/portal/RoleModule</attribute>
+      <attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
    </mbean>
-   <!--
-      <mbean
-         code="org.jboss.portal.core.impl.security.SecurityModuleImpl"
-         name="portal:service=Module,type=Security"
-         xmbean-dd="org/jboss/portal/core/impl/security/SecurityModuleImpl.xml">
-         <depends>portal:service=Hibernate</depends>
-         <depends optional-attribute-name="Tree" proxy-type="attribute">portal:service=Tree</depends>
-         <attribute name="JNDIName">java:portal/SecurityModule</attribute>
-      </mbean>
-   -->
    <mbean
       code="org.jboss.portal.core.impl.mail.MailModuleImpl"
       name="portal:service=Module,type=Mail"
-      xmbean-dd="org/jboss/portal/core/impl/mail/MailModuleImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <depends>jboss:service=Mail</depends>
       <depends>portal:service=Module,type=User</depends>
       <attribute name="QueueCapacity">-1</attribute>
@@ -538,24 +454,32 @@
 
    <!-- Registries -->
    <mbean
-      code="org.jboss.portal.server.impl.app.JBossWebAppRegistryImpl"
+      code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
       name="portal:service=WebAppRegistry"
-      xmbean-dd="org/jboss/portal/server/impl/app/JBossWebAppRegistryImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
 
    <!-- Listener registry -->
    <mbean
       code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
       name="portal:service=ListenerRegistry"
-      xmbean-dd="org/jboss/portal/core/event/PortalEventListenerRegistryImpl.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
 
    <!-- A sample listener -->
    <mbean
       code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
       name="portal:service=ListenerService,type=test_listener"
-      xmbean-dd="org/jboss/portal/core/event/PortalEventListenerServiceImpl.xml">
-      <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
@@ -563,64 +487,215 @@
    <!-- The different containers -->
    <mbean
       code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
-      name="portal:container=Instance,type=global"
-      xmbean-dd="org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.xml">
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate,type=globalinstance</depends>
+      name="portal:container=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=Hibernate,type=Instance</depends>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Instance</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>
    </mbean>
    <mbean
       code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
-      name="portal:container=PortalObject,type=global"
-      xmbean-dd="org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.xml">
-      <depends optional-attribute-name="PortalEventListenerRegistry" proxy-type="attribute">portal:service=ListenerRegistry</depends>
-      <depends optional-attribute-name="HibernateProvider" proxy-type="attribute">portal:service=Hibernate,type=globalportal</depends>
+      name="portal:container=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="PortalEventListenerRegistry"
+         proxy-type="attribute">portal:service=ListenerRegistry</depends>
+      <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
    </mbean>
 
-   <!-- Define the command mappers -->
+   <!-- Command factories -->
    <mbean
-      code="org.jboss.portal.core.command.mapper.CanonicalCommandMapper"
-      name="portal:mapper=Canonical"
-      xmbean-dd="org/jboss/portal/core/command/mapper/CanonicalCommandMapper.xml">
+      code="org.jboss.portal.core.command.mapper.DelegatingCommandFactoryService"
+      name="portal:commandFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.command.mapper.PrefixDelegatingCommandMapperService"
-      name="portal:mapper=PrefixDelegating"
-      xmbean-dd="org/jboss/portal/core/command/mapper/PrefixDelegatingCommandMapperService.xml">
-      <depends optional-attribute-name="NextMapper" proxy-type="attribute">portal:mapper=Canonical</depends>
+      code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+      name="portal:commandFactory=DefaultPortal"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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.DefaultPortalCommandMapper"
-      name="portal:mapper=DefaultPortal"
-      xmbean-dd="org/jboss/portal/core/model/portal/DefaultPortalCommandMapper.xml">
-      <depends optional-attribute-name="NextMapper" proxy-type="attribute">portal:mapper=PrefixDelegating</depends>
-      <depends optional-attribute-name="Container"
-               proxy-type="attribute">portal:container=PortalObject,type=global</depends>
+      code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+      name="portal:commandFactory=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Container"
+         proxy-type="attribute">portal:container=PortalObject</depends>
    </mbean>
    <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectCommandMapper"
-      name="portal:mapper=PortalObject,type=global"
-      xmbean-dd="org/jboss/portal/core/model/portal/PortalObjectCommandMapper.xml">
+      code="org.jboss.portal.core.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,prefix=portal"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <attribute name="Prefix">portal</attribute>
-      <depends optional-attribute-name="Mapper" proxy-type="attribute">portal:mapper=PrefixDelegating</depends>
-      <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject,type=global</depends>
+      <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>
+
+   <!-- URL factories -->
    <mbean
+      code="org.jboss.portal.core.command.mapper.DelegatingURLFactoryService"
+      name="portal:urlFactory=Delegating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+      name="portal:urlFactory=PortalObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Prefix">portal</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+
+   <!-- The federating portlet invoker -->
+   <mbean
+      code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
+      name="portal:service=PortletInvoker,type=Federating"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Stack"
+         proxy-type="attribute">portal:service=InterceptorStack,type=Producer</depends>
+      <depends
+         optional-attribute-name="Registry"
+         proxy-type="attribute">portal:service=WebAppRegistry</depends>
+   </mbean>
+
+   <!-- The state portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
+      name="portal:service=PortletInvoker,type=Stateful"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+      <depends
+         optional-attribute-name="StateStore"
+         proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
+   </mbean>
+
+   <!-- Register the state portlet invoker on the federating portlet invoker -->
+   <mbean
+      code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
+      name="portal:service=PortletInvokerRegistration,id=local"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Id">local</attribute>
+      <depends
+         optional-attribute-name="PortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
+      <depends
+         optional-attribute-name="FederatingPortletInvoker"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+   </mbean>
+
+   <!-- The instance portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.test.TestPortletInvoker"
+      name="portal:service=PortletInvoker,type=Instance"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Producer"
+         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+      <depends
+         optional-attribute-name="Stack"
+         proxy-type="attribute">portal:service=InterceptorStack,type=Instance</depends>
+   </mbean>
+
+
+   <!-- The core controller -->
+   <mbean
       code="org.jboss.portal.core.CoreController"
       name="portal:controller=Request"
-      xmbean-dd="org/jboss/portal/core/CoreController.xml">
-      <depends optional-attribute-name="PageService" proxy-type="attribute">portal:service=PageService</depends>
-      <depends optional-attribute-name="CommandMapper" proxy-type="attribute">portal:mapper=DefaultPortal</depends>
-      <depends optional-attribute-name="PortletStack" proxy-type="attribute">portal:service=InterceptorStack,type=Component</depends>
-      <depends optional-attribute-name="CommandStack" proxy-type="attribute">portal:service=InterceptorStack,type=Command</depends>
-      <depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
-      <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject,type=global</depends>
-      <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance,type=global</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="CommandStack"
+         proxy-type="attribute">portal:service=InterceptorStack,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>
    </mbean>
 
+   <!-- -->
    <mbean
       code="org.jboss.portal.server.impl.ServerImpl"
       name="portal:service=Server"
-      xmbean-dd="org/jboss/portal/server/impl/ServerImpl.xml">
-      <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends
+         optional-attribute-name="Config"
+         proxy-type="attribute">portal:service=ServerConfig</depends>
    </mbean>
 
    <!-- -->
@@ -628,84 +703,146 @@
       code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
       name="portal:deployer=PortalWebApp">
       <depends>jboss.system:service=MainDeployer</depends>
-      <depends>portal:container=PortalObject,type=global</depends>
-      <depends>portal:container=Instance,type=global</depends>
-      <depends optional-attribute-name="PortalServer" proxy-type="attribute">portal:service=Server</depends>
+      <depends>portal:container=PortalObject</depends>
+      <depends>portal:container=Instance</depends>
+      <depends
+         optional-attribute-name="PortalServer"
+         proxy-type="attribute">portal:service=Server</depends>
    </mbean>
 
-   <!-- Deployment factories -->
+   <!-- Portal object deployment factory -->
+   <!--
+      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
+      
+      <mbean
+      code="org.jboss.portal.core.system.LifecycleInvoker"
+      name="portal:service=Controller,target=ObjectDeploymentFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject,type=global</depends>
-      <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance,type=global</depends>
-      <depends optional-attribute-name="PortalObjectPolicyConfig" proxy-type="attribute">portal:policy=PortalPolicyConfigStore,type=PortalObject</depends>
-      <depends optional-attribute-name="InstancePolicyConfig" proxy-type="attribute">portal:policy=PortalPolicyConfigStore,type=Instance</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
       <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.core.system.LifecycleInvoker"
+      name="portal:service=Controller,target=PortletAppDeploymentFactory"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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">disableCreateInstance</attribute>
+      </mbean>
+   
+   -->
    <mbean
       code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
       name="portal:deploymentFactory=PortletApp"
-      xmbean-dd="org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
+      <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
       <attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
-      <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="ComponentPolicyConfig" proxy-type="attribute">portal:policy=PortalPolicyConfigStore,type=Component</depends>
+      <!-- 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="org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.xml">
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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="org/jboss/portal/server/deployment/WebAppAdapter.xml">
-      <depends>portal:deploymentFactory=Object</depends>
-      <depends>portal:deploymentFactory=PortletApp</depends>
-      <depends>portal:deploymentFactory=Layout</depends>
-      <depends>portal:deploymentFactory=LayoutFeatures</depends>
-      <depends>portal:deploymentFactory=Theme</depends>
-      <depends>portal:service=Module,type=User</depends>
-      <depends>portal:service=Module,type=Role</depends>
-      <depends>portal:service=Module,type=Mail</depends>
-      <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.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>
    </mbean>
-
-   <!--
-      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
-      
-   <mbean
-      code="org.jboss.ha.singleton.HASingletonController"
-      name="portal:service=Controller,target=ObjectDeploymentFactory">
-      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
-      <depends>portal:deploymentFactory=Object</depends>
-      <attribute name="TargetName">portal:deploymentFactory=Object</attribute>
-      <attribute name="TargetStartMethod">registerFactory</attribute>
-      <attribute name="TargetStopMethod">unregisterFactory</attribute>
-   </mbean>
-   
-   -->
 </server>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +1,12 @@
 <properties>
    <!-- When a window has restrictedaccess : show or hide values are permitted -->
-   <entry key="core.render.window_access_denied">hide</entry>
+   <entry key="core.render.window_access_denied">show</entry>
    <!-- When a window is unavailable : show or hide values are permitted -->
-   <entry key="core.render.window_unavailable">hide</entry>
-   <!-- When a window produces an error : show or hide values are permitted -->
-   <entry key="core.render.window_error">hide</entry>
+   <entry key="core.render.window_unavailable">show</entry>
+   <!-- When a window produces an error : show, hide or message_only values are permitted -->
+   <entry key="core.render.window_error">message_only</entry>
+   <!-- When a window produces an internal error : show, hide are permitted -->
+   <entry key="core.render.window_internal_error">show</entry>
    <!-- When a window is not found : show or hide values are permitted -->
-   <entry key="core.render.window_not_found">hide</entry>
+   <entry key="core.render.window_not_found">show</entry>
 </properties>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -79,8 +79,14 @@
                </properties>
             </window>
             <window>
+               <window-name>JSPPortletWindow</window-name>
+               <instance-ref>JSPPortletInstance</instance-ref>
+               <region>left</region>
+               <height>0</height>
+            </window>
+            <window>
                <window-name>DefaultCMSPortletWindow</window-name>
-               <instance-ref>DefaultCMSPortletInstance</instance-ref>
+               <instance-ref>CMSPortletInstance</instance-ref>
                <region>center</region>
                <height>0</height>
             </window>
@@ -88,28 +94,29 @@
                <window-name>UserPortletWindow</window-name>
                <instance-ref>UserPortletInstance</instance-ref>
                <region>left</region>
-               <height>0</height>
+               <height>1</height>
             </window>
             <window>
                <window-name>CatalogPortletWindow</window-name>
                <instance-ref>CatalogPortletInstance</instance-ref>
                <region>left</region>
-               <height>1</height>
-            </window>
-            <window>
-               <window-name>ThemeSelectorWindow</window-name>
-               <instance-ref>ThemeSelectorInstance</instance-ref>
-               <region>left</region>
                <height>2</height>
             </window>
          </page>
+         <security-constraint>
+            <policy-permission>
+               <unchecked/>
+               <action-name>view</action-name>
+               <action-name>personalizerecursive</action-name>
+            </policy-permission>
+         </security-constraint>
       </portal>
    </deployment>
    <deployment>
       <if-exists>keep</if-exists>
       <parent-ref>default</parent-ref>
       <page>
-         <page-name>CMS Manager</page-name>
+         <page-name>News</page-name>
          <window>
             <window-name>NavigationPortletWindow</window-name>
             <instance-ref>NavigationPortletInstance</instance-ref>
@@ -135,36 +142,36 @@
             </properties>
          </window>
          <window>
-            <window-name>UserPortletWindow</window-name>
-            <instance-ref>UserPortletInstance</instance-ref>
+            <window-name>WeatherPortletWindow</window-name>
+            <instance-ref>WeatherPortletInstance</instance-ref>
             <region>left</region>
             <height>0</height>
          </window>
          <window>
-            <window-name>CatalogPortletWindow</window-name>
-            <instance-ref>CatalogPortletInstance</instance-ref>
+            <window-name>UserPortletWindow</window-name>
+            <instance-ref>UserPortletInstance</instance-ref>
             <region>left</region>
             <height>1</height>
          </window>
          <window>
-            <window-name>CMSAdminPortletWindow</window-name>
-            <instance-ref>CMSAdminPortletInstance</instance-ref>
+            <window-name>NewsPortletWindow</window-name>
+            <instance-ref>NewsPortletInstance</instance-ref>
             <region>center</region>
             <height>0</height>
          </window>
-         <security-constraint>
-            <policy-permission>
-               <role-name>Admin</role-name>
-               <action-name>view</action-name>
-            </policy-permission>
-         </security-constraint>
+         <window>
+            <window-name>NewsPortletWindow2</window-name>
+            <instance-ref>NewsPortletInstance2</instance-ref>
+            <region>center</region>
+            <height>1</height>
+         </window>
       </page>
    </deployment>
    <deployment>
       <if-exists>keep</if-exists>
       <parent-ref>default</parent-ref>
       <page>
-         <page-name>management</page-name>
+         <page-name>Admin</page-name>
          <window>
             <window-name>NavigationPortletWindow</window-name>
             <instance-ref>NavigationPortletInstance</instance-ref>
@@ -213,169 +220,18 @@
             <region>center</region>
             <height>0</height>
          </window>
-         <security-constraint>
-            <policy-permission>
-               <role-name>Admin</role-name>
-               <action-name>view</action-name>
-            </policy-permission>
-         </security-constraint>
-      </page>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <parent-ref>default.default</parent-ref>
-      <page>
-         <page-name>Secure Policy Config</page-name>
          <window>
-            <window-name>NavigationPortletWindow</window-name>
-            <instance-ref>NavigationPortletInstance</instance-ref>
-            <region>navigation</region>
-            <height>0</height>
-            <!-- keep portal and page properties for this window -->
-            <properties>
-               <!-- use the window renderer from the emptyRenderer renderSet -->
-               <property>
-                  <name>theme.windowRendererId</name>
-                  <value>emptyRenderer</value>
-               </property>
-               <!-- use the decoration renderer from the emptyRenderer renderSet -->
-               <property>
-                  <name>theme.decorationRendererId</name>
-                  <value>emptyRenderer</value>
-               </property>
-               <!-- use the portlet renderer from the emptyRenderer renderSet -->
-               <property>
-                  <name>theme.portletRendererId</name>
-                  <value>emptyRenderer</value>
-               </property>
-            </properties>
-         </window>
-         <window>
-            <window-name>CatalogPortletWindow</window-name>
-            <instance-ref>CatalogPortletInstance</instance-ref>
-            <region>left</region>
-            <height>0</height>
-         </window>
-         <window>
-            <window-name>PolicyConfiguratorWindow</window-name>
-            <instance-ref>PolicyConfiguratorPortletInstance</instance-ref>
+            <window-name>CMSAdminPortletWindow</window-name>
+            <instance-ref>CMSAdminPortletInstance</instance-ref>
             <region>center</region>
-            <height>0</height>
+            <height>1</height>
          </window>
          <security-constraint>
             <policy-permission>
                <role-name>Admin</role-name>
-               <action-name>view</action-name>
+               <action-name>viewrecursive</action-name>
             </policy-permission>
          </security-constraint>
       </page>
    </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <parent-ref>default.CMS Manager</parent-ref>
-      <window>
-         <window-name>CatalogPortletWindow</window-name>
-         <instance-ref>CatalogPortletInstance</instance-ref>
-         <region>left</region>
-         <height>1</height>
-      </window>
-   </deployment>
-
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>PolicyConfiguratorPortletInstance</instance-name>
-         <component-ref>portal.PolicyConfiguratorPortlet</component-ref>
-         <!-- allow access to this instance only to Admins -->
-         <security-constraint>
-            <policy-permission>
-               <role-name>Admin</role-name>
-               <action-name>view</action-name>
-            </policy-permission>
-         </security-constraint>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>DefaultCMSPortletInstance</instance-name>
-         <component-ref>portal.CMSPortlet</component-ref>
-         <preferences>
-            <!-- Indicate that  -->
-            <preference>
-               <name>linkMode</name>
-               <value>cms</value>
-               <read-only>true</read-only>
-            </preference>
-         </preferences>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>CMSAdminPortletInstance</instance-name>
-         <component-ref>portal.CMSAdminPortlet</component-ref>
-         <security-constraint>
-            <policy-permission>
-               <role-name>Admin</role-name>
-               <action-name>view</action-name>
-            </policy-permission>
-         </security-constraint>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>ManagementPortletInstance</instance-name>
-         <component-ref>portal.ManagementPortlet</component-ref>
-         <security-constraint>
-            <policy-permission>
-               <role-name>Admin</role-name>
-               <action-name>view</action-name>
-            </policy-permission>
-         </security-constraint>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>NavigationPortletInstance</instance-name>
-         <component-ref>portal.NavigationPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>UserPortletInstance</instance-name>
-         <component-ref>portal.UserPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>RolePortletInstance</instance-name>
-         <component-ref>portal.RolePortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>CatalogPortletInstance</instance-name>
-         <component-ref>portal.CatalogPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>ThemePortletInstance</instance-name>
-         <component-ref>portal.ThemeManager</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>ThemeSelectorInstance</instance-name>
-         <component-ref>portal.ThemeSelectorPortlet</component-ref>
-      </instance>
-   </deployment>
 </deployments>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,80 +1,135 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
- <hibernate-mapping>
+      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
    <class
-      name="org.jboss.portal.core.impl.model.instance.InstanceImpl"
-      table="JBP_INSTANCE">
+         name="org.jboss.portal.core.impl.model.instance.InstanceImpl"
+         table="JBP_INSTANCE">
       <cache usage="read-write"/>
-      <id name="key" access="field">
-         <column name="PK"/>
+      <id
+            name="key"
+            column="PK"
+            access="field">
          <generator class="native">
             <param name="sequence">instance_seq</param>
          </generator>
       </id>
       <property
-         name="instanceId"
-         not-null="true"
-         unique="true"
-         column="ID"/>
+            name="instanceId"
+            column="ID"
+            not-null="true"
+            unique="true"/>
       <property
-         name="componentRef"
-         not-null="false"
-         unique="false"
-         column="COMPONENT_REF"/>
+            name="portletRef"
+            column="PORTLET_REF"
+            not-null="false"
+            unique="false"/>
+      <property
+            name="modifiable"
+            column="MODIFIABLE"
+            not-null="true"
+            unique="false"/>
+      <property
+            name="state"
+            column="SER_STATE"
+            not-null="false"
+            unique="false"
+            length="50000000"/>
       <map
-         name="preferencesMap"
-         sort="unsorted"
-         inverse="false"
-         cascade="all-delete-orphan"
-         fetch="join">
+            name="securityBindings"
+            sort="unsorted"
+            inverse="true"
+            cascade="none"
+            fetch="join">
          <cache usage="read-write"/>
-         <key column="INSTANCE_KEY"/>
-         <index
-            column="NAME"
-            type="java.lang.String"/>
-         <one-to-many class="org.jboss.portal.core.impl.model.instance.PreferenceImpl"/>
+         <key column="INSTANCE_PK"/>
+         <index column="ROLE" type="string"/>
+         <one-to-many class="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"/>
       </map>
+      <set
+            name="userInstances"
+            inverse="true"
+            cascade="save-update"
+            fetch="select"
+            lazy="extra">
+         <cache usage="read-write"/>
+         <key column="INSTANCE_PK"/>
+         <one-to-many class="org.jboss.portal.core.impl.model.instance.UserInstance"/>
+      </set>
    </class>
+
    <class
-      name="org.jboss.portal.core.impl.model.instance.PreferenceImpl"
-      table="JBP_INSTANCE_PREF">
+         name="org.jboss.portal.core.impl.model.instance.UserInstance"
+         table="JBP_INSTANCE_PER_USER">
       <cache usage="read-write"/>
-       <id
-          name="key"
-          column="PK"
-          type="java.lang.Long">
-          <generator class="native">
-             <param name="sequence">instance_seq</param>
-          </generator>
-       </id>
-       <array
-          name="strings"
-          table="JBP_INSTANCE_PREF_VALUE"
-          cascade="all"
-          fetch="select">
-          <cache usage="read-write"/>
-          <key column="PK"/>
-          <index column="IDX"/>
-          <element
-             column="VALUE"
-             type="java.lang.String"
-             not-null="false"
-             unique="false"/>
-       </array>
-       <property
-          name="name"
-          type="java.lang.String"
-          update="false"
-          insert="true"
-          column="NAME"
-          not-null="false"/>
-       <property
-          name="type"
-          type="int"
-          update="true"
-          insert="true"
-          column="TYPE"/>
+      <id
+            name="key"
+            column="PK"
+            access="field">
+         <generator class="native">
+            <param name="sequence">instance_seq</param>
+         </generator>
+      </id>
+      <many-to-one
+            name="instance"
+            column="INSTANCE_PK"
+            class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
+            cascade="none"
+            fetch="select"/>
+      <property
+            name="state"
+            column="SER_STATE"
+            not-null="false"
+            unique="false"
+            length="50000000"/>
+      <properties
+            name="user_and_portlet_ref"
+            unique="true">
+         <property
+               name="userId"
+               column="USER_ID"
+               not-null="true"
+               length="170"/>
+         <property
+               name="portletRef"
+               column="PORTLET_REF"
+               not-null="true"
+               length="170"/>
+      </properties>
    </class>
-</hibernate-mapping>
+
+   <class
+         name="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"
+         table="JBP_INSTANCE_SECURITY">
+      <cache usage="read-write"/>
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Long">
+         <generator class="native">
+            <param name="sequence">instance_seq</param>
+         </generator>
+      </id>
+      <property
+            name="role"
+            column="ROLE"
+            not-null="true"
+            unique="false"/>
+      <set
+            name="actions"
+            table="JBP_INSTANCE_SECURITY_ACTIONS"
+            cascade="none"
+            fetch="join">
+         <cache usage="read-write"/>
+         <key column="PK"/>
+         <element column="ACTIONS" type="string"/>
+      </set>
+      <many-to-one
+            name="instance"
+            column="INSTANCE_PK"
+            class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
+            cascade="none"
+            fetch="select"/>
+   </class>
+</hibernate-mapping> 

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,15 +1,15 @@
 <ehcache>
 
-    <!-- Sets the path to the directory where cache .data files are created.
+   <!-- Sets the path to the directory where cache .data files are created.
 
-         If the path is a Java System Property it is replaced by
-         its value in the running VM.
+        If the path is a Java System Property it is replaced by
+        its value in the running VM.
 
-         The following properties are translated:
-         user.home - User's home directory
-         user.dir - User's current working directory
-         java.io.tmpdir - Default temp file path -->
-    <diskStore path="java.io.tmpdir/instance"/>
+        The following properties are translated:
+        user.home - User's home directory
+        user.dir - User's current working directory
+        java.io.tmpdir - Default temp file path -->
+   <diskStore path="java.io.tmpdir/instance"/>
 
 
     <!--Default Cache configuration. These will applied to caches programmatically created through

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -8,23 +8,23 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
-      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/instance/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache
          
-      <property name="cache.provider_class">org.jboss.portal.core.hibernate.JMXTreeCacheProvider</property>
-      <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
+         <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         
+      -->
       
-      -->
-
       <!--
          | Comment in clustered mode
          -->
-      <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
-      <!--
+         <property name="cache.provider_configuration_file_resource_path">conf/hibernate/instance/ehcache.xml</property>
+         <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+         <!--
       -->
-
+      
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class
       name="org.jboss.portal.core.impl.model.portal.ObjectNode"
@@ -17,17 +17,14 @@
       </id>
       <property
          name="path"
-         type="org.jboss.portal.core.hibernate.MagicString"
-         not-null="true"
-         unique="true">
-         <column name="PATH"/>
-      </property>
+         column="PATH"
+         type="org.jboss.portal.jems.hibernate.MagicString"
+         not-null="false"
+         unique="true"/>
       <property
          name="name"
-         not-null="true">
-         <column
-            name="NAME"/>
-      </property>
+         column="NAME"
+         not-null="false"/>
       <map
          name="children"
          inverse="true"
@@ -36,24 +33,34 @@
          <cache usage="read-write"/>
          <key column="PARENT_KEY"/>
          <map-key
-            type="org.jboss.portal.core.hibernate.MagicString"
+            type="org.jboss.portal.jems.hibernate.MagicString"
             column="NAME"/>
          <one-to-many class="org.jboss.portal.core.impl.model.portal.ObjectNode"/>
       </map>
       <many-to-one
          name="parent"
+         column="PARENT_KEY"
          not-null="false"
          cascade="none"
-         fetch="select">
-         <column
-            name="PARENT_KEY"/>
-      </many-to-one>
+         fetch="select"/>
       <one-to-one
          name="object"
          class="org.jboss.portal.core.impl.model.portal.PortalObjectImpl"
          cascade="none"
          fetch="select">
       </one-to-one>
+      <map
+         name="securityConstraints"
+         inverse="true"
+         cascade="all-delete-orphan"
+         fetch="join" >
+         <cache usage="read-write"/>
+         <key column="NODE_KEY"/>
+		   <index
+            column="ROLE"
+            type="string"/>
+		   <one-to-many class="org.jboss.portal.core.impl.model.portal.ObjectNodeSecurityConstraint"/>
+      </map>
    </class>
    <class
       name="org.jboss.portal.core.impl.model.portal.PortalObjectImpl"
@@ -72,6 +79,7 @@
          column="LISTENER"/>
       <map
          name="declaredProperties"
+         cascade="all-delete-orphan"
          table="JBP_PORTAL_OBJECT_PROPS"
          fetch="join">
          <cache usage="read-write"/>
@@ -81,7 +89,7 @@
             column="NAME"/>
          <element
             type="string"
-            column="VALUE"
+            column="jbp_VALUE"
             not-null="false"/>
       </map>
       <one-to-one
@@ -102,10 +110,10 @@
          <set
             name="modes"
             table="JBP_PORTAL_MODE"
+            cascade="all-delete-orphan"
             fetch="join">
             <cache usage="read-write"/>
-            <key
-               column="PK"/>
+            <key column="PK"/>
             <element
                column="name"
                type="org.jboss.portal.core.hibernate.ModeUserType"/>
@@ -113,10 +121,10 @@
          <set
             name="windowStates"
             table="JBP_PORTAL_WINDOW_STATE"
+            cascade="all-delete-orphan"
             fetch="join">
             <cache usage="read-write"/>
-            <key
-               column="PK"/>
+            <key column="PK"/>
             <element
                column="name"
                type="org.jboss.portal.core.hibernate.WindowStateUserType"/>
@@ -132,8 +140,41 @@
          table="JBP_WINDOW">
          <key column="PK"/>
          <property
-            name="instanceRef"
-            column="INSTANCE_REF"/>
+         name="instanceRef"
+         column="INSTANCE_REF"/>
       </joined-subclass>
    </class>
- </hibernate-mapping>
+	
+   <class
+      name="org.jboss.portal.core.impl.model.portal.ObjectNodeSecurityConstraint"
+      table="JBP_OBJECT_NODE_SEC">
+      <cache usage="read-write"/> 
+	   <id
+         name="key"
+	      column="PK">
+         <generator class="native">
+            <param name="sequence">sec_seq</param>
+         </generator>
+      </id>
+      <property
+         name="role"
+         column="ROLE"
+         not-null="true"
+         unique="false"/>
+	   <set
+         name="actions"
+         table="JBP_OBJECT_NODE_SEC_ACTIONS"
+         cascade="all-delete-orphan"
+         fetch="join">
+         <cache usage="read-write"/>
+         <key column="PK"/>
+         <element column="ACTIONS" type="string"/>
+      </set>
+      <many-to-one
+         name="objectNode"
+         column="NODE_KEY"
+         class="org.jboss.portal.core.impl.model.portal.ObjectNode"
+         cascade="none"
+         fetch="select"/>
+   </class>
+</hibernate-mapping>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -8,23 +8,23 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
-      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache
          
-      <property name="cache.provider_class">org.jboss.portal.core.hibernate.JMXTreeCacheProvider</property>
-      <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
+         <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         
+      -->
       
-      -->
-
       <!--
          | Comment in clustered mode
          -->
-      <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
-      <!--
+         <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property>
+         <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+         <!--
       -->
-
+      
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ <hibernate-mapping>
+   <class
+      name="org.jboss.portal.core.impl.portlet.state.PersistentState"
+      table="JBP_PORTLET_STATE">
+      <cache usage="read-write"/>
+      <id
+         name="key"
+         column="PK"
+         access="field">
+         <generator class="native">
+            <param name="sequence">portlet_seq</param>
+         </generator>
+      </id>
+      <property
+         name="portletId"
+         column="PORTLET_ID"
+         not-null="true"
+         unique="false"/>
+      <property
+         name="registrationId"
+         column="REGISTRATION_ID"
+         not-null="false"
+         unique="false"/>
+      <property
+         name="creationTime"
+         column="REGISTRATION_TIME"
+         not-null="false"
+         unique="false"/>
+      <property
+         name="terminationTime"
+         column="TERMINATION_TIME"
+         not-null="false"
+         unique="false"/>
+      <map
+         name="entries"
+         sort="unsorted"
+         inverse="false"
+         cascade="all-delete-orphan"
+         fetch="join">
+         <cache usage="read-write"/>
+         <key column="ENTRY_KEY"/>
+         <index
+            column="NAME"
+            type="java.lang.String"/>
+         <one-to-many class="org.jboss.portal.core.impl.portlet.state.PersistentStateEntry"/>
+      </map>
+      <set
+         name="children"
+         inverse="true"
+         cascade="save-update"
+         fetch="select"
+         lazy="extra">
+         <cache usage="read-write"/>
+         <key column="PARENT_PK"/>
+         <one-to-many class="org.jboss.portal.core.impl.portlet.state.PersistentState"/>
+      </set>
+      <many-to-one
+         name="parent"
+         column="PARENT_PK"
+         class="org.jboss.portal.core.impl.portlet.state.PersistentState"
+         cascade="none"
+         fetch="select"/>
+   </class>
+
+   <class
+      name="org.jboss.portal.core.impl.portlet.state.PersistentStateEntry"
+      table="JBP_PORTLET_STATE_ENTRY">
+      <cache usage="read-write"/>
+      <id
+         name="key"
+         column="PK"
+         type="java.lang.Long">
+         <generator class="native">
+            <param name="sequence">portlet_seq</param>
+         </generator>
+      </id>
+      <array
+         name="strings"
+         table="JBP_PORTLET_STATE_ENTRY_VALUE"
+         cascade="all"
+         fetch="join">
+         <cache usage="read-write"/>
+         <key column="PK"/>
+         <index column="IDX"/>
+         <element
+            column="jbp_value"
+            type="java.lang.String"
+            not-null="false"
+            unique="false"/>
+      </array>
+      <property
+         name="name"
+         column="NAME"
+         type="java.lang.String"
+         update="false"
+         insert="true"
+         not-null="false"/>
+      <property
+         name="type"
+         column="TYPE"
+         type="int"
+         not-null="true"
+         unique="false"/>
+      <property
+         name="readOnly"
+         column="READ_ONLY"
+         type="boolean"
+         not-null="true"
+         unique="false"/>
+   </class>
+</hibernate-mapping>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,38 @@
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="java.io.tmpdir/portlet"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="false"
+        />
+</ehcache>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+    "-//Hibernate/Hibernate Configuration DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+   <session-factory>
+      <property name="connection.datasource">java:PortalDS</property>
+      <property name="show_sql">false</property>
+      <property name="cache.use_second_level_cache">true</property>
+      <property name="cache.use_query_cache">true</property>
+
+      <!--
+         | Uncomment in clustered mode : use transactional replicated cache
+         
+         <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
+         <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         
+      -->
+      
+      <!--
+         | Comment in clustered mode
+         -->
+         <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portlet/ehcache.xml</property>
+         <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+         <!--
+      -->
+      
+      <!-- Force the dialect instead of using autodetection -->
+      <!--
+      <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+      -->
+
+      <!-- Mapping files -->
+      <mapping resource="conf/hibernate/portlet/domain.hbm.xml"/>
+   </session-factory>
+</hibernate-configuration>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/domain.hbm.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/domain.hbm.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-   <class
-      name="org.jboss.portal.core.security.store.SecurityPolicy"
-      table="JBP_SECURITY_POLICY">
-      <cache usage="read-write"/>
-      <id
-         name="key"
-         column="PK"
-         type="java.lang.Long">
-          <generator class="native">
-             <param name="sequence">security_seq</param>
-          </generator>
-      </id>
-      <property
-         name="reference"
-         not-null="true"
-         unique="true">
-         <column name="REF"/>
-      </property>
-      <property
-         name="parentReference"
-         not-null="false"
-         unique="false">
-         <column name="PARENTREF"/>
-      </property>
-      <set name="constraints" cascade="all">
-          <key column="POLICY_ID"/>
-          <one-to-many class="org.jboss.portal.core.security.store.HbmSecurityConstraint"/>
-      </set>
-   </class>
-   <class
-      name="org.jboss.portal.core.security.store.HbmSecurityConstraint"
-      table="JBP_SECURITY_CONSTRAINT">
-      <cache usage="read-write"/>
-      <id name="key">
-        <column name="PK"/>
-         <generator class="native">
-            <param name="sequence">security_seq</param>
-         </generator>
-     </id>
-<!--
-      <property
-         name="reference"
-         not-null="false"
-         unique="false">
-         <column name="REFERENCE"/>
-      </property>
--->
-      <property
-         name="role"
-         not-null="false"
-         unique="false">
-         <column name="ROLE"/>
-      </property>
-      <property
-         name="actions"
-         not-null="false"
-         unique="false">
-         <column name="ACTIONS"/>
-      </property>
-   </class>
- </hibernate-mapping>

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,38 +0,0 @@
-<ehcache>
-
-    <!-- Sets the path to the directory where cache .data files are created.
-
-         If the path is a Java System Property it is replaced by
-         its value in the running VM.
-
-         The following properties are translated:
-         user.home - User's home directory
-         user.dir - User's current working directory
-         java.io.tmpdir - Default temp file path -->
-    <diskStore path="java.io.tmpdir/security"/>
-
-
-    <!--Default Cache configuration. These will applied to caches programmatically created through
-        the CacheManager.
-
-        The following attributes are required for defaultCache:
-
-        maxInMemory       - Sets the maximum number of objects that will be created in memory
-        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
-                            is never expired.
-        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
-                            if the element is not eternal. Idle time is now - last accessed time
-        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
-                            if the element is not eternal. TTL is now - creation time
-        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
-                            has reached the maxInMemory limit.
-
-        -->
-    <defaultCache
-        maxElementsInMemory="10000"
-        eternal="false"
-        timeToIdleSeconds="120"
-        timeToLiveSeconds="120"
-        overflowToDisk="false"
-        />
-</ehcache>

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
-   <session-factory>
-      <property name="connection.datasource">java:PortalDS</property>
-      <property name="show_sql">false</property>
-      <property name="cache.use_second_level_cache">false</property>
-      <property name="cache.use_query_cache">false</property>
-      <property name="transaction.auto_close_session">false</property>
-      <property name="transaction.flush_before_completion">false</property>
-      <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
-      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/security/ehcache.xml</property>
-
-      <!-- Force the dialect instead of using autodetection -->
-      <!--
-      <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
-      -->
-
-      <!-- Mapping files -->
-      <mapping resource="conf/hibernate/security/domain.hbm.xml"/>
-   </session-factory>
-</hibernate-configuration>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -4,23 +4,23 @@
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class
-      name="org.jboss.portal.core.impl.user.UserImpl"
+      name="org.jboss.portal.identity.db.UserImpl"
       table="jbp_users">
       <cache usage="read-write"/>
-      <id
-         name="key"
-         column="jbp_uid"
-         type="java.lang.Long">
-         <generator class="native">
-            <param name="sequence">user_seq</param>
-         </generator>
-      </id>
+       <id
+          name="key"
+          column="jbp_uid"
+          type="java.lang.Long">
+          <generator class="native">
+             <param name="sequence">user_seq</param>
+          </generator>
+       </id>
       <property
          name="userName"
+         column="jbp_uname"
          type="java.lang.String"
          update="false"
          insert="true"
-         column="jbp_uname"
          unique="true"/>
        <map
           name="dynamic"
@@ -39,76 +39,61 @@
              not-null="false"
              unique="false"/>
        </map>
-      <!--
-       <map
-          name="prefMap"
-          lazy="false"
-          sort="unsorted"
-          inverse="false"
-          cascade="all">
-          <cache usage="read-write"/>
-          <key column="jbp_uid"/>
-          <index
-             column="jbp_name"
-             type="java.lang.String"/>
-          <one-to-many class="org.jboss.portal.core.impl.user.PreferencesImpl"/>
-       </map>
-       -->
       <property
          name="givenName"
+         column="jbp_givenname"
          type="java.lang.String"
          update="true"
          insert="true"
-         column="jbp_givenname"
          unique="false"/>
        <property
           name="familyName"
+          column="jbp_familyname"
           type="java.lang.String"
           update="true"
           insert="true"
-          column="jbp_familyname"
           unique="false"/>
        <property
           name="password"
+          column="jbp_password"
           type="java.lang.String"
           update="true"
           insert="true"
-          column="jbp_password"
           unique="false"/>
        <property
           name="realEmail"
+          column="jbp_realemail"
           type="java.lang.String"
           update="true"
           insert="true"
-          column="jbp_realemail"
           unique="false"/>
        <property
           name="fakeEmail"
+          column="jbp_fakeemail"
           type="java.lang.String"
           update="true"
           insert="true"
-          column="jbp_fakeemail"
           unique="false"/>
        <property
           name="registrationDate"
+          column="jbp_regdate"
           type="java.util.Date"
           update="false"
           insert="true"
-          column="jbp_regdate"
           unique="false"/>
        <property
           name="viewRealEmail"
+          column="jbp_viewrealemail"
           type="boolean"
           update="true"
           insert="true"
-          column="jbp_viewrealemail"
           unique="false"/>
        <property
           name="enabled"
+          column="jbp_enabled"
           type="boolean"
           update="true"
           insert="true"
-          column="jbp_enabled"
           unique="false"/>
        <set
           name="roles"
@@ -120,121 +105,13 @@
           <cache usage="read-write"/>
           <key column="jbp_uid"/>
           <many-to-many
-             class="org.jboss.portal.core.impl.role.RoleImpl"
+             class="org.jboss.portal.identity.db.RoleImpl"
              column="jbp_rid"
              outer-join="true"/>
        </set>
    </class>
-
    <class
-      name="org.jboss.portal.core.impl.user.PreferencesGroupImpl"
-      table="jbp_user_prefs_group">
-      <cache usage="read-write"/>
-      <id
-         name="key"
-         column="jbp_pk"
-         type="java.lang.Long">
-         <generator class="native">
-            <param name="sequence">user_seq</param>
-         </generator>
-      </id>
-      <property
-         name="groupId"
-         type="java.lang.String"
-         update="false"
-         insert="true"
-         column="jbp_id"
-         not-null="true"
-         unique="true"/>
-       <map
-          name="prefMap"
-          lazy="false"
-          sort="unsorted"
-          inverse="false"
-          cascade="all">
-          <cache usage="read-write"/>
-          <key column="jbp_group_pk"/>
-          <index
-             column="jbp_name"
-             type="java.lang.String"/>
-          <one-to-many class="org.jboss.portal.core.impl.user.PreferencesImpl"/>
-       </map>
-   </class>
-
-   <class
-      name="org.jboss.portal.core.impl.user.PreferencesImpl"
-      table="jbp_user_pref_set">
-      <cache usage="read-write"/>
-       <id
-          name="key"
-          column="jbp_pk"
-          type="java.lang.Long">
-          <generator class="native">
-             <param name="sequence">user_seq</param>
-          </generator>
-       </id>
-       <map
-          name="content"
-          lazy="false"
-          sort="unsorted"
-          inverse="false"
-          cascade="all">
-          <cache usage="read-write"/>
-           <key column="jbp_set_pk"/>
-           <index
-              column="jbp_name"
-              type="java.lang.String"/>
-           <one-to-many class="org.jboss.portal.core.impl.user.PreferenceImpl"/>
-       </map>
-       <property
-          name="id"
-          type="java.lang.String"
-          update="false"
-          insert="true"
-          column="jbp_id"
-          not-null="true"/>
-   </class>
-   <class
-      name="org.jboss.portal.core.impl.user.PreferenceImpl"
-      table="jbp_user_pref">
-      <cache usage="read-write"/>
-       <id
-          name="key"
-          column="jbp_id"
-          type="java.lang.Long">
-          <generator class="native">
-             <param name="sequence">user_seq</param>
-          </generator>
-       </id>
-       <array
-          name="strings"
-          table="jbp_user_pref_value"
-          cascade="all">
-          <cache usage="read-write"/>
-           <key column="jbp_id"/>
-           <index column="jbp_idx"/>
-           <element
-              column="jbp_value"
-              type="java.lang.String"
-              not-null="false"
-              unique="false"/>
-       </array>
-       <property
-          name="name"
-          type="java.lang.String"
-          update="false"
-          insert="true"
-          column="jbp_name"
-          not-null="true"/>
-       <property
-          name="type"
-          type="int"
-          update="true"
-          insert="true"
-          column="jbp_type"/>
-   </class>
-   <class
-      name="org.jboss.portal.core.impl.role.RoleImpl"
+      name="org.jboss.portal.identity.db.RoleImpl"
       table="jbp_roles">
       <cache usage="read-write"/>
       <id
@@ -247,17 +124,17 @@
       </id>
       <property
          name="name"
+         column="jbp_name"
          type="java.lang.String"
          update="false"
          insert="true"
-         column="jbp_name"
          unique="true"/>
       <property
          name="displayName"
+         column="jbp_displayname"
          type="java.lang.String"
          update="true"
          insert="true"
-         column="jbp_displayname"
          unique="true"/>
       <set
          name="users"
@@ -269,7 +146,7 @@
          <cache usage="read-write"/>
          <key column="jbp_rid"/>
          <many-to-many
-            class="org.jboss.portal.core.impl.user.UserImpl"
+            class="org.jboss.portal.identity.db.UserImpl"
             column="jbp_uid"
             outer-join="false"/>
       </set>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -8,23 +8,23 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
-      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/user/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache
          
-      <property name="cache.provider_class">org.jboss.portal.core.hibernate.JMXTreeCacheProvider</property>
-      <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
+         <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+         
+      -->
       
-      -->
-
       <!--
          | Comment in clustered mode
          -->
-      <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
-      <!--
+         <property name="cache.provider_configuration_file_resource_path">conf/hibernate/user/ehcache.xml</property>
+         <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+         <!--
       -->
-
+      
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,8 +1,8 @@
 // This bsh script setup the default content of the portal.
 // It is called when the SessionFactoryBinder service has created a schema and needs to populate it
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.core.impl.user.UserImpl;
-import org.jboss.portal.core.impl.role.RoleImpl;
+import org.jboss.portal.identity.db.UserImpl;
+import org.jboss.portal.identity.db.RoleImpl;
 
 try
 {

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -12,11 +12,10 @@
    
    <application-policy name="portal">
       <authentication>
-         <login-module code="org.jboss.portal.core.security.jaas.ModelLoginModule" flag="required">
+         <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
             <module-option name="unauthenticatedIdentity">guest</module-option>
-            <module-option name="hashAlgorithm">MD5</module-option>
-            <module-option name="hashEncoding">HEX</module-option>
             <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+            <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
             <module-option name="additionalRole">Authenticated</module-option>
             <module-option name="password-stacking">useFirstPass</module-option>
          </login-module>

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-page.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-page.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-page.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,17 +0,0 @@
-<page-configuration>
-   <configuration-name>Page</configuration-name>
-   <interceptors>
-      <interceptor>
-         <interceptor-class>org.jboss.portal.theme.invocation.LayoutInterceptor</interceptor-class>
-      </interceptor>
-      <interceptor>
-         <interceptor-class>org.jboss.portal.theme.invocation.ThemeInterceptor</interceptor-class>
-      </interceptor>
-      <interceptor>
-         <interceptor-class>org.jboss.portal.theme.invocation.RenderSetInterceptor</interceptor-class>
-      </interceptor>
-      <interceptor>
-         <interceptor-class>org.jboss.portal.theme.invocation.StrategyInterceptor</interceptor-class>
-      </interceptor>
-   </interceptors>
-</page-configuration>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,15 @@
+<portlet-app>
+   <portlet>
+      <portlet-name>DefaultPortlet</portlet-name>
+      <remotable>false</remotable>
+      <transaction>
+         <trans-attribute>NotSupported</trans-attribute>
+      </transaction>
+      <security-constraint>
+         <policy-permission>
+            <unchecked/>
+            <action-name>view</action-name>
+         </policy-permission>
+      </security-constraint>
+   </portlet>
+</portlet-app>

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

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/commons-lang-2.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/jsf-example.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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

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

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-federation-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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

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

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portals-bridges-common.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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

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

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,102 @@
+<aop>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.aspects.server.TransactionInterceptor">
+      <method name="invoke">
+         <trans-attribute>RequiresNew</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.aspects.portlet.TransactionInterceptor">
+      <method name="invokeNotSupported">
+         <trans-attribute>NotSupported</trans-attribute>
+      </method>
+      <method name="invokeNever">
+         <trans-attribute>Never</trans-attribute>
+      </method>
+      <method name="invokeMandatory">
+         <trans-attribute>Mandatory</trans-attribute>
+      </method>
+      <method name="invokeSupports">
+         <trans-attribute>supports</trans-attribute>
+         <!--<application-exceptions>,</application-exceptions>-->
+      </method>
+      <method name="invokeRequired">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+      <method name="invokeRequiresNew">
+         <trans-attribute>RequiresNew</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.aspects.server.UserInterceptor$UserFinalizer">
+      <method name="finalizeUser">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.jems.hibernate.SessionFactoryBinder">
+      <method name="createSchema">
+         <trans-attribute>NotSupported</trans-attribute>
+      </method>
+      <method name="destroySchema">
+         <trans-attribute>NotSupported</trans-attribute>
+      </method>
+      <method name="createSessionFactory">
+         <trans-attribute>NotSupported</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.deployment.jboss.ObjectDeployment">
+      <method name="doStart">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory">
+      <method name="createContextIfNotExist">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.deployment.jboss.PortletAppDeployment">
+      <method name="createInstance">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer">
+      <method name="getInstance">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+      <method name="createInstance">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+      <method name="destroyInstance">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+      <method name="getInstances">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+   </metadata>
+   <metadata
+      tag="transaction"
+      class="org.jboss.portal.core.impl.portlet.state.StatefulPortletInvoker">
+      <method name="createClone">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+      <method name="destroyClone">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+      <method name="invoke">
+         <trans-attribute>Required</trans-attribute>
+      </method>
+   </metadata>
+</aop>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_06-64 ("Apple Computer, Inc.")
-

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,16 +1,78 @@
 <server>
 
+
+   <!--mbean
+      code="org.jboss.portal.cms.impl.interceptors.LogInterceptor"
+      name="portal:service=Interceptor,type=Cms,name=Log"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean-->
+   
+   <!--
+      
+      
    <mbean
+      code="org.jboss.portal.cms.impl.cache.CMSTreeCacheServiceImpl"
+      name="portal:service=CMSTreeCacheService"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="Cache" proxy-type="attribute">
+         <mbean
+            code="org.jboss.cache.TreeCache"
+            name="portal:service=CMSTreeCache">
+            <depends>jboss:service=Naming</depends>
+            <depends>jboss:service=TransactionManager</depends>
+            <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
+            <attribute name="CacheMode">REPL_ASYNC</attribute>
+            <attribute name="IsolationLevel">NONE</attribute>
+         </mbean>
+      </depends> 
+      <attribute name="JNDIName">java:/portal/cms/CMSTreeCache</attribute>
+   </mbean>
+      
+   <mbean
+      code="org.jboss.portal.cms.impl.interceptors.CacheInterceptor"
+      name="portal:service=Interceptor,type=Cms,name=Cache"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>portal:service=CMSTreeCacheService</depends>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
+      name="portal:service=InterceptorStack,type=Cms"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Cms,name=Cache</depends-list-element>
+      </depends-list>
+   </mbean>
+   
+   
+   -->
+   
+   <mbean
       code="org.jboss.portal.cms.impl.jcr.JCRCMS"
       name="portal:service=CMS"
-      xmbean-dd="org/jboss/portal/cms/impl/jcr/JCRCMS.xml">
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <!-- The datasource hibernate depends on, it can be commented when the file store is used -->
       <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
       <depends>portal:service=JAASLoginModule</depends>
+      <depends>portal:service=Hibernate,type=CMS</depends>
+      <!--
+         
+         <depends optional-attribute-name="CmsStack" proxy-type="attribute">portal:service=InterceptorStack,type=Cms</depends>
+      
+      -->
       <attribute name="DoChecking">true</attribute>
       <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute>
       <attribute name="DefaultLocale">en</attribute>
-      <attribute name="RepositoryName">repotest</attribute>
+      <attribute name="RepositoryName">PortalRepository</attribute>
       <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute>
       <attribute name="Config">
          <Repository>
@@ -21,14 +83,8 @@
 
             <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
             <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
-               <param name="datasource" value="java:PortalDS"/>
-               <param name="isolation" value="2"/>
-               <param name="batch_size" value="0"/>
-               <param name="auto" value="update"/>
-               <param name="autocommit" value="false"/>
-               <param name="provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
                <param name="schemaObjectPrefix" value="RepositoryEntry"/>
-               <!--<param name="dialect" value="org.hibernate.dialect.MySQLDialect"/>-->
+               <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/>
             </FileSystem>
 
             <!-- LocalFileSystem: uses FileSystem for storage. -->
@@ -50,14 +106,8 @@
 
                <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
                <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
-                  <param name="datasource" value="java:PortalDS"/>
-                  <param name="isolation" value="2"/>
-                  <param name="batch_size" value="0"/>
-                  <param name="auto" value="update"/>
-                  <param name="autocommit" value="false"/>
-                  <param name="provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
                   <param name="schemaObjectPrefix" value="CMSEntry"/>
-                  <!--<param name="dialect" value="org.hibernate.dialect.MySQLDialect"/>-->
+                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                </FileSystem>
                <!-- LocalFileSystem: uses FileSystem for storage. -->
                <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
@@ -71,21 +121,15 @@
 
                <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
                <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager">
-                  <param name="datasource" value="java:PortalDS"/>
-                  <param name="isolation" value="2"/>
-                  <param name="batch_size" value="0"/>
-                  <param name="auto" value="update"/>
-                  <param name="autocommit" value="false"/>
-                  <param name="provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
                   <param name="schemaObjectPrefix" value="WSP"/>
+                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                   <param name="externalBLOBs" value="false"/>
-                  <!--<param name="dialect" value="org.hibernate.dialect.MySQLDialect"/>-->
                </PersistenceManager>
-
+               
                <!-- XMLPersistenceManager: uses FileSystem for storage -->
                <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
 
-               <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+               <!--SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
                   <param name="path" value="${wsp.home}/index"/>
                   <param name="useCompoundFile" value="true"/>
                   <param name="minMergeDocs" value="100"/>
@@ -96,7 +140,7 @@
                   <param name="cacheSize" value="1000"/>
                   <param name="forceConsistencyCheck" value="false"/>
                   <param name="autoRepair" value="true"/>
-               </SearchIndex>
+               </SearchIndex-->
             </Workspace>
             <Versioning rootPath="${rep.home}/versions">
                <!--
@@ -106,16 +150,10 @@
 
                <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
                <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
-                  <param name="datasource" value="java:PortalDS"/>
-                  <param name="isolation" value="2"/>
-                  <param name="batch_size" value="0"/>
-                  <param name="auto" value="update"/>
-                  <param name="autocommit" value="false"/>
-                  <param name="provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
                   <param name="schemaObjectPrefix" value="VersionEntry"/>
-                  <!--<param name="dialect" value="org.hibernate.dialect.MySQLDialect"/>-->
+                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                </FileSystem>
-
+               
                <!-- LocalFileSystem: uses FileSystem for storage. -->
                <!--
                <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
@@ -130,17 +168,11 @@
 
                <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
                <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager">
-                  <param name="datasource" value="java:PortalDS"/>
-                  <param name="isolation" value="2"/>
-                  <param name="batch_size" value="0"/>
-                  <param name="auto" value="update"/>
-                  <param name="autocommit" value="false"/>
-                  <param name="provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
                   <param name="schemaObjectPrefix" value="Version"/>
+                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                   <param name="externalBLOBs" value="false"/>
-                  <!--<param name="dialect" value="org.hibernate.dialect.MySQLDialect"/>-->
                </PersistenceManager>
-
+               
                <!-- XMLPersistenceManager: uses FileSystem for storage -->
                <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
             </Versioning>
@@ -156,7 +188,7 @@
       name="portal:service=ProxyFactory,type=CMS">
       <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
       <attribute name="TargetName">portal:service=CMS</attribute>
-      <attribute name="ExportedInterfaces">org.jboss.portal.cms.ha.HASingletonInvokerMBean$Proxy</attribute>
+      <attribute name="ExportedInterfaces">org.jboss.portal.jems.ha.HASingletonInvokerMBean$Proxy</attribute>
       <attribute name="InvokeTargetMethod">true</attribute>
       <attribute name="ClientInterceptors">
         <interceptors>
@@ -167,9 +199,9 @@
    </mbean>
 
    <mbean
-      code="org.jboss.portal.cms.ha.HASingletonInvoker"
+      code="org.jboss.portal.jems.ha.HASingletonInvoker"
       name="portal:service=HASingletonInvoker,type=CMS">
-      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+      <depends>jboss:service=DefaultPartition</depends>
       <attribute name="RetryWaitingTimeMS">2000</attribute>
       <attribute name="MaxRetries">5</attribute>
       <attribute name="JNDIName">MyServiceInvokeTarget</attribute>
@@ -188,16 +220,54 @@
       <depends optional-attribute-name="Callback" proxy-type="attribute">portal:service=CMS</depends>
       <depends optional-attribute-name="ProxyFactory">portal:service=ProxyFactory,type=CMS</depends>
    </mbean>
+
    
    -->
 
    <mbean
-         code="org.jboss.portal.core.cms.CMSObjectCommandMapper"
-         name="portal:mapper=CMSObject"
-         xmbean-dd="org/jboss/portal/core/cms/CMSObjectCommandMapper.xml">
-      <attribute name="Prefix">content</attribute>
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal:service=Hibernate,type=CMS"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+      <attribute name="DoChecking">true</attribute>
+      <attribute name="ConfigLocation">conf/hibernate/cms/hibernate.cfg.xml</attribute>
+      <attribute name="JNDIName">java:/portal/cms/CMSSessionFactory</attribute>
+   </mbean>
+
+
+   <mbean
+      code="org.jboss.portal.core.cms.CMSObjectCommandFactory"
+      name="portal:commandFactory=CMSObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
       <attribute name="TargetWindowRef">default.default.DefaultCMSPortletWindow</attribute>
-      <depends optional-attribute-name="Mapper" proxy-type="attribute">portal:mapper=PrefixDelegating</depends>
       <depends optional-attribute-name="CMSService" proxy-type="attribute">portal:service=CMS</depends>
    </mbean>
+   <mbean
+      code="org.jboss.portal.core.command.mapper.CommandFactoryDelegate"
+      name="portal:commandFactory=Delegate,prefix=content"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Prefix">content</attribute>
+      <depends
+         optional-attribute-name="DelegatingFactory"
+         proxy-type="attribute">portal:commandFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="DelegateFactory"
+         proxy-type="attribute">portal:commandFactory=CMSObject</depends>
+   </mbean>
+
+   <mbean
+      code="org.jboss.portal.core.cms.CMSObjectURLFactory"
+      name="portal:urlFactory=CMSObject"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Prefix">content</attribute>
+      <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
 </server>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,254 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+   <class name="org.jboss.portal.cms.hibernate.state.VersionBinVal" table="jbp_cms_version_binval" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="BINVAL_ID"
+            type="string"
+            length="255"/>
+      <property
+            name="data"
+            column="BINVAL_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.VersionNode" table="jbp_cms_version_node" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="NODE_ID"
+            type="string"
+            length="36"/>
+      <property
+            name="data"
+            column="NODE_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.VersionProp" table="jbp_cms_version_prop" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="PROP_ID"
+            type="string"
+            length="255"/>
+      <property
+            name="data"
+            column="PROP_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.VersionRefs" table="jbp_cms_version_refs" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="NODE_ID"
+            type="string"
+            length="36"/>
+      <property
+            name="data"
+            column="REFS_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.WSPBinVal" table="jbp_cms_wsp_binval" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="BINVAL_ID"
+            type="string"
+            length="255"/>
+      <property
+            name="data"
+            column="BINVAL_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.WSPNode" table="jbp_cms_wsp_node" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="NODE_ID"
+            type="string"
+            length="36"/>
+      <property
+            name="data"
+            column="NODE_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.WSPProp" table="jbp_cms_wsp_prop" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="PROP_ID"
+            type="string"
+            length="255"/>
+      <property
+            name="data"
+            column="PROP_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.state.WSPRefs" table="jbp_cms_wsp_refs" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="id"
+            column="NODE_ID"
+            type="string"
+            length="36"/>
+      <property
+            name="data"
+            column="REFS_DATA"
+            type="blob"
+            length="100000000"
+            not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.CMSEntry" table="jbp_cms_cmsentry" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="name"
+            column="FSENTRY_NAME"
+            type="string"
+            length="255"
+            not-null="false"/>
+      <property name="path"
+                column="FSENTRY_PATH"
+                type="string"
+                not-null="true"
+                length="245"/>
+      <property name="data"
+                column="FSENTRY_DATA"
+                type="blob"
+                length="100000000"
+                not-null="false"/>
+      <property name="lastmod"
+                column="FSENTRY_LASTMOD"
+                type="long"
+                not-null="true"/>
+      <property name="length"
+                column="FSENTRY_LENGTH"
+                type="long"
+                not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.RepositoryEntry" table="jbp_cms_repositoryentry" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="name"
+            column="FSENTRY_NAME"
+            type="string"
+            length="255"
+            not-null="false"/>
+      <property name="path"
+                column="FSENTRY_PATH"
+                type="string"
+                not-null="true"
+                length="245"/>
+      <property name="data"
+                column="FSENTRY_DATA"
+                type="blob"
+                length="100000000"
+                not-null="false"/>
+      <property name="lastmod"
+                column="FSENTRY_LASTMOD"
+                type="long"
+                not-null="true"/>
+      <property name="length"
+                column="FSENTRY_LENGTH"
+                type="long"
+                not-null="true"/>
+   </class>
+   <class name="org.jboss.portal.cms.hibernate.VersionEntry" table="jbp_cms_versionentry" lazy="true">
+      <id
+            name="key"
+            column="PK"
+            type="java.lang.Integer">
+         <generator class="native"/>
+      </id>
+      <property
+            name="name"
+            column="FSENTRY_NAME"
+            type="string"
+            length="255"
+            not-null="false"/>
+      <property name="path"
+                column="FSENTRY_PATH"
+                type="string"
+                not-null="true"
+                length="245"/>
+      <property name="data"
+                column="FSENTRY_DATA"
+                type="blob"
+                length="100000000"
+                not-null="false"/>
+      <property name="lastmod"
+                column="FSENTRY_LASTMOD"
+                type="long"
+                not-null="true"/>
+      <property name="length"
+                column="FSENTRY_LENGTH"
+                type="long"
+                not-null="true"/>
+   </class>
+</hibernate-mapping>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+    "-//Hibernate/Hibernate Configuration DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+   <session-factory>
+      <property name="connection.datasource">java:PortalDS</property>
+      <property name="show_sql">false</property>
+      <property name="cache.use_second_level_cache">false</property>
+      <property name="cache.use_query_cache">false</property>
+
+      <!-- Force the dialect instead of using autodetection -->
+      <!--
+      <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+      -->
+
+      <!-- Mapping files -->
+      <mapping resource="conf/hibernate/cms/domain.hbm.xml"/>
+   </session-factory>
+</hibernate-configuration>
\ No newline at end of file

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/jackrabbit-core-1.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/jcr-1.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/project.html
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/project.html	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/project.html	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,48 +1,69 @@
 <!-- begin: portlet content -->
 <table width="100%" border="0" cellpadding="2">
-<tr>
-<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td>
-<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
-</tr>
-<tr>
-<td colspan="2">
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/products/jbossportal/docs" target="_blank">Documentation</a>
-<br/>
-Here you will find user documentation, reference documentation for developers and our JBoss Portal javadoc.</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=215" target="_blank">Forums</a>
-<br/>
-Our forums are the main channel of communication between all community
-members. Chances areIf you have any questions or concerns, please use
-our <a href="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&amp;f=215" target="_blank">User Forums</a> or <a href="/index.html?module=bb&amp;op=viewforum&amp;f=205" target="_blank">Developer Forums</a> to voice them. Project developers and community members are always there to help.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal" target="_blank">Wiki</a>
-<br/>
-Our wiki knowledge base is a user and developer contributed collection of important resources regarding JBoss Portal.</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050" target="_blank">Jira</a>
-<br/>
-JBoss Portal uses the JIRA tracking and project management system to organize and prioritize tasks.<br>
-<a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050" target="_blank">JBoss Portal</a>
-&nbsp;|&nbsp;<a href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plugin.system.project:openissues-panel" target="_blank">Open Issues</a>
-&nbsp;|&nbsp;<a href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plugin.system.project:roadmap-panel" target="_blank">Roadmap</a></font></td>
-</tr>
+   <tr>
+      <td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the
+         Professional Support, Consulting, and Training that you need whether you are testing a proof of concept,
+         deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td>
+      <td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
+   </tr>
+   <tr>
+      <td colspan="2">
+      <table width="100%" border="0" cellpadding="2">
+         <tr>
+            <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
+                  src="default/images/check.gif"></td>
+            <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
+               <a href="http://labs.jboss.com/portal/jbossportal/index.html" target="_blank">JBoss Portal Home</a>
+               <br/>
+               The Epicenter of everything JBoss Portal.</font></td>
+         </tr>
+         <tr>
+            <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
+                  src="default/images/check.gif"></td>
+            <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
+               <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">Documentation</a>
+               <br/>
+               Here you will find user documentation, reference documentation, tutorials, and javadoc.</font></td>
+         </tr>
+         <tr>
+            <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
+                  src="default/images/check.gif"></td>
+            <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
+               <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=215" target="_blank">Forums</a>
+               <br/>
+               Our forums are the main channel of communication between all community
+               members. If you have any questions or concerns, please use
+               our <a href="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&amp;f=215" target="_blank">User
+               Forums</a>, <a href="/index.html?module=bb&amp;op=viewforum&amp;f=205" target="_blank">Developer
+               Forums</a>, or <a href="http://jboss.org/index.html?module=bb&op=viewforum&f=232" target="_blank">WSRP Forums</a> to voice them. Project developers and community members are always there to help.
+            </font></td>
+         </tr>
+         <tr>
+            <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
+                  src="default/images/check.gif"></td>
+            <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
+               <a href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal" target="_blank">Wiki</a>
+               <br/>
+               Our wiki knowledge base is a user and developer contributed collection of important resources regarding
+               JBoss Portal.</font></td>
+         </tr>
+         <tr>
+            <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
+                  src="default/images/check.gif"></td>
+            <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
+               <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050" target="_blank">Jira</a>
+               <br/>
+               JBoss Portal uses the JIRA tracking and project management system to organize and prioritize tasks.<br>
+               <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050" target="_blank">JBoss Portal</a>
+               &nbsp;|&nbsp;<a
+                  href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plugin.system.project:openissues-panel"
+                  target="_blank">Open Issues</a>
+               &nbsp;|&nbsp;<a
+                  href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plugin.system.project:roadmap-panel"
+                  target="_blank">Roadmap</a></font></td>
+         </tr>
+      </table>
 </table>
-</table>
 <br/>
 <a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a>
 <!-- end: portlet content -->

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

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/slf4j-log4j12.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_06-64 ("Apple Computer, Inc.")
-

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/WEB-INF/portlet-instances.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,59 @@
+<?xml version="1.0" standalone="yes"?>
+<instances>
+<!--
+-->
+   <!--
+   <instance>
+      <instance-id>WeatherPortletInstance</instance-id>
+      <portlet-ref>samples.WeatherPortlet</portlet-ref>
+   </instance>
+   <instance>
+      <instance-id>NewsPortletInstance</instance-id>
+      <portlet-ref>samples.NewsPortlet</portlet-ref>
+   </instance>
+   <instance>
+      <instance-id>NewsPortletInstance2</instance-id>
+      <portlet-ref>samples.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>
+   <instance>
+      <instance-id>JSPPortletInstance</instance-id>
+      <portlet-ref>samples.JSPPortlet</portlet-ref>
+   </instance>
+-->
+<!--
+   <instance>
+      <instance-id>TestPortletInstance</instance-id>
+      <portlet-ref>TestPortlet</portlet-ref>
+   </instance>
+   <instance>
+      <instance-id>PreferencesPortletInstance</instance-id>
+      <portlet-ref>PreferencesPortlet</portlet-ref>
+      <preferences>
+         <preference>
+            <name>one</name>
+            <value>1.5</value>
+         </preference>
+         <preference>
+            <name>two</name>
+            <value>2.5</value>
+            <read-only>true</read-only>
+         </preference>
+         <preference>
+            <name>three</name>
+            <value>3.5</value>
+            <read-only>true</read-only>
+         </preference>
+      </preferences>
+   </instance>
+-->
+</instances>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_06-64 ("Apple Computer, Inc.")
-

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties	2006-08-31 20:55:25 UTC (rev 6051)
@@ -281,6 +281,8 @@
 REGISTER_VIEWREALEMAIL=Allow other users to view my real e-mail address
 REGISTER_HOMEPAGE=Address of your personal website
 REGISTER_TIMEZONEOFFSET=Time zone offset
+REGISTER_THEME=Theme
+REGISTER_DEFAULT_THEME=Site Default
 REGISTER_ICQ=ICQ id
 REGISTER_AIM=AIM id
 REGISTER_YIM=Yahoo id
@@ -394,6 +396,8 @@
 CMS_CREATEFILE=Create Directory
 CMS_UPLOADARCHIVE=Upload Archive
 CMS_BACKTOBROWSER=Back to Directory Browser
+CMS_TRANSFER=Import/Export
+CMS_EXPORTARCHIVE=Export Folder
 
 CMS_CREATEFILEINDIR=Creating File in Directory
 CMS_FILENAME=FileName

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties	2006-08-31 20:55:25 UTC (rev 6051)
@@ -281,6 +281,8 @@
 REGISTER_VIEWREALEMAIL=Allow other users to view my real e-mail address
 REGISTER_HOMEPAGE=Address of your personal website
 REGISTER_TIMEZONEOFFSET=Time zone offset
+REGISTER_THEME=Theme
+REGISTER_DEFAULT_THEME=Site Default
 REGISTER_ICQ=ICQ id
 REGISTER_AIM=AIM id
 REGISTER_YIM=Yahoo id
@@ -394,6 +396,8 @@
 CMS_CREATEFILE=Create Directory
 CMS_UPLOADARCHIVE=Upload Archive
 CMS_BACKTOBROWSER=Back to Directory Browser
+CMS_TRANSFER=Import/Export
+CMS_EXPORTARCHIVE=Export Folder
 
 CMS_CREATEFILEINDIR=Creating File in Directory
 CMS_FILENAME=FileName

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties	2006-08-31 20:55:25 UTC (rev 6051)
@@ -93,35 +93,35 @@
 
 
 
-_ASREGISTERED=¿No tiene una cuenta todavía? Puede <a href\="index.html?module=user&op=getlogin">crear una</a>.
+_ASREGISTERED=�No tiene una cuenta todav�a? Puede <a href\="index.html?module=user&op=getlogin">crear 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
@@ -131,63 +131,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
 Required=(obligatorio)
@@ -198,35 +198,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.
 
@@ -234,7 +234,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
 
 // Used by JBoss Portal
 
@@ -247,40 +247,42 @@
 OPTIONAL=Opcional
 REQUIRED=Obligatorio
 
-255MAX=(Firma de 255 caractéres max)
+255MAX=(Firma de 255 caract�res max)
 
 NAMENOTAVAILABLE=N/A
 
 // Registration
-REGISTER_REGISTER=¿No tiene una cuenta todavía?  Puede
+REGISTER_REGISTER=�No tiene una cuenta todav�a?  Puede
 REGISTER_REGISTER_LINK=crear una
 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_NEWUSER=Crear nuevo usuario
-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
 REGISTER_ICQ=ICQ id
 REGISTER_AIM=AIM id
 REGISTER_YIM=Yahoo id
@@ -291,20 +293,20 @@
 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_LANGUAGE=Lenguaje
 
-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
@@ -312,7 +314,7 @@
 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
@@ -323,8 +325,8 @@
 LIST_ACTIONEDITROLES=Editar Roles
 FILTER=Filtro
 
-NEXTPAGE=Página siguiente
-PREVIOUSPAGE=Página anterior
+NEXTPAGE=P�gina siguiente
+PREVIOUSPAGE=P�gina anterior
 
 ASSIGNROLES=Asignar roles
 ROLESAVAILABLE=Roles disponibles
@@ -347,7 +349,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
@@ -361,10 +363,10 @@
 MENU_EDITROLEMEMBERS=Editar los miembros de un rol
 
 // 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
@@ -372,17 +374,17 @@
 TITLE_CREATE=Crear fichero
 TITLE_UPLOAD=Subir fichero
 
-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_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
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties	2006-08-31 20:55:25 UTC (rev 6051)
@@ -112,23 +112,23 @@
 
 Location=Position
 Occupation=Occupation
-Interests=Centres d'intèrêts
-ExtraInfo=Informations complémentaires
-YourLocation=Votre lieu de résidence
-YourOccupation=Votre métier
-YourInterests=Vos centres d'intèrêts
+Interests=Centres d'int�r�ts
+ExtraInfo=Informations compl�mentaires
+YourLocation=Votre lieu de r�sidence
+YourOccupation=Votre m�tier
+YourInterests=Vos centres d'int�r�ts
 UserLogin=Pseudo utilisateur
 Signature=Signature
 
 LoginSite=Login.
 Register=Enregistrement
 
-UserExist=Cet identifiant existe déjà
+UserExist=Cet identifiant existe d�j�
 ToChangeInfo=Pour changer vos informations personnelles
 LoggingYou=Bienvenue, connexion en cours ...
-YouAreLoggedOut=Deconnexion en cours ... à bientôt \!
-PassDifferent=Les passwords sont différents, ils doivent être identiques
-YourPassMustBe=Désolé votre password doit comporter au moins
+YouAreLoggedOut=Deconnexion en cours ... � bient�t \!
+PassDifferent=Les passwords sont diff�rents, ils doivent �tre identiques
+YourPassMustBe=D�sol� votre password doit comporter au moins
 CharLong=caracteres
 UserNotExist=Cet identifiant n\'existe pas \!
 UserRegLogin=Enregistrement/login
@@ -136,7 +136,7 @@
 RetrievePass=Mot de passe perdu
 Email=E-mail
 Options=Options
-AllowEmailView=Autoriser les autres utilisateurs à voir mon adresse e-mail
+AllowEmailView=Autoriser les autres utilisateurs � voir mon adresse e-mail
 WelcomeTo=Bienvenue sur
 Registration=Enregistrement
 
@@ -144,28 +144,28 @@
 Over13_2=ou plus ou j'ai l'autorisation de mes parents
 MustBe_1=Vous devez avoir
 MustBe_2=ou plus ou avoir l'autorisation de vos parents
-Consent_1=(En cliquant sur le lien ci-dessus vous déclarez être majeur<br>
+Consent_1=(En cliquant sur le lien ci-dessus vous d�clarez �tre majeur<br>
 Consent_2=ou avoir l'autorisation de vos parents)
 Under13_1=Je ne suis pas majeur
 Under13_2=et je n'ai pas l'autorisation de mes parents
 
-Sorry=Désolé.
+Sorry=D�sol�.
 Click=Cliquez
 Here=ici
-Return=pour revenir à la page d'accueil
+Return=pour revenir � la page d'accueil
 UserName=Identifiant
 GoBack=Back
 Finish=Terminer
 PersonalInfo=Informations personnelles
-RealName=Nom réel
+RealName=Nom r�el
 Optional=(optionel)
-CanKnowAbout=(255 caracteres max. Précisez ce que les autres peuvent savoir de vous)
+CanKnowAbout=(255 caracteres max. Pr�cisez ce que les autres peuvent savoir de vous)
 Language=Langage
 255CharMax=(255 caracteres max. Signature with HTML coding)
 YourAvatar=Votre avatar
 YourHomePage=Votre site web
-TimeZoneOffset=Décalage GMT
-EmailNotPublic=(e-mail obligatoire mais non publié. Utilisé pour vous envoyer votre mot de passe)
+TimeZoneOffset=D�calage GMT
+EmailNotPublic=(e-mail obligatoire mais non publi�. Utilis� pour vous envoyer votre mot de passe)
 EmailPublic=(e-mail public.)
 Required=(obligatoire)
 SaveChanges=Enregistrer les modifications
@@ -173,20 +173,20 @@
 TypeNewPassword=(saisissez un nouveau mot de passe 2 fois pour valider)
 Search=Chercher
 All=Tous
-UsersFoundFor=utilisateurs trouvés
+UsersFoundFor=utilisateurs trouv�s
 Pages=pages
-UsersShown=utilisateurs visualisés
+UsersShown=utilisateurs visualis�s
 Delete=Supprimer
 Edit=Editer
 Ok=Ok
 Cancel=Cancel
 AreYouSureToDeleteUser=Voulez-vous vraiment supprimer l\'utilisateur \?
-UserDeleted=Utilisateur supprimé
-ReturnToMemberList=Revenir à la liste des membres
+UserDeleted=Utilisateur supprim�
+ReturnToMemberList=Revenir � la liste des membres
 Avatar=Avatar
 AdminFunctions=Fonctions d\'administration
 URL=URL
-UpdateUser=Mise à jour
+UpdateUser=Mise � jour
 UserID=ID Utilisateur
 ForChanges=(modifications seulement)
 MemberList=Liste des membres
@@ -194,9 +194,9 @@
 
 ThemeText1=Cette option change le style pour tout le site
 ThemeText2=Les changement ne concernent que vous
-ThemeText3=Chaque utilisateur peut consulter le site avec le thème de son choix
-SelectTheme=Selectionner un thème
-ThemeSelection=Selection d\'un thème
+ThemeText3=Chaque utilisateur peut consulter le site avec le th�me de son choix
+SelectTheme=Selectionner un th�me
+ThemeSelection=Selection d\'un th�me
 
 CannotLogin=Connexion impossible
 
@@ -204,13 +204,13 @@
 LoginNoSuchUser=L\'utilisateur n\'existe pas
 LoginBadPassword=Le mot de passe n\'est pas valide
 LoginUnexpectedError=Erreur inconnue
-LoginUserDisabled=Votre compte est bloqué. Consultez un aministrateur
+LoginUserDisabled=Votre compte est bloqu�. Consultez un aministrateur
 
 Enable=Permettre
 Disable=Interdire
-StatusChanged=Le status de l\'utilisateur a été changé
+StatusChanged=Le status de l\'utilisateur a �t� chang�
 
-NotAuth=Opération non autorisée
+NotAuth=Op�ration non autoris�e
 
 // Used by JBoss Portal
 
@@ -229,24 +229,24 @@
 
 // Registration
 REGISTER_REGISTER=Pas encore membre ?
-REGISTER_REGISTER_LINK=Créer un compte
+REGISTER_REGISTER_LINK=Cr�er un compte
 REGISTER_NEWUSER=Enregistrement d'un nouvel utilisateur
 REGISTER_PASSWORDAGAIN=Comfirmer votre mot de passe
-REGISTER_REALEMAIL=e-mail réel
+REGISTER_REALEMAIL=e-mail r�el
 REGISTER_FAKEEMAIL=e-mail public
-REGISTER_FAKEEMAIL_EXPLAIN=Si ce champ n'est pas vide, l'email réel ne sera utilisé que pour envoyer des notifications
-REGISTER_QUESTION=Question secrète
-REGISTER_ANSWER=Réponse secrète
+REGISTER_FAKEEMAIL_EXPLAIN=Si ce champ n'est pas vide, l'email r�el ne sera utilis� que pour envoyer des notifications
+REGISTER_QUESTION=Question secr�te
+REGISTER_ANSWER=R�ponse secr�te
 REGISTER_NEWUSER=Nouvel utilisateur
-REGISTER_ASREGUSER=En étant enregistré vous pouvez:
-REGISTER_ASREG6=Choisir parmi plusieurs thèmes 
+REGISTER_ASREGUSER=En �tant enregistr� vous pouvez:
+REGISTER_ASREG6=Choisir parmi plusieurs th�mes 
 REGISTER_ASREG5=Personnaliser les commentaires
 REGISTER_ASREG4=Personnaliser la page d'accueil
 REGISTER_ASREG3=Avoir une boite de saisie de mot de passe sur la page d'accueil
 REGISTER_ASREG2=Poster des news
 REGISTER_ASREG1=Poster des commentaires
 REGISTER_REGISTERNOW=Enregistrez-vous! C'est gratuit!
-REGISTER_WEDONTGIVE=Nous ne communiquons pas les données personnelles
+REGISTER_WEDONTGIVE=Nous ne communiquons pas les donn�es personnelles
 
 REGISTER_ALREADYHAVEACCOUNT=Vous avex deja un compte:
 REGISTER_SIGNIN=Se connecter
@@ -256,6 +256,8 @@
 REGISTER_VIEWREALEMAIL=Permet aux autres utilisateurs de voir ma vraie adresse e-mail.
 REGISTER_HOMEPAGE=Addresse de votre site web
 REGISTER_TIMEZONEOFFSET=Time zone
+REGISTER_THEME=Th�me
+REGISTER_DEFAULT_THEME=Site Default
 REGISTER_ICQ=Numero ICQ
 REGISTER_AIM=Identifiant AIM
 REGISTER_YIM=Identifiant Yahoo

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/context.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/context.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/context.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,2 +0,0 @@
-<Context>
-</Context>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -35,11 +35,24 @@
          <value>#{applicationScope.ThemeService}</value>
       </managed-property>
       <managed-property>
-         <property-name>policyConfigService</property-name>
-         <value>#{applicationScope.PortalPolicyConfigService}</value>
+         <property-name>authorizationDomainRegistry</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry}</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>
+      <managed-bean-class>org.jboss.portal.core.portlet.management.actions.PortalAction</managed-bean-class>
+      <managed-bean-scope>request</managed-bean-scope>
+      <managed-property>
+         <property-name>portalObjectManager</property-name>
+         <value>#{sessionScope.portalobjectmgr}</value>
+      </managed-property>
+   </managed-bean>
+   <managed-bean>
       <managed-bean-name>addPageAction</managed-bean-name>
       <managed-bean-class>org.jboss.portal.core.portlet.management.actions.AddPageAction</managed-bean-class>
       <managed-bean-scope>request</managed-bean-scope>
@@ -66,6 +79,7 @@
          <value>#{sessionScope.portalobjectmgr}</value>
       </managed-property>
    </managed-bean>
+
    <!-- The instance manager managed bean -->
    <managed-bean>
       <managed-bean-name>instancemgr</managed-bean-name>
@@ -76,16 +90,12 @@
          <value>#{applicationScope.RoleModule}</value>
       </managed-property>
       <managed-property>
-         <property-name>webAppRegistry</property-name>
-         <value>#{applicationScope.WebAppRegistry}</value>
-      </managed-property>
-      <managed-property>
          <property-name>instanceContainer</property-name>
          <value>#{applicationScope.InstanceContainer}</value>
       </managed-property>
       <managed-property>
-         <property-name>policyConfigService</property-name>
-         <value>#{applicationScope.PortalPolicyConfigService}</value>
+         <property-name>authorizationDomainRegistry</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry}</value>
       </managed-property>
    </managed-bean>
    <managed-bean>
@@ -108,17 +118,21 @@
          <value>#{applicationScope.RoleModule}</value>
       </managed-property>
       <managed-property>
-         <property-name>webAppRegistry</property-name>
-         <value>#{applicationScope.WebAppRegistry}</value>
-      </managed-property>
-      <managed-property>
          <property-name>instanceContainer</property-name>
          <value>#{applicationScope.InstanceContainer}</value>
       </managed-property>
       <managed-property>
-         <property-name>policyConfigService</property-name>
-         <value>#{applicationScope.PortalPolicyConfigService}</value>
+         <property-name>authorizationDomainRegistry</property-name>
+         <value>#{applicationScope.AuthorizationDomainRegistry}</value>
       </managed-property>
+      <managed-property>
+         <property-name>federatingPortletInvoker</property-name>
+         <value>#{applicationScope.FederatingPortletInvoker}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>selectedFederatedId</property-name>
+         <value>local</value>
+      </managed-property>
    </managed-bean>
    <managed-bean>
       <managed-bean-name>createInstanceAction</managed-bean-name>
@@ -133,6 +147,15 @@
          <value>#{sessionScope.instancemgr}</value>
       </managed-property>
    </managed-bean>
+   <managed-bean>
+      <managed-bean-name>propertyAction</managed-bean-name>
+      <managed-bean-class>org.jboss.portal.core.portlet.management.actions.PropertyAction</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>portalObjectManager</property-name>
+         <value>#{sessionScope.portalobjectmgr}</value>
+      </managed-property>
+   </managed-bean>
 
    <navigation-rule>
       <navigation-case>
@@ -150,7 +173,7 @@
    </navigation-rule>
 
    <lifecycle>
-      <phase-listener>org.jboss.portal.core.portlet.management.InstanceManagerBean$Blah</phase-listener>
+      <phase-listener>org.jboss.portal.core.portlet.management.Refresher</phase-listener>
    </lifecycle>
 
 </faces-config>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -31,6 +31,9 @@
    </portlet>
    <portlet>
       <portlet-name>ManagementPortlet</portlet-name>
+      <header-content>
+         <link rel="stylesheet" type="text/css" href="/images/management/management.css" title="" media="screen"/>
+      </header-content>
       <transaction>
          <trans-attribute>Required</trans-attribute>
       </transaction>
@@ -38,14 +41,10 @@
    <portlet>
       <portlet-name>PolicyConfiguratorPortlet</portlet-name>
       <security-constraint>
-          <action-constraint>
-             <action-name>view</action-name>
-             <action-name>render</action-name>
-             <action-name>action</action-name>
-          </action-constraint>
-          <auth-constraint>
-             <role-name>Admin</role-name>
-          </auth-constraint>
+         <policy-permission>
+            <role-name>Admin</role-name>
+            <action-name>view</action-name>
+         </policy-permission>
       </security-constraint>
    </portlet>
    <portlet>
@@ -62,19 +61,14 @@
    </portlet>
    <!-- Service injected in the portlet context. -->
    <service>
-      <service-name>WebAppRegistry</service-name>
-      <service-class>org.jboss.portal.server.app.WebAppRegistry</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,type=global</service-ref>
+      <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,type=global</service-ref>
+      <service-ref>:container=Instance</service-ref>
    </service>
    <service>
       <service-name>ThemeService</service-name>
@@ -92,18 +86,13 @@
       <service-ref>:service=CMS</service-ref>
    </service>
    <service>
-      <service-name>PortalPermissionFactory</service-name>
-      <service-class>org.jboss.portal.security.PortalPermissionFactory</service-class>
-      <service-ref>:service=PortalPermissionFactory</service-ref>
-   </service>
-   <service>
       <service-name>UserModule</service-name>
-      <service-class>org.jboss.portal.core.modules.UserModule</service-class>
+      <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.core.modules.RoleModule</service-class>
+      <service-class>org.jboss.portal.identity.RoleModule</service-class>
       <service-ref>:service=Module,type=Role</service-ref>
    </service>
    <service>
@@ -112,8 +101,18 @@
       <service-ref>:service=Module,type=Mail</service-ref>
    </service>
    <service>
-      <service-name>PortalPolicyConfigService</service-name>
-      <service-class>org.jboss.portal.security.config.PortalPolicyConfigService</service-class>
-      <service-ref>:policy=PortalPolicyConfigService</service-ref>
+      <service-name>PortalAuthorizationManagerFactory</service-name>
+      <service-class>org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory</service-class>
+      <service-ref>:service=PortalAuthorizationManagerFactory</service-ref>
    </service>
-</portlet-app>
\ No newline at end of file
+   <service>
+      <service-name>AuthorizationDomainRegistry</service-name>
+      <service-class>org.jboss.portal.security.AuthorizationDomainRegistry</service-class>
+      <service-ref>:service=AuthorizationDomainRegistry</service-ref>
+   </service>
+   <service>
+      <service-name>FederatingPortletInvoker</service-name>
+      <service-class>org.jboss.portal.federation.FederatingPortletInvoker</service-class>
+      <service-ref>:service=PortletInvoker,type=Federating</service-ref>
+   </service>
+</portlet-app>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,5 +1,5 @@
-<%@ page import="org.jboss.portlet.PortalNode" %>
-<%@ page import="org.jboss.portlet.PortalNodeURL" %>
+<%@ page import="org.jboss.portal.api.node.PortalNode" %>
+<%@ page import="org.jboss.portal.api.node.PortalNodeURL" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/sitemap.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/sitemap.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/sitemap.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,7 +1,7 @@
 <%@ page import="org.jboss.portlet.JBossRenderResponse" %>
-<%@ page import="org.jboss.portlet.PortalNode" %>
-<%@ page import="org.jboss.portlet.PortalNodeURL" %>
 <%@ page import="java.util.Iterator" %>
+<%@ page import="org.jboss.portal.api.node.PortalNode"%>
+<%@ page import="org.jboss.portal.api.node.PortalNodeURL"%>
 <%@ 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" %>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/edit.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/edit.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -14,6 +14,8 @@
    String sCSSURL = (String) request.getAttribute("css_url");
    String sLanguage = (String) request.getAttribute("language");
    String sVersion = (String) request.getAttribute("version");
+   String sTitle = (String) request.getAttribute("title");
+   String sDescription = (String) request.getAttribute("description");
 %>
 
 <!-- tinyMCE -->
@@ -63,7 +65,7 @@
                                                                                                        size="40"
                                                                                                        maxlength="80"
                                                                                                        name="description"
-                                                                                                       value=""
+                                                                                                       value="<%= sDescription %>"
                                                                                                        class="portlet-form-input-field"/>
                   </td>
                   </tr>
@@ -71,7 +73,8 @@
                      <td class="portlet-section-header" valign="bottom">
                         ${n:i18n("CMS_TITLE")}:</td><td class="portlet-section-alternate"><input type="text" size="40"
                                                                                                  maxlength="80"
-                                                                                                 name="title" value=""
+                                                                                                 name="title"
+                                                                                                 value="<%= sTitle %>"
                                                                                                  class="portlet-form-input-field"/>
                   </td>
                   </tr>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,69 @@
+<%@ page import="java.util.Locale" %>
+<%@ 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/>
+
+<%
+   String sCurrPath = (String) request.getAttribute("currpath");
+   String OP = CMSAdminConstants.OP_EXPORTARCHIVE;
+   String[] langs = Locale.getISOLanguages();
+%>
+
+<form name="pickform" method="post" action="<portlet:actionURL>
+    <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
+    </portlet:actionURL>">
+   <input type="hidden" name="destination" value="<%= sCurrPath %>">
+   <table width="100%">
+      <th colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+      <tr>
+         <td align="left">
+            <table>
+               <tr>
+                  <td valign="bottom">
+                     ${n:i18n("CMS_EXPORTARCHIVE")}:
+                  </td>
+                  <td>
+                     <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
+                            class="portlet-form-input-field"/></td>
+               </tr>
+               <tr>
+                  <td valign="bottom">
+                     ${n:i18n("CMS_LANGUAGE")}:</td><td><select name="language" class="portlet-form-input-field">
+                  <option selected
+                          value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %></option>
+                  <%
+                     for(int i = 0; i < langs.length; i++)
+                     {
+                  %>
+                  <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %></option>
+                  <%
+                     }
+                  %>
+               </select>
+               </td>
+               </tr>
+               <tr><td colspan="2">
+                  <br><br>
+                  <input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}"
+                         class="portlet-form-input-field"/>
+               </td>
+               </tr>
+            </table>
+         </td>
+         <td valign="top" class="portlet-section-alternate">
+            <%@ include file="folderlist.jsp" %>
+         </td>
+      </tr>
+   </table>
+</form>
+
+<a href="<portlet:renderURL>
+                <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+                <portlet:param name="path"
+                  value="<%= sCurrPath %>"/>
+              </portlet:renderURL>">
+   <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
+        alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,43 @@
+<%@ page import="org.jboss.portal.core.portlet.cms.admin.CMSAdminConstants" %>
+<%@ 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/>
+
+<%
+   String sCurrPath = (String) request.getAttribute("currpath");
+%>
+
+<table width="100%">
+   <th class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+   <tr>
+      <td align="left">
+         <table width="100%">
+            <tr>
+               <td align="center">
+                  Your export of <b><%= sCurrPath %></b> is ready for download.
+               </td>
+            </tr>
+            <tr><td height="10">&nbsp;</td></tr>
+            <tr>
+               <td align="center">
+                  <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img
+                        src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif"
+                        alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/>
+                  <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a>
+               </td>
+            </tr>
+         </table>
+      </td>
+   </tr>
+</table>
+
+<a href="<portlet:renderURL>
+                <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+                <portlet:param name="path"
+                  value="<%= sCurrPath %>"/>
+              </portlet:renderURL>">
+   <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
+        alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/menu.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/menu.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/menu.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -12,7 +12,7 @@
    </tr>
    <tr>
       <td align="left" class="portlet-section-alternate">${n:i18n("CMS_CREATE")}</td>
-      <td align="left" class="portlet-section-alternate">${n:i18n("CMS_UPLOAD")}</td>
+      <td align="left" class="portlet-section-alternate">${n:i18n("CMS_TRANSFER")}</td>
       <td align="left" class="portlet-section-alternate">${n:i18n("CMS_MODIFY")}</td>
    </tr>
    <tr>
@@ -43,7 +43,13 @@
    <portlet:param name="path" value="<%= sCurrPath %>"/>
    </portlet:renderURL>">
             <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/upload_archive.gif"
-                 alt="${n:i18n("CMS_UPLOADARCHIVE")}" border="0"></a>
+                 alt="${n:i18n("CMS_UPLOADARCHIVE")}" border="0"></a>&nbsp;
+         <a href="<portlet:renderURL>
+   <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
+   <portlet:param name="path" value="<%= sCurrPath %>"/>
+   </portlet:renderURL>">
+            <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_archive.gif"
+                 alt="${n:i18n("CMS_EXPORTARCHIVE")}" border="0"></a>
       </td>
       <td align="left" class="portlet-section-alternate">
          <%

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/viewfile.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin/viewfile.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -25,6 +25,7 @@
          sType = content.getMimeType();
       }
    }
+   String sPreviewPath = (String) request.getAttribute("previewpath");
 %>
 <br>
 
@@ -71,7 +72,7 @@
    <tr>
       <td align="left" class="portlet-section-alternate">
          <%
-            if(sType.equals("text/html") || sType.equals("text/text"))
+            if(sType.equals("text/html") || sType.equals("text/plain"))
             {
          %>
          <a href="<portlet:renderURL>
@@ -137,7 +138,7 @@
 <tr>
    <td colspan="8">
       <%
-         if(sType.equals("text/html") || sType.equals("text/text"))
+         if(sType.equals("text/html") || sType.equals("text/plain"))
          {
       %>
       <a href="<portlet:renderURL>
@@ -169,7 +170,7 @@
 </tr>
 <tr>
    <%
-      if(sType.equals("text/html") || sType.equals("text/text"))
+      if(sType.equals("text/html") || sType.equals("text/plain"))
       {
    %>
    <td class="portlet-section-header">${n:i18n("CMS_EDIT")}</td>
@@ -190,7 +191,7 @@
 %>
 <tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
    <%
-      if(sType.equals("text/html") || sType.equals("text/text"))
+      if(sType.equals("text/html") || sType.equals("text/plain"))
       {
    %>
    <td>
@@ -210,8 +211,19 @@
    <td><%= version.getMimeType() %></td>
    <td><%= version.getBytes().length / 1024 %>kb</td>
    <td>
+      <%
+         if(sType.equals("text/html") || sType.equals("text/plain"))
+         {
+      %>
       <%= version.getVersionNumber() %>
+      <% }
+      else
+      {
+      %>
+      <a target="_blank"
+         href="<%= request.getContextPath() %>/cmspreview?v=<%= version.getVersionNumber() %>&l=<%= content.getLocale().getLanguage() %>&p=<%= sCurrPath %>"><%= version.getVersionNumber() %></a>
       <%
+         }
          if(version.isLive())
          {
       %>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/login/login.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,6 +1,6 @@
 <div id="login-container">
  <fieldset><legend>JBoss Portal Login</legend>
-  <form method="POST" action="j_security_check" name="loginform" id="loginForm">
+  <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"/>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -5,33 +5,14 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:t="http://myfaces.apache.org/tomahawk">
 <ui:include src="/WEB-INF/jsp/management/nav.xhtml"/>
-<br/><br/>
-<style type="text/css">
-   .vertTop {
-      vertical-align: top;
-   }
 
-   .menu {
-      background-color: #e6e6fa;
-      border-style: dashed;
-      border-color: black;
-      border-width: 1px;
-   }
-
-   .content {
-      background-color: #f0f8ff;
-      border-style: solid;
-      border-color: black;
-      border-width: 1px;
-   }
-</style>
 <h:panelGrid
       id="thepanel"
       columns="3"
       cellspacing="2"
       cellpadding="2"
       rowClasses="vertTop"
-      columnClasses="menu,,content">
+      columnClasses=",,content">
 <h:panelGroup id="pg1">
    <h:form id="foo">
       <t:tree2
@@ -40,18 +21,52 @@
             var="node"
             varNodeToggler="t"
             org.apache.myfaces.tree2.CLIENT_SIDE_TOGGLE="#{false}">
-         <f:facet
-               name="foo-folder">
+         <f:facet name="context">
             <h:panelGroup>
                <t:graphicImage
-                     value="/images/management/page-open.png"
-                     rendered="#{t.nodeExpanded}"
+                     value="/images/management/tree/context.png"
+                     style="vertical-align:middle;" title="Example ToolTip on Image"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:commandLink
+                     action="#{portalobjectmgr.selectObject}" title="Example ToolTip">
+                  <h:outputText
+                        value="#{node.description}"/>
+                  <f:param
+                        name="id"
+                        value="#{node.identifier}"/>
+               </h:commandLink>
+               <h:outputText
+                     value=" (#{node.childCount})"
+                     styleClass="childCount"
+                     rendered="#{!empty node.children}"/>
+            </h:panelGroup>
+         </f:facet>
+         <f:facet name="portal">
+            <h:panelGroup>
+               <t:graphicImage
+                     value="/images/management/tree/portal.png"
                      style="vertical-align:middle;"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:commandLink
+                     action="#{portalobjectmgr.selectObject}">
+                  <h:outputText
+                        value="#{node.description}"/>
+                  <f:param
+                        name="id"
+                        value="#{node.identifier}"/>
+               </h:commandLink>
+               <h:outputText
+                     value=" (#{node.childCount})"
+                     styleClass="childCount"
+                     rendered="#{!empty node.children}"/>
+            </h:panelGroup>
+         </f:facet>
+         <f:facet name="page">
+            <h:panelGroup>
                <t:graphicImage
-                     value="/images/management/page-closed.png"
-                     rendered="#{!t.nodeExpanded}"
+                     value="/images/management/tree/page.png"
                      style="vertical-align:middle;"/>
-               <h:outputText>&amp;nbsp;</h:outputText>
+               <h:outputText>&#160;</h:outputText>
                <h:commandLink
                      action="#{portalobjectmgr.selectObject}">
                   <h:outputText
@@ -66,13 +81,12 @@
                      rendered="#{!empty node.children}"/>
             </h:panelGroup>
          </f:facet>
-         <f:facet
-               name="document">
+         <f:facet name="window">
             <h:panelGroup>
                <t:graphicImage
-                     value="/images/management/window.png"
+                     value="/images/management/tree/window.png"
                      style="vertical-align:middle;"/>
-               <h:outputText>&amp;nbsp;</h:outputText>
+               <h:outputText>&#160;</h:outputText>
                <h:commandLink
                      action="#{portalobjectmgr.selectObject}">
                   <h:outputText
@@ -85,90 +99,106 @@
          </f:facet>
       </t:tree2>
    </h:form>
+   <h:form>
+     <h:commandLink value="" onclick="return showhide('treehelp');">
+       <t:graphicImage
+            value="/images/management/help.gif" style="border-width:0"/>
+     </h:commandLink>
+   </h:form>
+   <div id="treehelp" style="visibility:hidden;display:none;" class="helpblock">
+      Some help text.
+      <br/>
+   </div>
 </h:panelGroup>
 <h:panelGroup id="splitter">
-   <h:graphicImage value="/images/management/line-trunk.gif" border="0" height="100%" width="1"/>
 </h:panelGroup>
 <h:panelGroup
       id="pg2">
    <div align="center">
-      <h:panelGrid
-            columns="4"
-            border="0"
-            cellspacing="2"
-            cellpadding="2"
-            rowClasses="vertTop"
-            style="background-color:#f0f8ff;">
-         <h:commandLink
-               action="#{portalobjectmgr.selectPlugin}"
-               style="#{portalobjectmgr.selectedPlugin == 'manager' ? 'font-weight:bold' : ''}">
-            <h:graphicImage value="/images/management/manage.png" border="0" style="vertical-align:middle;"/>
-            <h:outputText>&amp;nbsp;</h:outputText>
-            <h:outputText
-                  value="Manager"/>
-            <f:param
-                  name="plugin"
-                  value="manager"/>
-            <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
-         </h:commandLink>
-         <h:commandLink
-               action="#{portalobjectmgr.selectPlugin}"
-               style="#{portalobjectmgr.selectedPlugin == 'properties' ? 'font-weight:bold' : ''}">
-            <h:graphicImage value="/images/management/properties.png" border="0" style="vertical-align:middle;"/>
-            <h:outputText>&amp;nbsp;</h:outputText>
-            <h:outputText
-                  value="Properties"/>
-            <f:param
-                  name="plugin"
-                  value="properties"/>
-            <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
-         </h:commandLink>
-         <h:commandLink
-               action="#{portalobjectmgr.selectPlugin}"
-               style="#{portalobjectmgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}">
-            <h:graphicImage value="/images/management/security.png" border="0" style="vertical-align:middle;"/>
-            <h:outputText>&amp;nbsp;</h:outputText>
-            <h:outputText
-                  value="Security"/>
-            <f:param
-                  name="plugin"
-                  value="security"/>
-            <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
-         </h:commandLink>
-         <h:commandLink
-               action="#{portalobjectmgr.selectPlugin}"
-               style="#{portalobjectmgr.selectedPlugin == 'theme' ? 'font-weight:bold' : ''}">
-            <h:graphicImage value="/images/management/theme.png" border="0" style="vertical-align:middle;"/>
-            <h:outputText>&amp;nbsp;</h:outputText>
-            <h:outputText value="Theme"/>
-            <f:param name="plugin" value="theme"/>
-         </h:commandLink>
-      </h:panelGrid>
+      <h:form id="plugin_display">
+         <h:panelGrid
+               columns="4"
+               border="0"
+               cellspacing="2"
+               cellpadding="2"
+               rowClasses="vertTop">
+            <h:commandLink
+                  action="#{portalobjectmgr.selectPlugin}"
+                  style="#{portalobjectmgr.selectedPlugin == 'manager' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:outputText
+                     value="Manager"/>
+               <f:param
+                     name="plugin"
+                     value="manager"/>
+               <h:outputText>&#160;&#160;&#160;</h:outputText>
+            </h:commandLink>
+            <h:commandLink
+                  action="#{portalobjectmgr.selectPlugin}"
+                  style="#{portalobjectmgr.selectedPlugin == 'properties' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/properties.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:outputText
+                     value="Properties"/>
+               <f:param
+                     name="plugin"
+                     value="properties"/>
+               <h:outputText>&#160;&#160;&#160;</h:outputText>
+            </h:commandLink>
+            <h:commandLink
+                  action="#{portalobjectmgr.selectPlugin}"
+                  style="#{portalobjectmgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:outputText
+                     value="Security"/>
+               <f:param
+                     name="plugin"
+                     value="security"/>
+               <h:outputText>&#160;&#160;&#160;</h:outputText>
+            </h:commandLink>
+            <h:commandLink
+                  action="#{portalobjectmgr.selectPlugin}"
+                  style="#{portalobjectmgr.selectedPlugin == 'theme' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:outputText value="Theme"/>
+               <f:param name="plugin" value="theme"/>
+            </h:commandLink>
+         </h:panelGrid>
+      </h:form>
    </div>
-   <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject != null}"
-         id="pg3">
+   <!--<h:form id="plugin_nav">-->
       <h:panelGroup
-            rendered="#{portalobjectmgr.selectedPlugin == 'security'}">
-         <ui:include src="/WEB-INF/jsp/management/plugins/security.xhtml">
-            <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
-         </ui:include>
+            rendered="#{portalobjectmgr.selectedObject != null}"
+            id="pg3">
+         <h:panelGroup
+               id="theone"
+               rendered="#{portalobjectmgr.selectedPlugin == 'security'}">
+            <ui:include id="theone_one" src="/WEB-INF/jsp/management/plugins/security.xhtml">
+               <ui:param id="theone_two" name="auth" value="#{portalobjectmgr.auth}"/>
+            </ui:include>
+         </h:panelGroup>
+         <h:panelGroup
+               id="thetwo"
+               rendered="#{portalobjectmgr.selectedPlugin == 'theme'}">
+            <ui:include id="thetwo_one" src="/WEB-INF/jsp/management/plugins/theme.xhtml">
+               <ui:param id="thetwo_two" name="themes" value="#{portalobjectmgr.themes}"/>
+            </ui:include>
+         </h:panelGroup>
+         <h:panelGroup
+               id="thethree"
+               rendered="#{portalobjectmgr.selectedPlugin == 'manager'}">
+            <ui:include id="thethree_one" src="/WEB-INF/jsp/management/plugins/manager.xhtml"/>
+         </h:panelGroup>
+         <h:panelGroup
+               id="thefour"
+               rendered="#{portalobjectmgr.selectedPlugin == 'properties'}">
+            <ui:include id="thefour_one" src="/WEB-INF/jsp/management/plugins/properties.xhtml"/>
+         </h:panelGroup>
       </h:panelGroup>
-      <h:panelGroup
-            rendered="#{portalobjectmgr.selectedPlugin == 'theme'}">
-         <ui:include src="/WEB-INF/jsp/management/plugins/theme.xhtml">
-            <ui:param name="themes" value="#{portalobjectmgr.themes}"/>
-         </ui:include>
-      </h:panelGroup>
-      <h:panelGroup
-            rendered="#{portalobjectmgr.selectedPlugin == 'manager'}">
-         <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/>
-      </h:panelGroup>
-      <h:panelGroup
-            rendered="#{portalobjectmgr.selectedPlugin == 'properties'}">
-         <ui:include src="/WEB-INF/jsp/management/plugins/properties.xhtml"/>
-      </h:panelGroup>
-   </h:panelGroup>
+   <!--</h:form>-->
 </h:panelGroup>
 </h:panelGrid>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,45 +1,40 @@
 <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:t="http://myfaces.apache.org/tomahawk">
+   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:t="http://myfaces.apache.org/tomahawk">
 <ui:include src="/WEB-INF/jsp/management/nav.xhtml"/>
 <br/><br/>
-<style type="text/css">
-   .vertTop {
-      vertical-align: top;
-   }
-
-   .menu {
-      background-color: #e6e6fa;
-      border-style: dashed;
-      border-color: black;
-      border-width: 1px;
-   }
-
-   .content {
-      background-color: #f0f8ff;
-      border-style: solid;
-      border-color: black;
-      border-width: 1px;
-   }
-</style>
 <h:panelGrid
-      id="thepanel"
-      columns="3"
-      rowClasses="vertTop"
-      columnClasses="menu,,content">
-   <h:panelGroup
-         id="panel1">
+   id="thepanel"
+   columns="3"
+   rowClasses="vertTop"
+   columnClasses="menu,,content">
+<h:panelGroup
+   id="panel1">
+   <h:form id="instance_list">
       <t:dataTable
-            id="data"
-            var="instance"
-            value="#{instancemgr.instances}"
-            rowClasses="portlet-section-body,portlet-section-alternate">
+         id="instancesTable"
+         var="instance"
+         value="#{instancemgr.instances}"
+         rows="10"
+         sortColumn="#{instancemgr.sortColumn}"
+         sortAscending="#{instancemgr.sortAscending}"
+         rowClasses="portlet-section-body,portlet-section-alternate">
          <h:column>
             <f:facet name="header">
-               <h:outputText value="Id"/>
+               <t:commandSortHeader columnName="id">
+						<f:facet name="ascending">
+						   <t:graphicImage value="/images/management/up.png"
+							        			rendered="true" border="0" />
+						</f:facet>
+						<f:facet name="descending">
+							<t:graphicImage value="/images/management/down.png"
+												rendered="true" border="0" />
+						</f:facet>
+						<h:outputText value="Id"/>
+					</t:commandSortHeader>
             </f:facet>
             <h:commandLink action="#{instancemgr.selectInstance}">
                <h:outputText value="#{instance[0].id}"/>
@@ -48,71 +43,105 @@
          </h:column>
          <h:column>
             <f:facet name="header">
-               <h:outputText value="Portlet"/>
+               <t:commandSortHeader columnName="portlet">
+						<f:facet name="ascending">
+						   <t:graphicImage value="/images/management/up.png"
+							        			rendered="true" border="0" />
+						</f:facet>
+						<f:facet name="descending">
+							<t:graphicImage value="/images/management/down.png"
+												rendered="true" border="0" />
+						</f:facet>
+						<h:outputText value="Portlet"/>
+					</t:commandSortHeader>
             </f:facet>
-            <h:commandLink
-                  rendered="#{instance[1] != null}"
-                  action="#{portletmgr.selectPortlet}">
-               <f:param
-                     name="id"
-                     value="#{instance[1].id}"/>
+            <h:commandLink rendered="#{instance[1] != null}" action="#{portletmgr.selectPortlet}">
+               <f:param name="id" value="#{instance[1].id}"/>
                <h:outputText value="#{instance[1].name}"/>
             </h:commandLink>
-            <h:outputText
-                  rendered="#{instance[1] == null}"
-                  value="Portlet not deployed"/>
+            <h:outputText rendered="#{instance[1] == null}" value="Portlet not deployed"/>
          </h:column>
          <h:column>
             <f:facet name="header">
                <h:outputText value="Action"/>
             </f:facet>
             <h:commandLink action="#{instancemgr.deleteInstance}">
-               <h:graphicImage value="/images/management/delete.png" border="0" alt="Delete"
-                               style="vertical-align:middle;"/>
+               <h:graphicImage value="/images/management/delete.png" alt="Delete"
+                               style="vertical-align:middle;border-width:0"/>
                <f:param name="id" value="#{instance[0].id}"/>
             </h:commandLink>
          </h:column>
       </t:dataTable>
-   </h:panelGroup>
-   <h:panelGroup id="splitter">
-      <h:graphicImage value="/images/management/line-trunk.gif" border="0" height="100%" width="3"/>
-   </h:panelGroup>
-   <h:panelGroup id="pg2">
-      <div align="center">
+      <t:dataScroller id="scrollInstances"
+                      for="instancesTable" fastStep="10"
+                      pageCountVar="instancesPageCount" pageIndexVar="instancesPageIndex"
+                      paginator="true" paginatorMaxPages="9"
+                      paginatorActiveColumnStyle="font-weight:bold;">
+         <f:facet name="first">
+            <t:graphicImage url="/images/management/first.png" border="1"/>
+         </f:facet>
+         <f:facet name="last">
+            <t:graphicImage url="/images/management/last.png" border="1"/>
+         </f:facet>
+         <f:facet name="previous">
+            <t:graphicImage url="/images/management/left.png" border="1"/>
+         </f:facet>
+         <f:facet name="next">
+            <t:graphicImage url="/images/management/right.png" border="1"/>
+         </f:facet>
+         <f:facet name="fastforward">
+            <t:graphicImage url="/images/management/fast-forward.png" border="1"/>
+         </f:facet>
+         <f:facet name="fastrewind">
+            <t:graphicImage url="/images/management/fast-rewind.png" border="1"/>
+         </f:facet>
+      </t:dataScroller>
+   </h:form>
+</h:panelGroup>
+<h:panelGroup id="splitter">
+   <h:graphicImage value="/images/management/line-trunk.gif" height="100%" width="3"/>
+</h:panelGroup>
+<h:panelGroup id="pg2">
+   <div align="center">
+      <h:form id="plugin_nav">
          <h:panelGrid columns="2" border="0" cellspacing="0" cellpadding="0" rowClasses="vertTop">
             <h:commandLink
-                  action="#{instancemgr.selectPlugin}"
-                  style="#{instancemgr.selectedPlugin == 'preferences' ? 'font-weight:bold' : ''}">
-               <h:graphicImage value="/images/management/preferences.png" border="0" style="vertical-align:middle;"/>
-               <h:outputText>&amp;nbsp;</h:outputText>
+               action="#{instancemgr.selectPlugin}"
+               style="#{instancemgr.selectedPlugin == 'preferences' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/preferences.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
                <h:outputText value="Preferences"/>
                <f:param name="plugin" value="preferences"/>
-               <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
+               <h:outputText>&#160;&#160;&#160;</h:outputText>
             </h:commandLink>
             <h:commandLink
-                  action="#{instancemgr.selectPlugin}"
-                  style="#{instancemgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}">
-               <h:graphicImage value="/images/management/security.png" border="0" style="vertical-align:middle;"/>
-               <h:outputText>&amp;nbsp;</h:outputText>
+               action="#{instancemgr.selectPlugin}"
+               style="#{instancemgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
                <h:outputText value="Security"/>
                <f:param name="plugin" value="security"/>
             </h:commandLink>
          </h:panelGrid>
-      </div>
+      </h:form>
+   </div>
+   <h:panelGroup
+      id="pg3"
+      rendered="#{instancemgr.selectedInstance != null}">
       <h:panelGroup
-            id="pg3"
-            rendered="#{instancemgr.selectedInstance != null}">
-         <h:panelGroup
-               rendered="#{instancemgr.selectedPlugin == 'security'}">
-            <ui:include src="/WEB-INF/jsp/management/plugins/security.xhtml">
-               <ui:param name="auth" value="#{instancemgr.auth}"/>
-            </ui:include>
-         </h:panelGroup>
-         <h:panelGroup
-               rendered="#{instancemgr.selectedPlugin == 'preferences'}">
-            <ui:include src="/WEB-INF/jsp/management/plugins/preferences.xhtml"/>
-         </h:panelGroup>
+         rendered="#{instancemgr.selectedPlugin == 'security'}">
+         <ui:include src="/WEB-INF/jsp/management/plugins/security.xhtml">
+            <ui:param name="auth" value="#{instancemgr.auth}"/>
+         </ui:include>
       </h:panelGroup>
+      <h:panelGroup
+         rendered="#{instancemgr.selectedPlugin == 'preferences'}">
+         <ui:include src="/WEB-INF/jsp/management/plugins/preferences.xhtml">
+            <ui:param name="preferences" value="#{instancemgr.selectedPreferences}"/>
+            <ui:param name="action" value="#{preferenceAction}"/>
+         </ui:include>
+      </h:panelGroup>
    </h:panelGroup>
+</h:panelGroup>
 </h:panelGrid>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/nav.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/nav.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/nav.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,27 +1,66 @@
 <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:t="http://myfaces.apache.org/tomahawk">
+   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:t="http://myfaces.apache.org/tomahawk">
+   <script language="javascript">
+      /* <![CDATA[ */
+      <!--
+      var state = 'hidden';
+      var display = 'none';
+      function showhide(layer_ref)
+      {
+         if (state == 'visible')
+         {
+            state = 'hidden';
+            display = 'none';
+         }
+         else
+         {
+            state = 'visible';
+            display = 'block';
+         }
+         if (document.all)
+         { //IS IE 4, 5, or 6)
+            eval("document.all." + layer_ref + ".style.visibility = state");
+            eval("document.all." + layer_ref + ".style.display = display");
+         }
+         if (document.layers)
+         { //IS NETSCAPE 4 or below
+            document.layers[layer_ref].visibility = state;
+            document.layers[layer_ref].display = display;
+         }
+         if (document.getElementById && !document.all)
+         { // FF
+            motobecane = document.getElementById(layer_ref);
+            motobecane.style.visibility = state;
+            motobecane.style.display = display;
+         }
+      }
+      //-->
+      /* ]]> */
+   </script>
    <br/>
-   <h:outputText>Manage:</h:outputText>
-   <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
-   <h:panelGroup id="pgnav1">
-      <h:graphicImage value="/images/management/portal.gif" style="vertical-align:middle;"/>
-      <h:outputText>&amp;nbsp;</h:outputText>
-      <h:commandLink value="Portal" action="portalobjects"/>
-   </h:panelGroup>
-   <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
-   <h:panelGroup id="pgnav2">
-      <h:graphicImage value="/images/management/instance.gif" style="vertical-align:middle;"/>
-      <h:outputText>&amp;nbsp;</h:outputText>
-      <h:commandLink value="Instances" action="instances"/>
-   </h:panelGroup>
-   <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
-   <h:panelGroup id="pgnav3">
-      <h:graphicImage value="/images/management/portlet.gif" style="vertical-align:middle;"/>
-      <h:outputText>&amp;nbsp;</h:outputText>
-      <h:commandLink value="Portlet" action="portlets"/>
-   </h:panelGroup>
+   <h:form id="nav">
+      <h:outputText>Manage:</h:outputText>
+      <h:outputText>&#160;&#160;&#160;</h:outputText>
+      <h:panelGroup id="pgnav1">
+         <h:graphicImage value="/images/management/portal.gif" style="vertical-align:middle;"/>
+         <h:outputText>&#160;</h:outputText>
+         <h:commandLink value="Portal" action="portalobjects"/>
+      </h:panelGroup>
+      <h:outputText>&#160;&#160;&#160;</h:outputText>
+      <h:panelGroup id="pgnav2">
+         <h:graphicImage value="/images/management/instance.gif" style="vertical-align:middle;"/>
+         <h:outputText>&#160;</h:outputText>
+         <h:commandLink value="Instances" action="instances"/>
+      </h:panelGroup>
+      <h:outputText>&#160;&#160;&#160;</h:outputText>
+      <h:panelGroup id="pgnav3">
+         <h:graphicImage value="/images/management/portlet.gif" style="vertical-align:middle;"/>
+         <h:outputText>&#160;</h:outputText>
+         <h:commandLink value="Portlets" action="portlets"/>
+      </h:panelGroup>
+   </h:form>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/manager.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/manager.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/manager.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,32 +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:t="http://myfaces.apache.org/tomahawk">
+   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:t="http://myfaces.apache.org/tomahawk">
 <br/>
 <!-- Context tab -->
 <h:panelGroup
-      id="a"
-      rendered="#{portalobjectmgr.selectedObject.type==0}">
+   id="a"
+   rendered="#{portalobjectmgr.selectedObject.type==0}">
    <h:outputText style="font-weight:bold;" value="Type: "/>
    <f:verbatim>CONTEXT<br/></f:verbatim>
+   <h:form id="portal_form">
+      <h:outputLabel for="name">
+         <h:outputText value="Portal Name: " style="font-weight:bold;"/>
+      </h:outputLabel>
+      <h:inputText id="name" value="#{portalAction.portalName}"
+                   validator="#{portalAction.validatePortalName}"
+                   required="true"/>
+      <h:messages style="color: red"/>
+      <br/>
+      <h:commandButton action="#{portalAction.addPortal}" value="Add portal"/>
+   </h:form>
 </h:panelGroup>
 
 <!-- Portal tab -->
 <h:panelGroup
-      id="b"
-      rendered="#{portalobjectmgr.selectedObject.type==1}">
+   id="b"
+   rendered="#{portalobjectmgr.selectedObject.type==1}">
    <h:outputText style="font-weight:bold;" value="Name: "/>
    <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
    <f:verbatim><br/><br/></f:verbatim>
    <h:outputText style="font-weight:bold;" value="Type: "/>
    <f:verbatim>PORTAL<br/></f:verbatim>
-   <h:form id="portal_form">
+   <h:form id="portal_form_1">
       <h:outputLabel for="name">
-         <h:outputText value="Page Name: " style="font-weight:bold;"/>
+         <h:outputText value="Defaut Page Name: " style="font-weight:bold;"/>
       </h:outputLabel>
-      <h:inputText id="name" value="#{addPageAction.pageName}" validator="#{addPageAction.validatePageName}"
+      <h:selectOneMenu value="#{portalAction.defaultPageName}">
+         <f:selectItems value="#{portalobjectmgr.portalPageItems}"/>
+      </h:selectOneMenu>
+      <br/>
+      <h:commandButton value="Update"/>
+      <br/>
+   </h:form>
+   <h:form id="portal_form_2">
+      <h:outputLabel for="name">
+         <h:outputText value="New Page Name: " style="font-weight:bold;"/>
+      </h:outputLabel>
+      <h:inputText id="name" value="#{addPageAction.pageName}"
+                   validator="#{addPageAction.validatePageName}"
                    required="true"/>
       <h:messages style="color: red"/>
       <br/>
@@ -36,8 +59,8 @@
 
 <!-- Page tab -->
 <h:panelGroup
-      id="c"
-      rendered="#{portalobjectmgr.selectedObject.type==2}">
+   id="c"
+   rendered="#{portalobjectmgr.selectedObject.type==2}">
    <h:outputText style="font-weight:bold;" value="Name: "/>
    <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
    <f:verbatim><br/><br/></f:verbatim>
@@ -45,28 +68,28 @@
    <f:verbatim>PAGE<br/></f:verbatim>
    <h:form id="page_form_2">
       <t:dataTable
-            id="data"
-            var="row"
-            value="#{portalobjectmgr.rows}">
+         id="data"
+         var="row"
+         value="#{portalobjectmgr.rows}">
          <t:columns value="#{portalobjectmgr.cols}" var="col">
             <f:facet name="header">
                <h:outputText value="#{col}"/>
             </f:facet>
             <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}">
                <f:param name="id" value="#{row[col].id}"/>
-               <h:graphicImage value="/images/management/up.png" border="0" style="vertical-align:middle;"/>
+               <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/>
             </h:commandLink>
             <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}">
                <f:param name="id" value="#{row[col].id}"/>
-               <h:graphicImage value="/images/management/down.png" border="0" style="vertical-align:middle;"/>
+               <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/>
             </h:commandLink>
             <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}">
                <f:param name="id" value="#{row[col].id}"/>
-               <h:graphicImage value="/images/management/left.png" border="0" style="vertical-align:middle;"/>
+               <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/>
             </h:commandLink>
             <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}">
                <f:param name="id" value="#{row[col].id}"/>
-               <h:graphicImage value="/images/management/right.png" border="0" style="vertical-align:middle;"/>
+               <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/>
             </h:commandLink>
             <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}">
                <f:param name="id" value="#{row[col].id}"/>
@@ -77,9 +100,9 @@
    </h:form>
    <h:form id="page_form_3">
       <t:dataTable
-            id="data"
-            var="row"
-            value="#{portalobjectmgr.rows}">
+         id="data"
+         var="row"
+         value="#{portalobjectmgr.rows}">
          <t:columns value="#{portalobjectmgr.cols}" var="col">
             <f:facet name="footer">
                <h:commandButton value="Add #{col}" action="#{addWindowAction.execute}"/>
@@ -92,18 +115,32 @@
          <h:inputText value="#{addWindowAction.windowName}"
                       validator="#{addWindowAction.validateWindowName}"
                       required="true"/>
-         &amp;nbsp;
+         &#160;
          <h:selectOneMenu value="#{addWindowAction.instanceId}">
             <f:selectItems value="#{portalobjectmgr.instanceItems}"/>
          </h:selectOneMenu>
       </h:panelGroup>
+
    </h:form>
+
+   <h:form id="page_form_4">
+      <h:outputLabel for="name">
+         <h:outputText value="Page Name: " style="font-weight:bold;"/>
+      </h:outputLabel>
+      <h:inputText id="name" value="#{addPageAction.pageName}"
+                   validator="#{addPageAction.validatePageName}"
+                   required="true"/>
+      <h:messages style="color: red"/>
+      <br/>
+      <h:commandButton action="#{addPageAction.execute}" value="Add page"/>
+   </h:form>
+   <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink>
 </h:panelGroup>
 
 <!-- Window tab -->
 <h:panelGroup
-      id="d"
-      rendered="#{portalobjectmgr.selectedObject.type==3}">
+   id="d"
+   rendered="#{portalobjectmgr.selectedObject.type==3}">
    <h:outputText style="font-weight:bold;" value="Name: "/>
    <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
    <f:verbatim><br/><br/></f:verbatim>
@@ -116,17 +153,20 @@
       <br/>
       <h:commandButton value="Change instance"/>
    </h:form>
+   <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink>
 </h:panelGroup>
 <br/>
 <h:panelGroup
-      id="e"
-      rendered="#{portalobjectmgr.selectedObject != null}">
-   <h:commandLink
+   id="e"
+   rendered="#{portalobjectmgr.selectedObject != null}">
+   <h:form>
+      <h:commandLink
          action="#{portalobjectmgr.destroyObject}">
-      <h:graphicImage value="/images/management/delete.png" border="0" style="vertical-align:middle;"/>
-      <h:outputText>&amp;nbsp;</h:outputText>
-      <h:outputText value="Destroy"/>
-      <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
-   </h:commandLink>
+         <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/>
+         <h:outputText>&#160;</h:outputText>
+         <h:outputText value="Destroy"/>
+         <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+      </h:commandLink>
+   </h:form>
 </h:panelGroup>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -8,7 +8,6 @@
    <h:panelGrid
          rendered="#{portletmgr.selectedPortlet != null}">
       <h:outputText value="Name: #{portletmgr.selectedPortlet.name}"/>
-      <h:outputText value="State: #{portletmgr.selectedPortlet.state}"/>
       <h:outputText value="Description: #{portletmgr.selectedPortlet.description}"/>
       <br/>
       <h:form>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/preferences.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/preferences.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/preferences.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -7,12 +7,12 @@
 <br/>
 <h:panelGroup
       id="panel2"
-      rendered="#{instancemgr.selectedInstance != null}">
+      rendered="#{preferences != null}">
    <h:form>
       <t:dataTable
             id="data__"
             var="row"
-            value="#{instancemgr.selectedPreferences}"
+            value="#{preferences.model}"
             rowClasses="portlet-section-body,portlet-section-alternate">
          <h:column>
             <f:facet name="header">
@@ -22,9 +22,9 @@
          </h:column>
          <h:column>
             <f:facet name="header">
-               <h:outputText value="Description"/>
+               <h:outputText value="Name"/>
             </f:facet>
-            <h:outputText value="#{row.description}"/>
+            <h:outputText value="#{row.name}"/>
          </h:column>
          <h:column>
             <f:facet name="header">
@@ -36,61 +36,47 @@
             <f:facet name="header">
                <h:outputText value="Value"/>
             </f:facet>
+            <h:commandLink
+               rendered="#{row.cell.value != null and preferences.model.mutable}"
+               action="#{action.selectRow}">
+               <h:graphicImage
+                  value="/images/management/edit.png"
+                  border="0"
+                  alt="Edit"
+                  style="vertical-align:middle;"/>
+            </h:commandLink>
+            <h:commandLink
+               rendered="#{row.cell.value != null and preferences.model.mutable}"
+               action="#{action.deleteCell}">
+               <h:graphicImage
+                  value="/images/management/delete.png"
+                  border="0"
+                  alt="Delete"
+                  style="vertical-align:middle;"/>
+            </h:commandLink>
             <h:outputText value="#{row.value}"/>
          </h:column>
-         <t:columns value="#{instancemgr.selectedPreferences.colIndices}" var="index">
-            <f:facet name="header">
-               <h:outputText value="#{instancemgr.selectedPreferences.colDefs[index].label}"/>
-            </f:facet>
-            <h:panelGroup
-                  rendered="#{row.cells[index].mutable}">
-               <h:commandLink
-                     rendered="#{row.cells[index].value != null}"
-                     action="#{preferenceAction.selectCell}">
-                  <h:graphicImage value="/images/management/edit.png" border="0" alt="Edit"
-                                  style="vertical-align:middle;"/>
-                  <!--<h:outputText-->
-                  <!--value="#{row.cells[index].value}"/>-->
-               </h:commandLink>
-               <h:commandLink
-                     rendered="#{row.cells[index].value != null}"
-                     action="#{preferenceAction.deleteCell}">
-                  <h:graphicImage value="/images/management/delete.png" border="0" alt="Delete"
-                                  style="vertical-align:middle;"/>
-               </h:commandLink>
-               <h:commandLink
-                     rendered="#{row.cells[index].value == null}"
-                     action="#{preferenceAction.createCell}">
-                  <h:graphicImage value="/images/management/create.png" border="0" alt="Create"
-                                  style="vertical-align:middle;"/>
-               </h:commandLink>
-            </h:panelGroup>
-            <h:panelGroup
-                  rendered="#{!row.cells[index].mutable}">
-               <h:outputText value="#{row.cells[index].value}"/>
-            </h:panelGroup>
-         </t:columns>
       </t:dataTable>
    </h:form>
 </h:panelGroup>
 <h:panelGroup
-      id="panel3"
-      rendered="#{instancemgr.selectedPreference != null}">
+   id="panel3"
+   rendered="#{preferences.selectedPreference != null}">
    <h:form>
       <t:dataTable
             id="string_values"
             var="row"
-            value="#{instancemgr.selectedPreference.valueIndices}">
+            value="#{preferences.selectedPreference.valueIndices}">
          <h:column>
-            <h:inputText value="#{instancemgr.selectedPreference.value[row]}"/>
-            <h:commandButton action="#{preferenceAction.deleteLine}" value="Delete"/>
+            <h:inputText value="#{preferences.selectedPreference.value[row]}"/>
+            <h:commandButton action="#{action.deleteLine}" value="Delete"/>
          </h:column>
       </t:dataTable>
-      <h:commandButton action="#{preferenceAction.updateCell}" value="Update"/>
+      <h:commandButton action="#{action.updateCell}" value="Update"/>
    </h:form>
    <h:form>
-      <h:inputText value="#{preferenceAction.appendedValue}"/>
-      <h:commandButton action="#{preferenceAction.appendLine}" value="Append"/>
+      <h:inputText value="#{action.appendedValue}"/>
+      <h:commandButton action="#{action.appendLine}" value="Append"/>
    </h:form>
 </h:panelGroup>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/properties.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/properties.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/plugins/properties.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,55 +1,92 @@
 <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:t="http://myfaces.apache.org/tomahawk">
+   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:t="http://myfaces.apache.org/tomahawk">
    <br/>
    <h:outputText style="font-weight:bold;" value="Name: "/>
    <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
    <f:verbatim><br/><br/></f:verbatim>
 
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==0}">
+      rendered="#{portalobjectmgr.selectedObject.type==0}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>CONTEXT<br/></f:verbatim>
    </h:panelGroup>
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==1}">
+      rendered="#{portalobjectmgr.selectedObject.type==1}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>PORTAL<br/></f:verbatim>
    </h:panelGroup>
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==2}">
+      rendered="#{portalobjectmgr.selectedObject.type==2}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>PAGE<br/></f:verbatim>
    </h:panelGroup>
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==3}">
+      rendered="#{portalobjectmgr.selectedObject.type==3}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>WINDOW<br/></f:verbatim>
    </h:panelGroup>
    <br/><br/>
 
    <h:panelGroup
-         id="prop_a">
-      <t:dataTable
+      id="prop_a">
+      <h:form id="properties_form">
+         <t:dataTable
             id="data"
             var="p"
             value="#{portalobjectmgr.selectedProperties}"
+            binding="#{propertyAction.propertyDataTable}"
             rowClasses="portlet-section-body,portlet-section-alternate">
-         <h:column>
-            <f:facet name="header">
-               <h:outputText value="Name"/>
-            </f:facet>
-            <h:outputText value="#{p[0]}"/>
-         </h:column>
-         <h:column>
-            <f:facet name="header">
-               <h:outputText value="Value"/>
-            </f:facet>
-            <h:outputText value="#{p[1]}"/>
-         </h:column>
-      </t:dataTable>
+            <h:column>
+               <f:facet id="the_id_that_fixes_the_bug_1" name="header">
+                  <h:outputText id="the_id_that_fixes_the_bug_2" value="Operations"/>
+               </f:facet>
+               <h:commandLink
+                  id="properties_form_link1"
+                  action="#{propertyAction.selectProperty}">
+                  <h:graphicImage
+                     value="/images/management/edit.png"
+                     border="0"
+                     alt="Edit"
+                     style="vertical-align:middle;"/>
+               </h:commandLink>
+               <h:commandLink
+                  id="properties_form_link2"
+                  action="#{propertyAction.removeProperty}">
+                  <h:graphicImage
+                     value="/images/management/delete.png"
+                     border="0"
+                     alt="Delete"
+                     style="vertical-align:middle;"/>
+               </h:commandLink>
+               <h:outputText value="#{row.value}"/>
+            </h:column>
+            <h:column>
+               <f:facet id="the_id_that_fixes_the_bug_3" name="header">
+                  <h:outputText id="the_id_that_fixes_the_bug_4" value="Name"/>
+               </f:facet>
+               <h:outputText value="#{p[0]}"/>
+            </h:column>
+            <h:column>
+               <f:facet id="the_id_that_fixes_the_bug_5" name="header">
+                  <h:outputText id="the_id_that_fixes_the_bug_6" value="Value"/>
+               </f:facet>
+               <h:outputText value="#{p[1]}"/>
+            </h:column>
+         </t:dataTable>
+         <br/>
+         <h:messages style="color: red"/>
+         <h:outputText style="font-weight:bold;" value="Property Name: "/>
+         <h:inputText value="#{propertyAction.selectedProperty}"
+                       validator="#{propertyAction.validatePropertyName}" />
+         <br/>
+         <h:outputText style="font-weight:bold;" value="Property Value: "/>
+         <h:inputText value="#{propertyAction.propertyValue}"/>
+         <br/>
+         <h:commandButton action="#{propertyAction.updateProperty}" value="Update"/>
+      </h:form>
    </h:panelGroup>
 </div>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,117 +1,189 @@
 <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:t="http://myfaces.apache.org/tomahawk">
+   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:t="http://myfaces.apache.org/tomahawk">
 <ui:include src="/WEB-INF/jsp/management/nav.xhtml"/>
 <br/><br/>
-<style type="text/css">
-   .vertTop {
-      vertical-align: top;
-   }
-
-   .menu {
-      background-color: #e6e6fa;
-      border-style: dashed;
-      border-color: black;
-      border-width: 1px;
-   }
-
-   .content {
-      background-color: #f0f8ff;
-      border-style: solid;
-      border-color: black;
-      border-width: 1px;
-   }
-</style>
 <h:panelGrid
-      id="thepanel"
-      columns="3"
-      rowClasses="vertTop"
-      columnClasses="menu,,content">
-   <h:panelGroup
-         id="panel1">
+   id="federateddropdown">
+   <h:form name="menu">
+      <h:selectOneMenu
+         id="menu"
+         value="#{portletmgr.selectedFederatedId}">
+         <f:selectItems value="#{portletmgr.federatedIds}"/>
+      </h:selectOneMenu>
+      <h:commandButton value="Change portlet provider"/>
+   </h:form>
+</h:panelGrid>
+<h:panelGrid
+   id="thepanel"
+   columns="3"
+   rowClasses="vertTop"
+   columnClasses="menu,,content">
+<h:panelGroup
+   id="panel1">
+   <h:form name="portlets">
       <t:dataTable
-            var="webapp"
-            value="#{portletmgr.webAppRegistry.allWebApp}">
+         id="portletsTable"
+         var="portlet"
+         value="#{portletmgr.portlets}"
+         rows="10"
+         sortColumn="#{portletmgr.sortColumn}"
+         sortAscending="#{portletmgr.sortAscending}"
+         rowClasses="portlet-section-body,portlet-section-alternate">
          <h:column>
-            <h:outputLabel for="webappid" value="Web application id : "/>
-            <h:outputText id="webappid" value="#{webapp.id}"/>
-            <h:outputText value="#{webapp.contextPath}"/>
-            <t:dataTable
-                  id="portlets"
-                  var="portlet"
-                  value="#{webapp.components}"
-                  rowClasses="portlet-section-body,portlet-section-alternate">
-               <h:column>
-                  <f:facet name="header">
-                     <h:outputText value="Name"/>
-                  </f:facet>
-                  <h:commandLink
-                        action="#{portletmgr.selectPortlet}">
-                     <f:param
-                           name="id"
-                           value="#{portlet.id}"/>
-                     <h:outputText value="#{portlet.name}"/>
-                  </h:commandLink>
-               </h:column>
-               <h:column>
-                  <f:facet name="header">
-                     <h:outputText value="State"/>
-                  </f:facet>
-                  <h:outputText value="#{portlet.state}"/>
-               </h:column>
-               <h:column>
-                  <f:facet name="header">
-                     <h:outputText value="Description"/>
-                  </f:facet>
-                  <h:outputText value="#{portlet.description}"/>
-               </h:column>
-            </t:dataTable>
+            <f:facet name="header">
+               <t:commandSortHeader columnName="id">
+						<f:facet name="ascending">
+						   <t:graphicImage value="/images/management/up.png"
+							        			rendered="true" border="0" />
+						</f:facet>
+						<f:facet name="descending">
+							<t:graphicImage value="/images/management/down.png"
+												rendered="true" border="0" />
+						</f:facet>
+						<h:outputText value="Id"/>
+					</t:commandSortHeader>
+            </f:facet>
+            <h:commandLink
+               action="#{portletmgr.selectPortlet}">
+               <f:param
+                  name="id"
+                  value="#{portlet.id}"/>
+               <h:outputText value="#{portlet.id}"/>
+            </h:commandLink>
          </h:column>
+         <h:column>
+            <f:facet name="header">
+               <t:commandSortHeader columnName="name">
+						<f:facet name="ascending">
+						   <t:graphicImage value="/images/management/up.png"
+							        			rendered="true" border="0" />
+						</f:facet>
+						<f:facet name="descending">
+							<t:graphicImage value="/images/management/down.png"
+												rendered="true" border="0" />
+						</f:facet>
+						<h:outputText value="Name"/>
+					</t:commandSortHeader>
+            </f:facet>
+            <h:outputText value="#{portlet.name}"/>
+         </h:column>
+         <h:column>
+            <f:facet name="header">
+               <h:outputText value="Remote"/>
+            </f:facet>
+            <h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/>
+         </h:column>
+         <h:column>
+            <f:facet name="header">
+               <h:outputText value="Remotable"/>
+            </f:facet>
+            <h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/>
+         </h:column>
+         <h:column>
+            <f:facet name="header">
+               <t:commandSortHeader columnName="description">
+						<f:facet name="ascending">
+						   <t:graphicImage value="/images/management/up.png"
+							        			rendered="true" border="0" />
+						</f:facet>
+						<f:facet name="descending">
+							<t:graphicImage value="/images/management/down.png"
+												rendered="true" border="0" />
+						</f:facet>
+						<h:outputText value="Description"/>
+					</t:commandSortHeader>
+            </f:facet>
+            <h:outputText value="#{portlet.description}"/>
+         </h:column>
       </t:dataTable>
-   </h:panelGroup>
-   <h:panelGroup id="splitter">
-      <h:graphicImage value="/images/management/line-trunk.gif" border="0" height="100%" width="3"/>
-   </h:panelGroup>
-   <h:panelGroup id="pg2">
-      <div align="center">
-         <h:panelGrid id="pg3" columns="3" border="0" cellspacing="0" cellpadding="0" rowClasses="vertTop">
+      <t:dataScroller id="scrollPortlets"
+                      for="portletsTable" fastStep="10"
+                      pageCountVar="portletsPageCount" pageIndexVar="portletsPageIndex"
+                      paginator="true" paginatorMaxPages="9"
+                      paginatorActiveColumnStyle="font-weight:bold;">
+         <f:facet name="first">
+            <t:graphicImage url="/images/management/first.png" border="1"/>
+         </f:facet>
+         <f:facet name="last">
+            <t:graphicImage url="/images/management/last.png" border="1"/>
+         </f:facet>
+         <f:facet name="previous">
+            <t:graphicImage url="/images/management/left.png" border="1"/>
+         </f:facet>
+         <f:facet name="next">
+            <t:graphicImage url="/images/management/right.png" border="1"/>
+         </f:facet>
+         <f:facet name="fastforward">
+            <t:graphicImage url="/images/management/fast-forward.png" border="1"/>
+         </f:facet>
+         <f:facet name="fastrewind">
+            <t:graphicImage url="/images/management/fast-rewind.png" border="1"/>
+         </f:facet>
+      </t:dataScroller>
+   </h:form>
+</h:panelGroup>
+<h:panelGroup id="splitter">
+   <h:graphicImage value="/images/management/line-trunk.gif" height="100%" width="3"/>
+</h:panelGroup>
+<h:panelGroup id="pg2">
+   <div align="center">
+      <h:form id="plugin_nav">
+         <h:panelGrid id="pg3" columns="5" border="0" cellspacing="0" cellpadding="0" rowClasses="vertTop">
             <h:commandLink
-                  action="#{portletmgr.selectPlugin}"
-                  style="#{portletmgr.selectedPlugin == 'manager' ? 'font-weight:bold' : ''}">
-               <h:graphicImage value="/images/management/manage.png" border="0" style="vertical-align:middle;"/>
-               <h:outputText>&amp;nbsp;</h:outputText>
+               action="#{portletmgr.selectPlugin}"
+               style="#{portletmgr.selectedPlugin == 'manager' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
                <h:outputText value="Manager"/>
                <f:param name="plugin" value="manager"/>
             </h:commandLink>
-            <h:outputText>&amp;nbsp;&amp;nbsp;&amp;nbsp;</h:outputText>
+            <h:outputText>&#160;&#160;&#160;</h:outputText>
             <h:commandLink
-                  action="#{portletmgr.selectPlugin}"
-                  style="#{portletmgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}">
-               <h:graphicImage value="/images/management/security.png" border="0" style="vertical-align:middle;"/>
-               <h:outputText>&amp;nbsp;</h:outputText>
+               action="#{portletmgr.selectPlugin}"
+               style="#{portletmgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
                <h:outputText value="Security"/>
                <f:param name="plugin" value="security"/>
             </h:commandLink>
+            <h:outputText>&#160;&#160;&#160;</h:outputText>
+            <h:commandLink
+               action="#{portletmgr.selectPlugin}"
+               style="#{portletmgr.selectedPlugin == 'preferences' ? 'font-weight:bold' : ''}">
+               <h:graphicImage value="/images/management/preferences.png" style="vertical-align:middle;border-width:0"/>
+               <h:outputText>&#160;</h:outputText>
+               <h:outputText value="Preferences"/>
+               <f:param name="plugin" value="preferences"/>
+            </h:commandLink>
          </h:panelGrid>
-      </div>
+      </h:form>
+   </div>
+   <h:panelGroup
+      id="pg4"
+      rendered="#{portletmgr.selectedPortlet != null}">
+      <!--
+               <h:panelGroup
+                     rendered="#{portletmgr.selectedPlugin == 'security'}">
+                  <ui:include src="/WEB-INF/jsp/management/plugins/security.xhtml">
+                     <ui:param name="auth" value="#{portletmgr.auth}"/>
+                  </ui:include>
+               </h:panelGroup>
+      -->
       <h:panelGroup
-            id="pg4"
-            rendered="#{portletmgr.selectedPortlet != null}">
-         <h:panelGroup
-               rendered="#{portletmgr.selectedPlugin == 'security'}">
-            <ui:include src="/WEB-INF/jsp/management/plugins/security.xhtml">
-               <ui:param name="auth" value="#{portletmgr.auth}"/>
-            </ui:include>
-         </h:panelGroup>
-         <h:panelGroup
-               rendered="#{portletmgr.selectedPlugin == 'manager'}">
-            <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/>
-         </h:panelGroup>
+         rendered="#{portletmgr.selectedPlugin == 'manager'}">
+         <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/>
       </h:panelGroup>
+      <h:panelGroup
+         rendered="#{instancemgr.selectedPlugin == 'preferences'}">
+         <ui:include src="/WEB-INF/jsp/management/plugins/preferences.xhtml">
+            <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/>
+         </ui:include>
+      </h:panelGroup>
    </h:panelGroup>
+</h:panelGroup>
 </h:panelGrid>
 </div>
-

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRoleMembers.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRoleMembers.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRoleMembers.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -5,7 +5,7 @@
 <portlet:defineObjects/>
 
 <div align="center">
-<form id="editRoleMembers" action="<portlet:renderURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:renderURL>" method="post">
+<form id="editRoleMembers" action="<portlet:actionURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:actionURL>" method="post">
    <table border="0" class="portlet-font" cellspacing="0" cellpadding="5">
       	  <tr>
 	  	<td colspan="2" class="portlet-section-alternate" align="left">

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -18,7 +18,7 @@
          <tr>
             <td class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}</td>
             <td><input type="text" name="realemail" value="${n:out("REALEMAIL")}" size="30" maxlength="60">&nbsp;<span class="portlet-font">${n:i18n("REQUIRED")}</span> <n:error key="realemail_error"/></td>
-			<td></td>
+         <td></td>
          </tr>
          <tr>
             <td>&nbsp;</td>
@@ -60,6 +60,17 @@
                </select>
             </td>
          </tr>
+         <tr>
+            <td class="portlet-form-label">${n:i18n("REGISTER_THEME")}</td>
+            <td>
+               <select name="theme" class="pn-normal">
+                 <option value="" selected>${n:i18n("REGISTER_DEFAULT_THEME")}</option>
+                 <n:iterate ctx="theme">
+                   <option value="${n:out("theme.id")}" ${n:out("theme.selected")}>${n:out("theme.id")}</option>
+                 </n:iterate>
+               </select>
+            </td>
+         </tr>
          <%--tr>
             <td>${n:i18n("REGISTER_YOURAVATAR")}</td>
             <td>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -4,7 +4,7 @@
 <%@ page isELIgnored ="false" %> 
 <span class="portlet-font"><a href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
 
-<form action="<portlet:renderURL><portlet:param name="op" value="showListUsers"/></portlet:renderURL>" method="post">
+<form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
 <table>
 <tr class="portlet-section-header">
   <th colspan="2">${n:i18n("LIST_FILTERS")}</th>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -22,7 +22,20 @@
   <tr>
     <td class="portlet-section-body">
       <a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>">
-         <img src="<%= renderRequest.getContextPath() %>/images/user/logout.gif" border="0" align="absmiddle" /></a>&nbsp;<a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>">${n:i18n("MENU_LOGOUT")}</a>
+         <img src="<%= renderRequest.getContextPath() %>/images/user/logout.gif" border="0" align="absmiddle" />
+      </a>&nbsp;<a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>">${n:i18n("MENU_LOGOUT")}</a>
     </td>
   </tr>
+
+  <%--
+  todo : find a way to get the base url of the portal to use as locationURL
+  <tr>
+    <td class="portlet-section-body">
+      <a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/><portlet:param name="locationURL" value=""/></portlet:actionURL>">
+        <img src="<%= renderRequest.getContextPath() %>/images/user/logout.gif" border="0" align="absmiddle" />
+      </a>&nbsp;<a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/><portlet:param name="locationURL" value="/portal/portal/default/default"/></portlet:actionURL>">Logout and return to default page</a>
+    </td>
+  </tr>
+  --%>
+
 </table>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <portal-strategies>
-   <set name="default">
-      <strategy content-type="text/html">
-         <implementation>org.jboss.portal.theme.impl.strategy.DefaultStrategyImpl</implementation>
-      </strategy>
-   </set>
    <set name="maximizedRegion">
       <strategy content-type="text/html">
          <implementation>org.jboss.portal.theme.impl.strategy.MaximizingStrategyImpl</implementation>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,57 @@
+<?xml version="1.0" standalone="yes"?>
+<deployments>
+   <deployment>
+      <instance>
+         <instance-id>NavigationPortletInstance</instance-id>
+         <portlet-ref>NavigationPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>UserPortletInstance</instance-id>
+         <portlet-ref>UserPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>RolePortletInstance</instance-id>
+         <portlet-ref>RolePortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CatalogPortletInstance</instance-id>
+         <portlet-ref>CatalogPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CMSPortletInstance</instance-id>
+         <portlet-ref>CMSPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>CMSAdminPortletInstance</instance-id>
+         <portlet-ref>CMSAdminPortlet</portlet-ref>
+         <security-constraint>
+            <policy-permission>
+               <role-name>Admin</role-name>
+               <action-name>view</action-name>
+            </policy-permission>
+         </security-constraint>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>ManagementPortletInstance</instance-id>
+         <portlet-ref>ManagementPortlet</portlet-ref>
+         <security-constraint>
+            <policy-permission>
+               <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/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -2,10 +2,12 @@
 <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 /opt/SUNWps/dtd/portlet.xsd"
+      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>Portlet providing user login/logout and profile management</description>
       <portlet-name>UserPortlet</portlet-name>
+      <display-name>User Portlet</display-name>
       <portlet-class>org.jboss.portal.core.portlet.user.UserPortlet</portlet-class>
       <init-param>
          <description>Whether we should use ssl on login and throughout the Portal. 1=yes;0=no</description>
@@ -15,7 +17,9 @@
       <init-param>
          <description>Subscription mode</description>
          <name>subscriptionMode</name>
-         <!--         <value>emailVerification</value>-->
+         <!--
+         <value>emailVerification</value>
+         -->
          <value>automatic</value>
       </init-param>
       <init-param>
@@ -49,13 +53,11 @@
       </security-role-ref>
    </portlet>
    <portlet>
+      <description>Content Management System Portlet</description>
       <portlet-name>CMSPortlet</portlet-name>
+      <display-name>Content Management System Portlet</display-name>
+
       <portlet-class>org.jboss.portal.core.portlet.cms.CMSPortlet</portlet-class>
-      <init-param>
-         <description>Default path to index page.</description>
-         <name>indexpage</name>
-         <value>/default/index.html</value>
-      </init-param>
       <supports>
          <mime-type>text/html</mime-type>
          <portlet-mode>VIEW</portlet-mode>
@@ -67,9 +69,17 @@
       <portlet-info>
          <title>CMS</title>
       </portlet-info>
+      <portlet-preferences>
+         <preference>
+            <name>indexpage</name>
+            <value>/default/index.html</value>
+         </preference>
+      </portlet-preferences>
    </portlet>
    <portlet>
+      <description>Portlet for managing user roles</description>
       <portlet-name>RolePortlet</portlet-name>
+      <display-name>User Roles Portlet</display-name>
       <portlet-class>org.jboss.portal.core.portlet.role.RolePortlet</portlet-class>
       <supports>
          <mime-type>text/html</mime-type>
@@ -87,7 +97,9 @@
       </security-role-ref>
    </portlet>
    <portlet>
+      <description>Administration Portlet for CMS</description>
       <portlet-name>CMSAdminPortlet</portlet-name>
+      <display-name>Content Management System Administration Portlet</display-name>
       <portlet-class>org.jboss.portal.core.portlet.cms.admin.CMSAdminPortlet</portlet-class>
       <supports>
          <mime-type>text/html</mime-type>
@@ -102,7 +114,9 @@
       </portlet-info>
    </portlet>
    <portlet>
+      <description>Portlet providing navigable list of portal pages</description>
       <portlet-name>CatalogPortlet</portlet-name>
+      <display-name>Portal Pages Catalog Portlet</display-name>
       <portlet-class>org.jboss.portal.core.portlet.catalog.CatalogPortlet</portlet-class>
       <supports>
          <mime-type>text/html</mime-type>
@@ -113,32 +127,9 @@
       </portlet-info>
    </portlet>
    <portlet>
-      <portlet-name>ThemeManager</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.theme.ThemeManagerPortlet</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>Manage Portal Themes and Layouts</title>
-      </portlet-info>
-   </portlet>
-   <portlet>
-      <portlet-name>PolicyConfiguratorPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.policy.PolicyConfiguratorPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-         <portlet-mode>EDIT</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Configure Portal Policy</title>
-      </portlet-info>
-   </portlet>
-   <portlet>
+      <description>Administration portlet for portal pages administration</description>
       <portlet-name>ManagementPortlet</portlet-name>
+      <display-name>Portal Management Portlet</display-name>
       <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
       <init-param>
          <name>default-view</name>
@@ -147,13 +138,16 @@
       <expiration-cache>-1</expiration-cache>
       <supports>
          <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
       </supports>
       <portlet-info>
          <title>Management Portlet</title>
       </portlet-info>
    </portlet>
    <portlet>
+      <description>Portlet providing navigable tabs with portal pages</description>
       <portlet-name>NavigationPortlet</portlet-name>
+      <display-name>Navigation Portlet</display-name>
       <portlet-class>org.jboss.portal.core.portlet.catalog.NavigationPortlet</portlet-class>
       <supports>
          <mime-type>text/html</mime-type>
@@ -163,17 +157,6 @@
          <title>Portal Navigation</title>
       </portlet-info>
    </portlet>
-   <portlet>
-      <portlet-name>ThemeSelectorPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.theme.ThemeSelectorPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>Select the Portal Theme</title>
-      </portlet-info>
-   </portlet>
    <user-attribute>
       <name>user.name.nickName</name>
    </user-attribute>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,8 +1,9 @@
 <?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>
+<web-app
+   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"
+   version="2.4">
    <context-param>
       <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
       <param-value>true</param-value>
@@ -16,6 +17,10 @@
       <param-value>false</param-value>
    </context-param>
    <context-param>
+      <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+      <param-value>false</param-value>
+   </context-param>
+   <context-param>
       <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
       <param-value>true</param-value>
    </context-param>
@@ -26,47 +31,47 @@
    <context-param>
       <param-name>facelets.LIBRARIES</param-name>
       <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
-    </context-param>
-    <context-param>
+   </context-param>
+   <context-param>
       <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
       <param-value>.xhtml</param-value>
-    </context-param>
+   </context-param>
    <context-param>
       <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-      <param-value>server</param-value>
+      <param-value>client</param-value>
    </context-param>
-    <!-- Extensions Filter -->
-    <filter>
+   <!-- Extensions Filter -->
+   <filter>
       <filter-name>extensionsFilter</filter-name>
       <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
       <init-param>
-          <param-name>uploadMaxFileSize</param-name>
-          <param-value>100m</param-value>
-          <description>Set the size limit for uploaded files.
-              Format: 10 - 10 bytes
-                      10k - 10 KB
-                      10m - 10 MB
-                      1g - 1 GB
-          </description>
+         <description>Set the size limit for uploaded files.
+            Format: 10 - 10 bytes
+            10k - 10 KB
+            10m - 10 MB
+            1g - 1 GB
+         </description>
+         <param-name>uploadMaxFileSize</param-name>
+         <param-value>100m</param-value>
       </init-param>
       <init-param>
-          <param-name>uploadThresholdSize</param-name>
-          <param-value>100k</param-value>
-          <description>Set the threshold size - files
-                  below this limit are stored in memory, files above
-                  this limit are stored on disk.
+         <description>Set the threshold size - files
+            below this limit are stored in memory, files above
+            this limit are stored on disk.
 
-              Format: 10 - 10 bytes
-                      10k - 10 KB
-                      10m - 10 MB
-                      1g - 1 GB
-          </description>
+            Format: 10 - 10 bytes
+            10k - 10 KB
+            10m - 10 MB
+            1g - 1 GB
+         </description>
+         <param-name>uploadThresholdSize</param-name>
+         <param-value>100k</param-value>
       </init-param>
       <!--        <init-param>
+          <description>Set the path where the intermediary files will be stored.
+          </description>
           <param-name>uploadRepositoryPath</param-name>
           <param-value>/temp</param-value>
-          <description>Set the path where the intermediary files will be stored.
-          </description>
       </init-param>-->
    </filter>
    <filter-mapping>
@@ -74,17 +79,27 @@
       <url-pattern>/faces/*</url-pattern>
    </filter-mapping>
    <listener>
-      <listener-class> org.apache.myfaces.webapp.StartupServletContextListener </listener-class>
+      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
    </listener>
-   <!--
-     <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-     </servlet>
-     <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>/faces/*</url-pattern>
-     </servlet-mapping>
-   -->
+
+   <!-- TODO: secure with portal permissions -->
+   <servlet>
+      <servlet-name>CMSPreviewServlet</servlet-name>
+      <servlet-class>org.jboss.portal.core.cms.servlet.CMSPreviewServlet</servlet-class>
+      <load-on-startup>0</load-on-startup>
+   </servlet>
+   <servlet>
+      <servlet-name>CMSExportServlet</servlet-name>
+      <servlet-class>org.jboss.portal.core.cms.servlet.CMSExportServlet</servlet-class>
+      <load-on-startup>0</load-on-startup>
+   </servlet>
+   <servlet-mapping>
+      <servlet-name>CMSPreviewServlet</servlet-name>
+      <url-pattern>/cmspreview/*</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>CMSExportServlet</servlet-name>
+      <url-pattern>/cmsexport/*</url-pattern>
+   </servlet-mapping>
+   <!-- -->
 </web-app>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/export_archive.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/export_archive.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/export_pickup.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/export_pickup.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/upload_archive.gif
===================================================================
(Binary files differ)

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/fast-forward.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/fast-forward.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/fast-rewind.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/fast-rewind.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/first.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/first.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/help.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/help.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/last.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/last.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/management.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/management.css	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/management.css	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,31 @@
+.vertTop {
+   vertical-align: top;
+}
+
+.menu {
+   background-color: #e6e6fa;
+   border-style: dashed;
+   border-color: black;
+   border-width: 1px;
+}
+
+.content {
+   /* background-color: #f0f8ff; */
+   border-style: solid;
+   border-color: black;
+   border-width: 0px 0px 0px 1px;
+   padding: 4px;
+}
+
+.tooltip {
+
+}
+
+.helpblock {
+   background-color: #FFFF99;
+   border-style: dashed;
+   border-color: black;
+   border-width: 1px;
+   padding: 4px;
+   margin: 2px;
+}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/page-closed.png
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/page-open.png
===================================================================
(Binary files differ)

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/context.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/context.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/page.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/page.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/portal.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/portal.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/window.png
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/tree/window.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/management/window.png
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/phalanx/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/phalanx/index.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/phalanx/index.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -132,4 +132,4 @@
 </div>
 <br>
 </body>
-</html>
+</html>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_06-64 ("Apple Computer, Inc.")
-

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,2 @@
+javax.portlet.preference.description.RssXml=RSS feed URL
+javax.portlet.preference.description.expires=Expiration time

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,2 @@
+javax.portlet.preference.description.RssXml=URL du flux RSS
+javax.portlet.preference.description.expires=Temps d'expiration

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -34,31 +34,13 @@
             <window-name>TestPortletWindow</window-name>
             <instance-ref>TestPortletInstance</instance-ref>
             <region>center</region>
-            <height>1</height>
-         </window>
-         <window>
-            <window-name>CMSPortletWindow</window-name>
-            <instance-ref>CMSPortletInstance</instance-ref>
-            <region>center</region>
-            <height>2</height>
-         </window>
-         <window>
-            <window-name>PreferencesPortletWindow</window-name>
-            <instance-ref>PreferencesPortletInstance</instance-ref>
-            <region>center</region>
-            <height>3</height>
-         </window>
-         <window>
-            <window-name>UserPortletWindow</window-name>
-            <instance-ref>UserPortletInstance</instance-ref>
-            <region>left</region>
             <height>0</height>
          </window>
          <window>
             <window-name>CatalogPortletWindow</window-name>
             <instance-ref>CatalogPortletInstance</instance-ref>
             <region>left</region>
-            <height>1</height>
+            <height>0</height>
          </window>
          <page>
             <page-name>event test</page-name>
@@ -132,6 +114,12 @@
                </properties>
             </window>
             <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>
@@ -165,6 +153,12 @@
                </properties>
             </window>
             <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>
@@ -198,6 +192,12 @@
                </properties>
             </window>
             <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>
@@ -237,6 +237,12 @@
                </properties>
             </window>
             <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>
@@ -270,6 +276,12 @@
                </properties>
             </window>
             <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>
@@ -277,7 +289,7 @@
             </window>
          </page>
          <page>
-            <page-name>missing instance</page-name>
+            <page-name>URL portlet</page-name>
             <window>
                <window-name>NavigationPortletWindow</window-name>
                <instance-ref>NavigationPortletInstance</instance-ref>
@@ -303,14 +315,20 @@
                </properties>
             </window>
             <window>
-               <window-name>MissingInstanceWindow</window-name>
-               <instance-ref>MissingInstance</instance-ref>
+               <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>charset test</page-name>
+            <page-name>missing instance</page-name>
             <window>
                <window-name>NavigationPortletWindow</window-name>
                <instance-ref>NavigationPortletInstance</instance-ref>
@@ -342,35 +360,14 @@
                <height>0</height>
             </window>
             <window>
-               <window-name>CharsetPortletWindow</window-name>
-               <instance-ref>CharsetPortletInstance</instance-ref>
+               <window-name>MissingInstanceWindow</window-name>
+               <instance-ref>MissingInstance</instance-ref>
                <region>center</region>
                <height>0</height>
             </window>
          </page>
          <page>
-            <page-name>theme test</page-name>
-            <properties>
-               <!-- set a different (from the portal) property (properties) for this page -->
-               <!--
-               <property>
-                  <name>org.jboss.portal.property.layout</name>
-                  <value>some other layout from /WEB-INF/portal-layouts.xml</value>
-               </property>
-               <property>
-                  <name>org.jboss.portal.property.strategy</name>
-                  <value>some other strategy from /WEB-INF/layout/portal-strategies.xml</value>
-               </property>
-               <property>
-                  <name>org.jboss.portal.property.renderSet</name>
-                  <value>some other render set from /WEB-INF/layouts/portal-renderSet.xml</value>
-               </property>
-               <property>
-                  <name>org.jboss.portal.property.theme</name>
-                  <value>some other theme from /WEB-INF/portal-themes.xml</value>
-               </property>
-               -->
-            </properties>
+            <page-name>charset test</page-name>
             <window>
                <window-name>NavigationPortletWindow</window-name>
                <instance-ref>NavigationPortletInstance</instance-ref>
@@ -402,45 +399,53 @@
                <height>0</height>
             </window>
             <window>
-               <window-name>ThemeSelectorWindow</window-name>
-               <instance-ref>ThemeSelectorInstance</instance-ref>
-               <region>left</region>
-               <height>1</height>
+               <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>ContentRewriteWindow</window-name>
-               <instance-ref>ContentRewriteInstance</instance-ref>
-               <region>left</region>
-               <height>2</height>
-            </window>
-            <window>
-               <window-name>HeaderContentWindow</window-name>
-               <instance-ref>HeaderContentInstance</instance-ref>
-               <region>left</region>
-               <height>3</height>
-            </window>
-            <window>
-               <window-name>HintPortletWindow</window-name>
-               <instance-ref>HintPortletInstance</instance-ref>
-               <region>center</region>
+               <window-name>NavigationPortletWindow</window-name>
+               <instance-ref>NavigationPortletInstance</instance-ref>
+               <region>navigation</region>
                <height>0</height>
+               <!-- keep portal and page properties for this window -->
                <properties>
-                  <!-- turn the decoration off for this portlet (i.e. no title and mode/state links) -->
+                  <!-- use the window renderer from the emptyRenderer renderSet -->
                   <property>
+                     <name>theme.windowRendererId</name>
+                     <value>emptyRenderer</value>
+                  </property>
+                  <!-- use the decoration renderer from the emptyRenderer renderSet -->
+                  <property>
                      <name>theme.decorationRendererId</name>
                      <value>emptyRenderer</value>
                   </property>
+                  <!-- use the portlet renderer from the emptyRenderer renderSet -->
+                  <property>
+                     <name>theme.portletRendererId</name>
+                     <value>emptyRenderer</value>
+                  </property>
                </properties>
             </window>
             <window>
-               <window-name>WsrpSelectorTestWindow</window-name>
-               <instance-ref>WsrpSelectorTestPortletInstance</instance-ref>
+               <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>1</height>
+               <height>0</height>
             </window>
          </page>
          <page>
-            <page-name>theme selector</page-name>
+            <page-name>header test</page-name>
             <window>
                <window-name>NavigationPortletWindow</window-name>
                <instance-ref>NavigationPortletInstance</instance-ref>
@@ -472,143 +477,12 @@
                <height>0</height>
             </window>
             <window>
-               <window-name>ThemePortletWindow</window-name>
-               <instance-ref>ThemePortletInstance</instance-ref>
+               <window-name>HeaderContentPortletWindow</window-name>
+               <instance-ref>HeaderContentPortletInstance</instance-ref>
                <region>center</region>
                <height>0</height>
             </window>
          </page>
       </page>
    </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>TestPortletInstance</instance-name>
-         <component-ref>samples.TestPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>CounterPortletInstance</instance-name>
-         <component-ref>samples.CounterPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>CachedCounterPortletInstance</instance-name>
-         <component-ref>samples.CachedCounterPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>PortletSessionPortletInstance</instance-name>
-         <component-ref>samples.PortletSessionPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>CharsetPortletInstance</instance-name>
-         <component-ref>samples.CharsetPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>ExceptionPortletInstance</instance-name>
-         <component-ref>samples.ExceptionPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>MissingPortletInstance</instance-name>
-         <component-ref>samples.MissingPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>PreferencesPortletInstance</instance-name>
-         <component-ref>samples.PreferencesPortlet</component-ref>
-         <preferences>
-            <preference>
-               <name>one</name>
-               <value>1.5</value>
-            </preference>
-            <preference>
-               <name>two</name>
-               <value>2.5</value>
-               <value>3.5</value>
-               <value></value>
-               <value>4.5</value>
-               <read-only>true</read-only>
-            </preference>
-            <preference>
-               <name>three</name>
-               <value>3.5</value>
-               <read-only>true</read-only>
-            </preference>
-         </preferences>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>PortletAInstance</instance-name>
-         <component-ref>samples.PortletA</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>PortletBInstance</instance-name>
-         <component-ref>samples.PortletB</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>HeaderContentInstance</instance-name>
-         <component-ref>samples.HeaderContentPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>ContentRewriteInstance</instance-name>
-         <component-ref>samples.ContentRewritePortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>SecuredTestPortletInstance</instance-name>
-         <component-ref>samples.SecuredTestPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>HintPortletInstance</instance-name>
-         <component-ref>samples.HintPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>WsrpSelectorTestPortletInstance</instance-name>
-         <component-ref>samples.WsrpSelectorTestPortlet</component-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <instance>
-         <instance-name>CMSPortletInstance</instance-name>
-         <component-ref>portal.CMSPortlet</component-ref>
-      </instance>
-   </deployment>
 </deployments>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +1,5 @@
 <portlet-app>
+   <remotable>true</remotable>
    <portlet>
       <portlet-name>PortletSessionPortlet</portlet-name>
       <session-config>
@@ -7,25 +8,82 @@
    </portlet>
    <portlet>
       <portlet-name>HeaderContentPortlet</portlet-name>
+      <remotable>false</remotable>
       <header-content>
-          <link rel="stylesheet" type="text/css" href="/portlet-styles/HeaderContent.css" title="" media="screen"/>
+         <link rel="stylesheet" type="text/css" href="/portlet-styles/HeaderContent.css" title="" media="screen"/>
+         <script type="text/javascript" src="/portlet-styles/HeaderContent.js" title=""/>
+         <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>ContentRewritePortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>HintPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>WsrpSelectorTestPortlet</portlet-name>
+   </portlet>
+   <portlet>
+      <portlet-name>ThemeSelectorPortlet</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.server.app.WebAppRegistry</service-class>
+      <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,type=global</service-ref>
+      <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,type=global</service-ref>
+      <service-ref>:container=Instance</service-ref>
    </service>
    <service>
       <service-name>ThemeService</service-name>
@@ -43,18 +101,13 @@
       <service-ref>:service=CMS</service-ref>
    </service>
    <service>
-      <service-name>PortalPermissionFactory</service-name>
-      <service-class>org.jboss.portal.security.PortalPermissionFactory</service-class>
-      <service-ref>:service=PortalPermissionFactory</service-ref>
-   </service>
-   <service>
       <service-name>UserModule</service-name>
-      <service-class>org.jboss.portal.core.modules.UserModule</service-class>
+      <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.core.modules.RoleModule</service-class>
+      <service-class>org.jboss.portal.identity.RoleModule</service-class>
       <service-ref>:service=Module,type=Role</service-ref>
    </service>
    <service>
@@ -62,9 +115,4 @@
       <service-class>org.jboss.portal.core.modules.MailModule</service-class>
       <service-ref>:service=Module,type=Mail</service-ref>
    </service>
-   <service>
-      <service-name>PortalPolicyConfigService</service-name>
-      <service-class>org.jboss.portal.security.config.PortalPolicyConfigService</service-class>
-      <service-ref>:policy=PortalPolicyConfigService</service-ref>
-   </service>
-</portlet-app>
\ No newline at end of file
+</portlet-app>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,28 @@
+<%@ 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"><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 JBoss Portal's most recent release. You may log in
+            at any time, using the User Portlet below 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>
+</table>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,17 @@
+<%@ 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

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,17 @@
+<%@ 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

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,115 @@
+<?xml version="1.0" standalone="yes"?>
+<deployments>
+   <deployment>
+      <instance>
+         <instance-id>HeaderContentPortletInstance</instance-id>
+         <portlet-ref>HeaderContentPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>WeatherPortletInstance</instance-id>
+         <portlet-ref>WeatherPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>NewsPortletInstance</instance-id>
+         <portlet-ref>NewsPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>JSPPortletInstance</instance-id>
+         <portlet-ref>JSPPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <instance>
+         <instance-id>URLPortletInstance</instance-id>
+         <portlet-ref>URLPortlet</portlet-ref>
+      </instance>
+   </deployment>
+   <deployment>
+      <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>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

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -2,14 +2,27 @@
 <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 /opt/SUNWps/dtd/portlet.xsd"
+   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>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>
+      </portlet-info>
+   </portlet>
+   <portlet>
       <description>This is a test portlet</description>
-      <description xml:lang="FR">C'est une portlet de test</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-name>TestPortlet</portlet-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>
@@ -50,7 +63,11 @@
       </security-role-ref>
    </portlet>
    <portlet>
+      <description>Portlet counting and displaying number of it's action/render calls - demonstrating session
+         behaviour</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>
@@ -60,7 +77,10 @@
       </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>
@@ -71,7 +91,10 @@
       </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>
@@ -81,7 +104,10 @@
       </portlet-info>
    </portlet>
    <portlet>
+      <description>Portlet using portlet session - demo purposes</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>
@@ -91,39 +117,10 @@
       </portlet-info>
    </portlet>
    <portlet>
-      <portlet-name>PreferencesPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.test.portlet.TestPortletPreferencesPortlet</portlet-class>
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-      <portlet-info>
-         <title>Preferences</title>
-      </portlet-info>
-      <portlet-preferences>
-         <preference>
-            <name>one</name>
-            <value>1</value>
-         </preference>
-         <preference>
-            <name>two</name>
-            <value>2</value>
-            <read-only>false</read-only>
-         </preference>
-         <preference>
-            <name>three</name>
-            <value>3</value>
-            <read-only>true</read-only>
-         </preference>
-         <preference>
-            <name>all</name>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-         </preference>
-      </portlet-preferences>
-   </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>
@@ -134,7 +131,10 @@
       </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>
@@ -145,7 +145,10 @@
       </portlet-info>
    </portlet>
    <portlet>
+      <description>Portlet for testing charset</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>
@@ -156,86 +159,152 @@
       </portlet-info>
    </portlet>
    <portlet>
-      <portlet-name>SecuredTestPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class>
+      <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>
-         <portlet-mode>HELP</portlet-mode>
-         <portlet-mode>EDIT</portlet-mode>
       </supports>
       <portlet-info>
-         <title>Secured test portlet</title>
+         <title>Test charset</title>
       </portlet-info>
    </portlet>
    <portlet>
-      <portlet-name>HeaderContentPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.plugins.HeaderContentPortlet</portlet-class>
+      <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>Inject Header Content</title>
+         <title>Secured test portlet</title>
       </portlet-info>
    </portlet>
    <portlet>
-      <portlet-name>ContentRewritePortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.plugins.ContentRewritePortlet</portlet-class>
+      <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>Rewrite Portlet Content</title>
+         <title>Weather Portlet</title>
       </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>
-      <portlet-name>HintPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.plugins.HintPortlet</portlet-class>
+      <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>Header Content Hint</title>
+         <title>News Feeds</title>
       </portlet-info>
       <portlet-preferences>
          <preference>
-            <name>hint-title</name>
-            <value>Please Note:</value>
+            <name>expires</name>
+            <value>180</value>
          </preference>
          <preference>
-            <name>hint-text</name>
-            <value>In order for the portlets on this page to fully function, you need to pick a layout that contains the
-               header content tag (p:headerContent).
-               A good example is the 'industrial' layout. Also note that this portlet does not have a title bar
-               (decoration)!</value>
+            <name>RssXml</name>
+            <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
+            <read-only>false</read-only>
          </preference>
       </portlet-preferences>
    </portlet>
    <portlet>
-      <portlet-name>WsrpSelectorTestPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.theme.WsrpSelectorTestPortlet</portlet-class>
+      <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>WSRP CSS Selectors</title>
+         <title>Greetings!</title>
       </portlet-info>
    </portlet>
    <portlet>
-      <portlet-name>ThemeSelectorPortlet</portlet-name>
-      <portlet-class>org.jboss.portal.core.portlet.theme.ThemeSelectorPortlet</portlet-class>
+      <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>Select the Portal Theme</title>
+         <title>URL Portlet</title>
       </portlet-info>
    </portlet>
+   <portlet>
+      <portlet-name>BasicPortlet</portlet-name>
+      <portlet-class>org.jboss.portal.core.portlet.test.BasicPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Basic Portlet</title>
+      </portlet-info>
+   </portlet>
    <user-attribute>
       <name>user.name.nickName</name>
    </user-attribute>
@@ -248,6 +317,15 @@
    <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>

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<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

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,31 @@
+<?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 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>

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/images/accessorize.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/images/dodemo.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/images/getcode.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.css	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.css	2006-08-31 20:55:25 UTC (rev 6051)
@@ -5,3 +5,9 @@
    width: 187px;
    height: 120px;
 }
+
+#Introducing-HeaderContentInput {
+   position: relative;
+   top: 85px;
+   left: 3px;
+}

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.js	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/portlet-styles/HeaderContent.js	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,5 @@
+// simple test java script
+function injectJS()
+{
+   alert('hello from the injected java script!');
+}

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_06-64 ("Apple Computer, Inc.")
-

Deleted: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,2 +0,0 @@
-<Context>
-</Context>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -4,11 +4,8 @@
    "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
    <description>JBoss Portal</description>
-   <!--
-      | Uncomment in clustered mode : use http session replication
-      
+   <!-- Comment/Uncomment to enable portal session replication
    <distributable/>
-   
    -->
 
    <!-- The portal servlet is the main entrance point -->
@@ -20,6 +17,11 @@
          <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>
@@ -36,6 +38,11 @@
          <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>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,38 +1,67 @@
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-   <p:theme themeName='Nphalanx'/>
+   <style>
+      body {
+         background-color: #FFFFFF;
+      }
+
+      td {
+         color: #000000;
+         font-family: verdana, arial, sans-serif;
+         font-size: 12px;
+         line-height: 130%;
+      }
+
+      table.form {
+         background-color: #CCFF99;
+         border-style: dashed;
+         border-color: #000000;
+         border-width: 1px;
+
+      }
+   </style>
 </head>
 
-<body id="body" OnLoad="document.loginform.j_username.focus();">
-<div id="portal-container">
-   <div id="sizer">
-      <div id="expander">
-         <div id="logoName"></div>
-         <table border="0" cellpadding="0" cellspacing="0" id="header-container">
-            <tr>
-               <td align="center" valign="top" id="header"><div id="spacer"></div></td>
-            </tr>
-         </table>
-         <div id="content-container">
+<body OnLoad="document.loginform.j_username.focus();">
 
-            <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>
-            <hr class="cleaner"/>
-            <div id="footer-container" class="portal-copyright">Powered by <a class="portal-copyright"
-               href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
-            </div>
-         </div>
-      </div>
-   </div>
-</div>
+<table width="100%" height="100%" cellpadding="0" cellspacing="1">
+   <tr>
+      <td valign="middle" align="center">
+
+         <form method="POST" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm">
+            <b>JBoss Portal Login</b><br><br>
+            <table width="350" height="200" cellpadding="0" cellspacing="0" class="form">
+               <tr>
+                  <td align="right" width="100">
+                     Username:&nbsp;
+                  </td>
+                  <td align="left">
+                     <input type="text" name="j_username" value=""/>
+                  </td>
+               </tr>
+               <tr>
+                  <td align="right" width="100">
+                     Password:&nbsp;
+                  </td>
+                  <td align="left">
+                     <input type="password" name="j_password" value=""/>
+                  </td>
+               </tr>
+               <tr>
+                  <td colspan="2" align="center">
+                     <input type="submit" name="login" value="Login"/>
+                  </td>
+               </tr>
+            </table>
+         </form>
+
+      </td>
+   </tr>
+</table>
+
 </body>
 </html>
+

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.6.5
+Created-By: 1.4.2_09-b05 (Sun Microsystems Inc.)
+

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+   <!-- Producer interceptor stack -->
+   <mbean
+      code="org.jboss.portal.wsrp.aspects.portlet.SessionInterceptor"
+      name="portal:service=Interceptor,type=Portlet,name=Session"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+   <mbean
+      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
+      name="portal:service=InterceptorStack,type=WSRP"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends-list optional-attribute-name="InterceptorNames">
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</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=Modes</depends-list-element>
+         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Session</depends-list-element>
+      </depends-list>
+   </mbean>
+
+   <!-- The state portlet invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
+      name="portal:service=WSRPPortletInvoker,type=Stateful"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="StateStore" proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
+      <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Container</depends>
+   </mbean>
+
+   <!-- The portlet container invoker -->
+   <mbean
+      code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+      name="portal:service=WSRPPortletInvoker,type=Container"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=WSRP</depends>
+      <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
+   </mbean>
+
+   <!-- WSRP Producer implementation -->
+   <mbean
+      code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
+      name="portal.wsrp:service=WSRPProducer"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Stateful</depends>
+   </mbean>
+
+   <!-- Configure a consumer that is the portal itself -->
+   <mbean
+      code="org.jboss.portal.wsrp.deployment.WSRPDeployer"
+      name="portal.wsrp:service=WSRPDeployer">
+      <attribute name="DefaultWSRPLocation">default-wsrp.xml</attribute>
+      <depends optional-attribute-name="FederatingPortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+   </mbean>
+</server>
+

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,49 @@
+<deployments>
+   <deployment>
+      <wsrp-producer>
+         <producer-id>self</producer-id>
+         <expiration-cache>120</expiration-cache>
+         <endpoint-config>
+            <service-description-url>http://localhost:8080/portal-wsrp/ServiceDescriptionService</service-description-url>
+            <markup-url>http://localhost:8080/portal-wsrp/MarkupService</markup-url>
+            <registration-url>http://localhost:8080/portal-wsrp/RegistrationService</registration-url>
+            <portlet-management-url>http://localhost:8080/portal-wsrp/PortletManagementService</portlet-management-url>
+         </endpoint-config>
+      </wsrp-producer>
+   </deployment>
+   <!--<deployment>
+   <wsrp-producer>
+      <producer-id>vignette</producer-id>
+      <expiration-cache>120</expiration-cache>
+      <endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url>
+      <registration-data>
+         <consumer-name>JBoss Portal 2.4 Test</consumer-name>
+         <property>
+            <name>com.vignette.wsrp.registration.username</name>
+            <lang>en</lang>
+            <value>test</value>
+         </property>
+         <property>
+            <name>com.vignette.wsrp.registration.password</name>
+            <lang>en</lang>
+            <value>test</value>
+         </property>
+      </registration-data>
+   </wsrp-producer>
+   </deployment>-->
+   <!--<deployment>
+      <wsrp-producer>
+         <producer-id>bea</producer-id>
+         <expiration-cache>120</expiration-cache>
+         <endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
+         <registration-data>
+            <consumer-name>JBoss Portal 2.4 Test</consumer-name>
+            <property>
+               <name>registration/consumerRole</name>
+               <lang>en</lang>
+               <value>public</value>
+            </property>
+         </registration-data>
+      </wsrp-producer>
+   </deployment>-->
+</deployments>
\ No newline at end of file

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -9,23 +9,27 @@
 				<!-- Set the layout for the default portal, see also portal-layouts.xml. -->
 				<property>
 					<name>layout.id</name>
-					<value>JBossForge</value>
-				</property>
+					<!--<value>JBossForge</value>-->
+                    <value>generic</value>
+                </property>
 				<!-- Set the theme for the default portal, see also portal-themes.xml. -->
 				<property>
 					<name>theme.id</name>
-					<value>jboss-forge</value>
-				</property>
+					<!--<value>jboss-forge</value>-->
+                    <value>Nphalanx</value>
+                </property>
 				<!-- Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml -->
 				<property>
 					<name>theme.renderSetId</name>
-					<value>jbfRenderer</value>
-				</property>
+					<!--<value>jbfRenderer</value>-->
+                    <value>divRenderer</value>
+                </property>
 				<!-- Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml -->
 				<property>
 					<name>layout.strategyId</name>
-					<value>jbfStrategy</value>
-				</property>
+					<!--<value>jbfStrategy</value>-->
+                    <value>maximizedRegion</value>
+                </property>
 				<!-- The default page name, if the property is not explicited then the default page name is "default" -->
 				<property>
 					<name>portal.defaultObjectName</name>
@@ -634,44 +638,4 @@
 			</security-constraint>
 		</page>
 	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>ManagementPortletInstance</instance-name>
-			<component-ref>portal.ManagementPortlet</component-ref>
-			<security-constraint>
-				<policy-permission>
-					<role-name>Admin</role-name>
-					<action-name>view</action-name>
-				</policy-permission>
-			</security-constraint>
-		</instance>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>CMSAdminPortletInstance</instance-name>
-			<component-ref>portal.CMSAdminPortlet</component-ref>
-			<security-constraint>
-				<policy-permission>
-					<role-name>Admin</role-name>
-					<action-name>view</action-name>
-				</policy-permission>
-			</security-constraint>
-		</instance>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>UserPortletInstance</instance-name>
-			<component-ref>portal.UserPortlet</component-ref>
-		</instance>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>RolePortletInstance</instance-name>
-			<component-ref>portal.RolePortlet</component-ref>
-		</instance>
-	</deployment>
 </deployments>

Copied: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/portlet-instances.xml (from rev 6050, labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-name>ManagementPortletInstance</instance-name>
+			<component-ref>portal.ManagementPortlet</component-ref>
+			<security-constraint>
+				<policy-permission>
+					<role-name>Admin</role-name>
+					<action-name>view</action-name>
+				</policy-permission>
+			</security-constraint>
+		</instance>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-name>CMSAdminPortletInstance</instance-name>
+			<component-ref>portal.CMSAdminPortlet</component-ref>
+			<security-constraint>
+				<policy-permission>
+					<role-name>Admin</role-name>
+					<action-name>view</action-name>
+				</policy-permission>
+			</security-constraint>
+		</instance>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-name>UserPortletInstance</instance-name>
+			<component-ref>portal.UserPortlet</component-ref>
+		</instance>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-name>RolePortletInstance</instance-name>
+			<component-ref>portal.RolePortlet</component-ref>
+		</instance>
+	</deployment>
+</deployments>

Added: labs/jbosslabs/trunk/portal-extensions/primates/primates.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/primates.iml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/primates/primates.iml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="portlet" level="application" />
+    <orderEntry type="library" name="portal" level="application" />
+    <orderEntry type="library" name="jboss" level="application" />
+    <orderEntry type="module" module-name="shotoku-base" />
+    <orderEntry type="module" module-name="shotoku-aop" />
+    <orderEntry type="module" module-name="forge-common" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java	2006-08-31 20:55:25 UTC (rev 6051)
@@ -34,10 +34,11 @@
 import org.jboss.forge.common.soa.primates.PrimatesService;
 import org.jboss.logging.Logger;
 import org.jboss.portal.common.context.DelegateContext;
-import org.jboss.portal.core.model.NoSuchUserException;
-import org.jboss.portal.core.model.User;
 import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.core.modules.UserModule;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.NoSuchUserException;
 import org.jbosslabs.portlets.primates.Primate;
 import org.jbosslabs.portlets.primates.PrimatesDescriptor;
 import org.jbosslabs.portlets.primates.PrimatesTools;
@@ -135,13 +136,11 @@
 			e.printStackTrace();
 		} catch (IllegalArgumentException e) {
 			e.printStackTrace();
-		} catch (NoSuchUserException e) {
-			e.printStackTrace();
-		} catch (ModuleException e) {
-			e.printStackTrace();
-		}
+		} catch (IdentityException e) {
+            e.printStackTrace();
+        }
 
-		// if soemthing went wrong return null
+        // if soemthing went wrong return null
 		return null;
 	}
 

Copied: labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml (from rev 6048, labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/primates-object.xml)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/primates-object.xml	2006-08-31 18:45:59 UTC (rev 6048)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-id>PrimatesPortletInstance</instance-id>
+			<portlet-ref>PrimatesPortlet</portlet-ref>
+		</instance>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-id>PrimatesPortletAllInstance</instance-id>
+			<portlet-ref>PrimatesPortlet</portlet-ref>
+			<preferences>
+				<preference>
+					<name>viewType</name>
+					<value>all</value>
+				</preference>
+				<preference>
+					<name>buttons</name>
+					<value>no</value>
+				</preference>
+			</preferences>
+		</instance>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-id>PrimatesPortletMugshotInstance</instance-id>
+			<portlet-ref>PrimatesPortlet</portlet-ref>
+			<preferences>
+				<preference>
+					<name>viewType</name>
+					<value>mugshot</value>
+				</preference>
+				<preference>
+					<name>buttons</name>
+					<value>yes</value>
+				</preference>
+			</preferences>
+		</instance>
+	</deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/primates-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/primates-object.xml	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/primates-object.xml	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>PrimatesPortletInstance</instance-name>
-			<component-ref>primates.PrimatesPortlet</component-ref>
-		</instance>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>PrimatesPortletAllInstance</instance-name>
-			<component-ref>primates.PrimatesPortlet</component-ref>
-			<preferences>
-				<preference>
-					<name>viewType</name>
-					<value>all</value>
-				</preference>
-				<preference>
-					<name>buttons</name>
-					<value>no</value>
-				</preference>
-			</preferences>
-		</instance>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>PrimatesPortletMugshotInstance</instance-name>
-			<component-ref>primates.PrimatesPortlet</component-ref>
-			<preferences>
-				<preference>
-					<name>viewType</name>
-					<value>mugshot</value>
-				</preference>
-				<preference>
-					<name>buttons</name>
-					<value>yes</value>
-				</preference>
-			</preferences>
-		</instance>
-	</deployment>
-</deployments>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/portlet.tld	2006-08-31 19:19:29 UTC (rev 6050)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/portlet.tld	2006-08-31 20:55:25 UTC (rev 6051)
@@ -1,69 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib 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-jsptaglibrary_2_0.xsd"
+  version="2.0">
+   <tlib-version>1.1</tlib-version>
+   <short-name>JBoss-Portal-tags</short-name>
 
-<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.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>
-   <function>
-      <name>i18n</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>out</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String out(java.lang.String)</function-signature>
-   </function>
-
-   <function>
-      <name>i18nout</name>
-      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
-      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
-   </function>
-
-   <tag>
       <name>if</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
+
    <tag>
       <name>iterate</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>ctx</name>
          <required>true</required>
@@ -73,84 +29,53 @@
 
    <tag>
       <name>include</name>
-      <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class>
+      <body-content>JSP</body-content>
       <attribute>
          <name>page</name>
          <required>true</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
-   
-   <tag>
 
-      <name>defineObjects</name>
-      <tag-class>org.jboss.portal.portlet.taglib.DefineObjectsTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.DefineObjectsTagTEI</tei-class>
-      <body-content>empty</body-content>
-
-   </tag>
    <tag>
-
-      <name>namespace</name>
-      <tag-class>org.jboss.portal.portlet.taglib.NamespaceTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
-      <name>renderURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.RenderURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+      <name>error</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
-         <name>portletMode</name>
+         <name>key</name>
+         <required>true</required>
          <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>errors</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
+   </tag>
 
-      <name>actionURL</name>
-      <tag-class>org.jboss.portal.portlet.taglib.ActionURLTag</tag-class>
-      <tei-class>org.jboss.portal.portlet.taglib.GenerateURLTagTEI</tei-class>
+   <tag>
+      <name>success</name>
+      <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class>
       <body-content>JSP</body-content>
+   </tag>
+   <function>
+      <name>i18n</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+   </function>
 
-      <attribute>
-         <name>portletMode</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>out</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String out(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>secure</name>
-         <rtexprvalue>true</rtexprvalue>
+   <function>
+      <name>i18nout</name>
+      <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+      <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+   </function>
 
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <name>windowState</name>
-         <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-   </tag>
-
 </taglib>

More information about the jboss-svn-commits mailing list