[jboss-svn-commits] JBL Code SVN: r14640 - in labs/jbosslabs/branches/identity_integration_labs2/portal-extensions: binaries/maven-repo-addons and 118 other directories.

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

Author: szimano
Date: 2007-08-27 08:54:34 -0400 (Mon, 27 Aug 2007)
New Revision: 14640

Added:
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/cactus-1.7.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/junit-3.8.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-collections.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-httpclient-2.0.2.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-api.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-ri.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/commons-email-1.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/mail.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jboss-cache.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jgroups.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/oro.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/build.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.war
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-saml.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-security-common.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-codec-1.3.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-httpclient-3.0.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-logging-1.03.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-identity-management.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-saml.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-security-common.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-sso-tomcat5.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jbwebsite-security-1.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jdbcLdapJldap.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/opensaml-1.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/xmlsec-20050514.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jbossweb-tomcat55.sar/tomcat-util.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/binaries/forums-authz-plugin.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/listeners/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/Thumbs.db
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/000.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/001.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/002.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/003.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/004.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/005.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/006.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/007.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/008.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/009.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/010.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/011.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/012.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/013.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/014.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/015.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/016.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/017.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/018.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/019.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/Thumbs.db
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/blank.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/btn_go_grey.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/exit.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/home.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/info.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/search.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/aspectjrt-1.2.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/cactus-1.7.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-httpclient-2.0.2.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-logging-1.0.4.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/httpunit-1.6.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junit-3.8.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junitperf-1.9.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/nekohtml-0.9.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/local/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/local/velocity-1.4.jar
Removed:
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/cactus-1.7.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/junit-3.8.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-collections.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-httpclient-2.0.2.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-api.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-ri.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/commons-email-1.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/mail.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jboss-cache.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jgroups.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/oro.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.war
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-saml.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-security-common.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-codec-1.3.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-httpclient-3.0.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-logging-1.03.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-identity-management.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-saml.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-security-common.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-sso-tomcat5.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jbwebsite-security-1.0.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jdbcLdapJldap.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/opensaml-1.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/xmlsec-20050514.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/listeners/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/Thumbs.db
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/000.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/001.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/002.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/003.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/004.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/005.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/006.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/007.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/008.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/009.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/010.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/011.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/012.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/013.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/014.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/015.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/016.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/017.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/018.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/019.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/Thumbs.db
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/blank.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/btn_go_grey.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/exit.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/home.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/info.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/search.gif
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/aspectjrt-1.2.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/cactus-1.7.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-httpclient-2.0.2.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-logging-1.0.4.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/httpunit-1.6.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junit-3.8.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junitperf-1.9.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/nekohtml-0.9.1.jar
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/local/velocity-1.4.jar
Modified:
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/src/application/META-INF/jboss-app.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/maven.xml
   labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
svn merge -r 11074:14634 https://svn.labs.jboss.org/labs/jbosslabs/branches/identity_integration/trunk/portal-extensions .

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/cactus)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/cactus/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/cactus-1.7.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/cactus-1.7.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/cactus/jars/cactus-1.7.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/junit-3.8.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/cactus/jars/junit-3.8.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/cactus/jars/junit-3.8.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/commons)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/commons/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-collections.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-collections.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-collections.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-httpclient-2.0.2.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-httpclient-2.0.2.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/commons/jars/commons-httpclient-2.0.2.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/el)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/el/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-api.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-api.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/el/jars/el-api.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-ri.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/el/jars/el-ri.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/el/jars/el-ri.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/email)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/email/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/commons-email-1.0.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/commons-email-1.0.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/email/jars/commons-email-1.0.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/mail.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/email/jars/mail.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/email/jars/mail.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jboss-sso)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jbosscache)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jbosscache/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jboss-cache.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jboss-cache.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jboss-cache.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jgroups.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jgroups.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/jbosscache/jars/jgroups.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/ldap)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/ldap/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/validator)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/validator/jars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/oro.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/binaries/maven-repo-addons/validator/jars/oro.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/binaries/maven-repo-addons/validator/jars/oro.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/build.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/build.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/build.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/build.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,8 @@
+#These values are the addresses of sso federation servers for the dotOrg and dotCom domain.
+#For local testing, change these values to what you addresses are locally
+#When deployed in production the possible values are:
+#
+#dotOrgFederationServer=http://www.jboss.org/federate
+#dotComFederationServer=http://www.jboss.com/federate
+
+dotOrgFederationServer=http://www.proto.jboss.org:8080/federate
\ No newline at end of file

Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/maven.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/maven.xml	2007-08-27 12:44:04 UTC (rev 14639)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,47 +1,50 @@
-<!--
+<!-- 
   JBoss, the OpenSource J2EE webOS
   Distributable under LGPL license.
   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.server.dir}" overwrite="true">
-            <ant:fileset dir="to-copy-install">
-                <exclude name="**/*.sample"/>
-            </ant:fileset>
-        </ant:copy>
-    </goal>
+	<goal name="prj-install">
+		<ant:copy todir="${local.server.dir}" overwrite="true">
+	    		<ant:fileset dir="to-copy-install">
+				<exclude name="**/*.sample"/>
+			</ant:fileset>
+		</ant:copy>
+	</goal>
 
-    <goal name="all">
-    </goal>
-
-    <goal name="clean">
-    </goal>
-
-    <goal name="build">
-    </goal>
-
-    <goal name="deploy">
-        <ant:copy todir="${local.server.dir}" overwrite="true">
-            <ant:fileset dir="to-copy">
-                <exclude name="**/*.sample"/>
-            </ant:fileset>
-        </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.sar" />
-	<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-wsrp.sar" />
+	<goal name="all">
+	</goal>
 	
-        <ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
+	<goal name="clean">
+	</goal>
 
-        <ant:delete dir="${local.deploy.dir}/jboss-hibernate.deployer" />
-        <ant:delete dir="${local.deploy.dir}/jboss-ws4ee.sar" />
-
-        <ant:available file="${local.deploy.dir}/jbossws.sar" property="jbossws.file.present" type="file" />
-        <j:if test="${jbossws.file.present}">
-            <j:set var="jar.to.dir" value="${local.deploy.dir}/jbossws.sar" />
-            <attainGoal name="jar-to-dir" />
-        </j:if>
-        <ant:delete file="${local.deploy.dir}/jbossws.sar/jbossws-context.war" />
-    </goal>
+	<goal name="build">	            
+	</goal>
+    
+	<goal name="deploy">
+		<ant:copy todir="${local.server.dir}" overwrite="true">
+	    		<ant:fileset dir="to-copy">
+				<exclude name="**/*.sample"/>
+			</ant:fileset>
+		</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.sar" />	
+	        <ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
+		
+		<ant:delete dir="${local.deploy.dir}/jboss-hibernate.deployer" />	
+		<ant:delete dir="${local.deploy.dir}/jboss-ws4ee.sar" />	
+		
+		<!-- jboss sso configuration -->
+		<filter filtersfile="build.properties"/>
+		<ant:copy file="to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml" 
+		tofile="${local.deploy.dir}/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml" 
+		overwrite="true"
+		filtering="true"
+		/>
+		<ant:copy file="to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml" 
+		tofile="${local.deploy.dir}/jboss-sso.sar/conf/sso.cfg.xml" 
+		overwrite="true"
+		filtering="true"
+		/>
+	</goal>
 </project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Apache Ant 1.5.1
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/MANIFEST.MF	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: Apache Ant 1.5.1
+

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-	<module>
-		<service>jboss-federation-server.sar</service>
-	</module>
-	<module>
-		<web>
-			<web-uri>jboss-federation-server.war</web-uri>
-		</web>
-	</module>
-	<module>
-		<java>jboss-federation-server.jar</java>
-	</module>
-	<module>
-		<java>jboss-saml.jar</java>
-	</module>
-	<module>
-		<java>jboss-security-common.jar</java>
-	</module>		
-</jboss-app>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/META-INF/application.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+	<module>
+		<service>jboss-federation-server.sar</service>
+	</module>
+	<module>
+		<web>
+			<web-uri>jboss-federation-server.war</web-uri>
+		</web>
+	</module>
+	<module>
+		<java>jboss-federation-server.jar</java>
+	</module>
+	<module>
+		<java>jboss-saml.jar</java>
+	</module>
+	<module>
+		<java>jboss-security-common.jar</java>
+	</module>		
+</jboss-app>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Apache Ant 1.5.1
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/MANIFEST.MF	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: Apache Ant 1.5.1
+

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-	<!-- configure the Federation Server -->
-	<mbean name="jboss.sso:service=FederationServer"
-	code="org.jboss.security.federation.service.Federation" 	
-	xmbean-dd=""
-	>	    
-	    <attribute name="conf">conf/server.cfg.xml</attribute>
-		<xmbean>
-			<class>org.jboss.security.federation.service.Federation</class>
-			<constructor>      				
-      				<name>org.jboss.security.federation.service.Federation</name>
-   			</constructor>
-			<attribute access="write" setMethod="setConf">
-				     <name>conf</name>
-					 <type>java.lang.String</type>					 
-		    </attribute>		    			
-		    <operation>
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation>
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get Federation Partners</description>
-		    	<name>getPartners</name>		    	
-    			<return-type>java.util.Collection</return-type>		    	
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get Federation Partners Info in XML Format</description>
-		    	<name>getPartnerInfo</name>		    	
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>		    
-		</xmbean>
-	</mbean>
-</server>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/META-INF/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+	<!-- configure the Federation Server -->
+	<mbean name="jboss.sso:service=FederationServer"
+	code="org.jboss.security.federation.service.Federation" 	
+	xmbean-dd=""
+	>	    
+	    <attribute name="conf">conf/server.cfg.xml</attribute>
+		<xmbean>
+			<class>org.jboss.security.federation.service.Federation</class>
+			<constructor>      				
+      				<name>org.jboss.security.federation.service.Federation</name>
+   			</constructor>
+			<attribute access="write" setMethod="setConf">
+				     <name>conf</name>
+					 <type>java.lang.String</type>					 
+		    </attribute>		    			
+		    <operation>
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation>
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get Federation Partners</description>
+		    	<name>getPartners</name>		    	
+    			<return-type>java.util.Collection</return-type>		    	
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get Federation Partners Info in XML Format</description>
+		    	<name>getPartnerInfo</name>		    	
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>		    
+		</xmbean>
+	</mbean>
+</server>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<jboss-sso>
-
-	<!-- 
-		partners configuration of the federation server...
-		partners are the collection of sites which are part of the Single Sign On Federation
-		it lists the web domains and their corresponding federation servers in this domain
-	-->
-	<federation-server>
-		<partners>
-			<partner domain="jboss.org" server="@dotOrgFederationServer@"/>
-		</partners>
-	</federation-server>	
-
-</jboss-sso>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.sar/conf/server.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<jboss-sso>
+
+	<!-- 
+		partners configuration of the federation server...
+		partners are the collection of sites which are part of the Single Sign On Federation
+		it lists the web domains and their corresponding federation servers in this domain
+	-->
+	<federation-server>
+		<partners>
+			<partner domain="jboss.org" server="@dotOrgFederationServer@"/>
+		</partners>
+	</federation-server>	
+
+</jboss-sso>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.war
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.war (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-federation-server.war)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-saml.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-saml.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-saml.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-security-common.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-security-common.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-federation-server-exploded.ear/jboss-security-common.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml	2007-08-27 12:44:04 UTC (rev 14639)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/login-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -9,8 +9,14 @@
       "http://www.jboss.org/j2ee/dtd/security_config.dtd">
 <policy>
    <application-policy name="portal">
-      <authentication>
-         <!-- this JAAS module is used by manual user initiated Login -->
+      <authentication>         
+         <login-module code="org.jboss.website.user.util.UsernameAndPasswordLoginModule" flag="required">
+            <module-option name="unauthenticatedIdentity">guest</module-option>                        
+            <module-option name="password-stacking">useFirstPass</module-option>                       
+            <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
+         </login-module>         
+                  
+         <!--
          <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient">
             <module-option name="unauthenticatedIdentity">guest</module-option>
             <module-option name="hashAlgorithm">MD5</module-option>
@@ -22,12 +28,8 @@
             <module-option name="password-stacking">useFirstPass</module-option>
 	    	<module-option name="jbossdb">java:JBossDS</module-option>
          </login-module>
-         
-         <!-- this JAAS module is used for SSO AutoLogin -->
 	     <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient">
 		     <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="principalsQuery">SELECT u.password FROM UserImpl AS u WHERE u.userName=:username</module-option>
 		     <module-option name="rolesQuery">SELECT g.name FROM UserImpl AS u LEFT JOIN u.roles AS g WHERE u.userName=:username</module-option>
@@ -35,23 +37,7 @@
 		     <module-option name="password-stacking">useFirstPass</module-option>
 		     <module-option name="jbossdb">java:JBossDS</module-option>
          </login-module>
-         
+         -->                           
       </authentication>
-   </application-policy>
-   
-   <application-policy name="webdav">
-      <authentication>
-         <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient">
-            <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="principalsQuery">SELECT u.password FROM UserImpl AS u LEFT JOIN u.roles AS g WHERE u.userName=:username AND g.name='Admin'</module-option>
-            <module-option name="rolesQuery">SELECT u.userName FROM UserImpl AS u WHERE :username='a' AND :username='b'</module-option>
-            <module-option name="additionalRole">root</module-option>
-         </login-module>
-         <login-module code="org.jboss.portal.core.security.jaas.IdentityPropagationLoginModule" flag="sufficient">
-         </login-module>
-      </authentication>
-   </application-policy>
+   </application-policy>   
 </policy>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,26 @@
+<!-- Add the ExtendedFormAuthenticator to get access to the username/password/exception -->
+<Context cookies="true" crossContext="true">   
+   <!-- a federation routing valve -->
+   <!--
+	This valve eliminates the need for cross domain federation links 
+	to be of the form /federate?target={some link in the other domain}
+	With this link, your link can be straight to the resource in the
+	other domain 
+   -->
+   <Valve className="org.jboss.security.valve.SSOFederationRouter"/>
+      
+   <!-- 
+   		logoutURL - URL for performing logout/signout function in your application
+   -->	   
+   <Valve className="org.jboss.security.valve.SSOAutoLogout" logoutURL="/signout"/>
+	
+   <!-- 
+   		assertingParty - this is the partnerId of this application as a part of a federation of multiple partner sites
+   -->
+   <Valve className="org.jboss.security.valve.SSOTokenManager" assertingParty="www.jboss.org"/>
+   
+   <!-- 
+		tomcat built-in AuthenticationTypes: FORM,BASIC,DIGEST,CLIENT-CERT
+   -->
+   <Valve className="org.jboss.security.valve.SSOAutoLogin" authType="FORM"/>
+</Context>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Apache Ant 1.5.1
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/MANIFEST.MF	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: Apache Ant 1.5.1
+

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-	<!-- 
-		configure the IdentityManager 
-	-->
-	<mbean name="jboss.sso:service=IdentityManager"
-	code="org.jboss.security.idm.IdentityManager" 	
-	xmbean-dd=""
-	>	    
-	    <attribute name="conf">conf/sso.cfg.xml</attribute>
-		<xmbean>
-			<class>org.jboss.security.idm.IdentityManager</class>
-			<constructor>      				
-      				<name>org.jboss.security.idm.IdentityManager</name>
-   			</constructor>
-			<attribute access="write" setMethod="setConf">
-				<name>conf</name>
-				<type>java.lang.String</type>					 
-		    </attribute>		    		    
-		    <operation>
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation>
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get a LoginProvider</description>
-		    	<name>getLoginProvider</name>		    	
-    			<return-type>org.jboss.security.idm.LoginProvider</return-type>		    	
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get an LoginProvider</description>
-		    	<name>getLoginProvider</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>id</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>org.jboss.security.idm.LoginProvider</return-type>		    	
-		    </operation>		    		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get a ProvisioningProvider</description>
-		    	<name>getProvisioningProvider</name>		    	
-    			<return-type>org.jboss.security.idm.ProvisioningProvider</return-type>		    	
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get an ProvisioningProvider</description>
-		    	<name>getProvisioningProvider</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>id</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>org.jboss.security.idm.ProvisioningProvider</return-type>		    	
-		    </operation>		    		    
-		</xmbean>
-	</mbean>
-	
-	<!-- 
-		configure the SSOTokenManager 
-	-->
-	<mbean name="jboss.sso:service=SSOManager"
-	code="org.jboss.security.saml.SSOManager" 	
-	xmbean-dd=""
-	>	    
-	    <attribute name="conf">conf/sso.cfg.xml</attribute>
-		<xmbean>
-			<class>org.jboss.security.saml.SSOManager</class>
-			<constructor>      				
-      				<name>org.jboss.security.saml.SSOManager</name>
-   			</constructor>
-			<attribute access="write" setMethod="setConf">
-				     <name>conf</name>
-					 <type>java.lang.String</type>					 
-		    </attribute>		    
-		    <operation>
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation>
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get a Token Processor</description>
-		    	<name>getProcessor</name>		    	
-    			<return-type>org.jboss.security.saml.SingleSignOn</return-type>		    	
-		    </operation>		    		    
-		</xmbean>
-	</mbean>
-</server>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/META-INF/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+	<!-- 
+		configure the IdentityManager 
+	-->
+	<mbean name="jboss.sso:service=IdentityManager"
+	code="org.jboss.security.idm.IdentityManager" 	
+	xmbean-dd=""
+	>	    
+	    <attribute name="conf">conf/sso.cfg.xml</attribute>
+		<xmbean>
+			<class>org.jboss.security.idm.IdentityManager</class>
+			<constructor>      				
+      				<name>org.jboss.security.idm.IdentityManager</name>
+   			</constructor>
+			<attribute access="write" setMethod="setConf">
+				<name>conf</name>
+				<type>java.lang.String</type>					 
+		    </attribute>		    		    
+		    <operation>
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation>
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get a LoginProvider</description>
+		    	<name>getLoginProvider</name>		    	
+    			<return-type>org.jboss.security.idm.LoginProvider</return-type>		    	
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get an LoginProvider</description>
+		    	<name>getLoginProvider</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>id</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>org.jboss.security.idm.LoginProvider</return-type>		    	
+		    </operation>		    		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get a ProvisioningProvider</description>
+		    	<name>getProvisioningProvider</name>		    	
+    			<return-type>org.jboss.security.idm.ProvisioningProvider</return-type>		    	
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get an ProvisioningProvider</description>
+		    	<name>getProvisioningProvider</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>id</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>org.jboss.security.idm.ProvisioningProvider</return-type>		    	
+		    </operation>		    		    
+		</xmbean>
+	</mbean>
+	
+	<!-- 
+		configure the SSOTokenManager 
+	-->
+	<mbean name="jboss.sso:service=SSOManager"
+	code="org.jboss.security.saml.SSOManager" 	
+	xmbean-dd=""
+	>	    
+	    <attribute name="conf">conf/sso.cfg.xml</attribute>
+		<xmbean>
+			<class>org.jboss.security.saml.SSOManager</class>
+			<constructor>      				
+      				<name>org.jboss.security.saml.SSOManager</name>
+   			</constructor>
+			<attribute access="write" setMethod="setConf">
+				     <name>conf</name>
+					 <type>java.lang.String</type>					 
+		    </attribute>		    
+		    <operation>
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation>
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get a Token Processor</description>
+		    	<name>getProcessor</name>		    	
+    			<return-type>org.jboss.security.saml.SingleSignOn</return-type>		    	
+		    </operation>		    		    
+		</xmbean>
+	</mbean>
+</server>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-codec-1.3.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-codec-1.3.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-codec-1.3.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-httpclient-3.0.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-httpclient-3.0.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-httpclient-3.0.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-logging-1.03.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-logging-1.03.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/commons-logging-1.03.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,42 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<jboss-sso>
-	<!-- 
-		identity management related configuration, this is the LDAP based module
-		Technically, this can be a provider that can integrate with thirdparty identity systems like SiteMinder etc
-	-->
-	<identity-management>		
-		<login>
-			<provider id="si:jboss-sso:ldap:login" class="org.jboss.website.security.JBossCorpIdentityProvider">
-				<property name="connectionURL">
-					jdbc:ldap://localhost:389/dc=jboss,dc=com?SEARCH_SCOPE:=subTreeScope&amp;secure:=false&amp;concat_atts:=true&amp;size_limit:=10000000
-				</property>
-				<property name="username">cn=Admin,dc=jboss,dc=com</property>
-				<property name="password">jbossrocks</property>
-				<property name="identityOu">jbosssso</property>
-				<property name="roleOu">role</property>
-			</provider>
-		</login>		
-		<provisioning>
-			<provider id="si:jboss-sso:ldap:login" class="org.jboss.website.security.JBossCorpIdentityProvider">
-				<property name="connectionURL">
-					jdbc:ldap://localhost:389/dc=jboss,dc=com?SEARCH_SCOPE:=subTreeScope&amp;secure:=false&amp;concat_atts:=true&amp;size_limit:=10000000
-				</property>
-				<property name="username">cn=Admin,dc=jboss,dc=com</property>
-				<property name="password">jbossrocks</property>
-				<property name="identityOu">jbosssso</property>
-				<property name="roleOu">role</property>
-			</provider>
-		</provisioning>
-	</identity-management>
-	
-	
-	<!-- sso processor for SingleSignOn, the default JBossSingleSignOn processor uses OpenSAML-1.0, 
-	the next version of this processor will use the latest SAML specification 
-	-->
-	<sso-processor>
-		<processor class="org.jboss.security.saml.JBossSingleSignOn">
-			<property name="trustServer">@dotOrgFederationServer@/trust</property>
-		</processor>
-	</sso-processor>
-</jboss-sso>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/conf/sso.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<jboss-sso>
+	<!-- 
+		identity management related configuration, this is the LDAP based module
+		Technically, this can be a provider that can integrate with thirdparty identity systems like SiteMinder etc
+	-->
+	<identity-management>		
+		<login>
+			<provider id="si:jboss-sso:ldap:login" class="org.jboss.website.security.JBossCorpIdentityProvider">
+				<property name="connectionURL">
+					jdbc:ldap://localhost:389/dc=jboss,dc=com?SEARCH_SCOPE:=subTreeScope&amp;secure:=false&amp;concat_atts:=true&amp;size_limit:=10000000
+				</property>
+				<property name="username">cn=Admin,dc=jboss,dc=com</property>
+				<property name="password">jbossrocks</property>
+				<property name="identityOu">jbosssso</property>
+				<property name="roleOu">role</property>
+			</provider>
+		</login>		
+		<provisioning>
+			<provider id="si:jboss-sso:ldap:login" class="org.jboss.website.security.JBossCorpIdentityProvider">
+				<property name="connectionURL">
+					jdbc:ldap://localhost:389/dc=jboss,dc=com?SEARCH_SCOPE:=subTreeScope&amp;secure:=false&amp;concat_atts:=true&amp;size_limit:=10000000
+				</property>
+				<property name="username">cn=Admin,dc=jboss,dc=com</property>
+				<property name="password">jbossrocks</property>
+				<property name="identityOu">jbosssso</property>
+				<property name="roleOu">role</property>
+			</provider>
+		</provisioning>
+	</identity-management>
+	
+	
+	<!-- sso processor for SingleSignOn, the default JBossSingleSignOn processor uses OpenSAML-1.0, 
+	the next version of this processor will use the latest SAML specification 
+	-->
+	<sso-processor>
+		<processor class="org.jboss.security.saml.JBossSingleSignOn">
+			<property name="trustServer">@dotOrgFederationServer@/trust</property>
+		</processor>
+	</sso-processor>
+</jboss-sso>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-identity-management.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-identity-management.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-identity-management.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-saml.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-saml.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-saml.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-security-common.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-security-common.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-security-common.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-sso-tomcat5.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-sso-tomcat5.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jboss-sso-tomcat5.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jbwebsite-security-1.0.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jbwebsite-security-1.0.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jbwebsite-security-1.0.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jdbcLdapJldap.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jdbcLdapJldap.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/jdbcLdapJldap.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/opensaml-1.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/opensaml-1.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/opensaml-1.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/xmlsec-20050514.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/xmlsec-20050514.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-sso.sar/xmlsec-20050514.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/configuration/to-copy/server/default/deploy/jbossweb-tomcat55.sar/tomcat-util.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jbossweb-tomcat55.sar/tomcat-util.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/binaries/forums-authz-plugin.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jboss-forums/binaries/forums-authz-plugin.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/maven.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/maven.xml	2007-08-27 12:44:04 UTC (rev 14639)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -65,7 +65,9 @@
 				<ant:filename name="*.war" />
 			</ant:fileset>
 			<ant:fileset dir="binaries">
-				<ant:filename name="*.sar" />
+				<ant:filename name="*.sar"/>
+				<!-- exclude portal-forums-authz-plugin.sar, instead the forge-security.sar will carry the security service for the forums -->
+				<ant:exclude name="portal-forums-authz-plugin.sar"/>
 			</ant:fileset>
 		</ant:copy>
 	</goal>

Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/src/application/META-INF/jboss-app.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/src/application/META-INF/jboss-app.xml	2007-08-27 12:44:04 UTC (rev 14639)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/src/application/META-INF/jboss-app.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -11,11 +11,15 @@
    </module>
    <module>
       <service>portal-forums.sar</service>
+   </module>      
+   <module>
+      <service>jboss-service.xml</service>
    </module>
+   
+   <!-- exclude portal-forums-authz-plugin.sar, instead the forge-security.sar will carry the security service for the forums -->
+   <!--
    <module>
 	   <service>portal-forums-authz-plugin.sar</service>
    </module>
-   <module>
-      <service>jboss-service.xml</service>
-   </module>
+   -->
 </jboss-app>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common)


Property changes on: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common
___________________________________________________________________
Name: svn:ignore
   + target


Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/build.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,28 +0,0 @@
-siteName=JBoss.com
-siteURL=http://localhost
-siteSSLURL=https://localhost:8443
-
-#smtpServer=10.1.8.1
-smtpServer=mail.bellsouth.net
-
-smtpPort=25
-
-smtpDebug=true
-
-#smtpUser=jboss
-smtpUser=
-
-#smtpPassword=jboss
-smtpPassword=
-
-registrationMode=EMAIL_ACTIVATION
-activationSender=siteadmin at jboss.com
-activationSubject=Email Verification needed.
-issueSender=do-not-reply at jboss.com
-activationIssueReceiver=sohil.shah at jboss.com
-activationIssueSubject=Account Activation - {0}
-resetSender=do-not-reply at jboss.com
-resetSubject=Reset Password Notification - {0}
-activationLink=/admin/activation/activate?id={0}&amp;token={1}
-profileLink=/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/profile/view.jsf&amp;id={0}
-resetPasswordLink=/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/password/tempPassword.jsf&amp;id={0}&amp;token={1}
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/build.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/build.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,28 @@
+siteName=JBoss.com
+siteURL=http://localhost
+siteSSLURL=https://localhost:8443
+
+#smtpServer=10.1.8.1
+smtpServer=mail.bellsouth.net
+
+smtpPort=25
+
+smtpDebug=true
+
+#smtpUser=jboss
+smtpUser=
+
+#smtpPassword=jboss
+smtpPassword=
+
+registrationMode=EMAIL_ACTIVATION
+activationSender=siteadmin at jboss.com
+activationSubject=Email Verification needed.
+issueSender=do-not-reply at jboss.com
+activationIssueReceiver=sohil.shah at jboss.com
+activationIssueSubject=Account Activation - {0}
+resetSender=do-not-reply at jboss.com
+resetSubject=Reset Password Notification - {0}
+activationLink=/admin/activation/activate?id={0}&amp;token={1}
+profileLink=/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/profile/view.jsf&amp;id={0}
+resetPasswordLink=/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/password/tempPassword.jsf&amp;id={0}&amp;token={1}
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/config.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,171 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<configuration>
-
-	<component class="org.jboss.website.config.Configuration">
-		<property>
-			<name>siteName</name>
-			<value>@siteName@</value>
-		</property>
-		<property>
-			<name>siteURL</name>
-			<value>@siteURL@</value>
-		</property>
-		<property>
-			<name>siteSSLURL</name>
-			<value>@siteSSLURL@</value>
-		</property>
-	</component>	
-	
-	<component class="org.jboss.website.service.mail.MailManagerImpl">
-	    <!--  required, without this value, the server defaults to localhost -->
-		<property>
-			<name>smtpServer</name>
-			<value>@smtpServer@</value>
-		</property>				
-		<!--  optional if not provided uses the default port=25 -->
-		<property>
-			<name>smtpPort</name>
-			<value>@smtpPort@</value>
-		</property>
-		<property>
-			<name>debug</name>
-			<value>@smtpDebug@</value>
-		</property>
-		<!--  optional. if not provided smtp server is used without authentication -->
-		<property>
-			<name>smtpUser</name>
-			<value>@smtpUser@</value>
-		</property>
-		<!--  optional. if not provided smtp server is used without authentication -->
-		<property>
-			<name>smtpPassword</name>
-			<value>@smtpPassword@</value>
-		</property>
-	</component>	
-	
-	<component class="org.jboss.website.user.ejb.UserManagerImpl">	    	    
-	    <!--  set registrationMode to EMAIL_ACTIVATION or DIRECT_ACTIVATION depending on your requirement -->
-		<property>
-			<name>registrationMode</name>
-			<value>@registrationMode@</value>
-		</property>
-		
-		<!-- email address of the account sending out this automatic email -->
-		<property>
-			<name>activationSender</name>
-			<value>@activationSender@</value>
-		</property>
-		<!-- subject of the activation email -->
-		<property>
-			<name>activationSubject</name>
-			<value>@activationSubject@</value>
-		</property>
-				
-		<!-- email address of the account sending out this automatic email -->
-		<property>
-			<name>issueSender</name>
-			<value>@issueSender@</value>
-		</property>
-		<property>
-			<name>activationIssueReceiver</name>
-			<value>@activationIssueReceiver@</value>
-		</property>
-		<!-- subject of the activation email -->
-		<property>
-			<name>activationIssueSubject</name>
-			<value>@activationIssueSubject@</value>
-		</property>		
-		
-		<!-- resetPasswordEmail configuration -->
-		<property>
-			<name>resetSender</name>
-			<value>@resetSender@</value>
-		</property>		
-		<property>
-			<name>resetSubject</name>
-			<value>@resetSubject@</value>
-		</property>
-		
-		<!-- links -->		
-		<property>
-			<name>activationLink</name>
-			<value>@activationLink@</value>
-		</property>
-		<property>
-			<name>profileLink</name>
-			<value>@profileLink@</value>
-		</property>
-		<property>
-			<name>resetPasswordLink</name>
-			<value>@resetPasswordLink@</value>
-		</property>
-								
-		<!-- specify the actual template in this configuration -->
-		<property>
-			<name>resetEmail</name>
-			<value>
-			    <![CDATA[
-				<html>
-					<body>
-					<span>
-						A <b style="color:red">Password Reset</b> has been requested on the following account:
-						JBoss Account : {0} <br/><br/>
-						Click this link <a href="{1}">{1}</a> to reset your password. <br/><br/>
-						If you did not request a password reset, no further action is required. <br/><br/>
-						Regards,<br/>The {2} Staff
-					</span>
-					</body>
-				</html>
-				]]>
-			</value>
-		</property>
-						
-		<!-- specify the actual template in this configuration -->
-		<property>
-			<name>activationEmail</name>
-			<value>
-			    <![CDATA[
-				<html>
-				<body>
-					<span>
-					A user with this email address has registered on our site at - {0} <br/><br/>
-					Please keep this email for your records. Your account information is as follows:<br/><br/>
-					----------------------------<br/>
-					UserName: {1} <br/>
-					----------------------------<br/><br/>
-					Your account is currently inactive. You cannot use it until you visit the following link: <br/>
-					<a href="{2}">{2}</a><br/><br/>
-					If you did not register for membership on our site, no further action is required. <br/><br/>
-					Regards,<br/>The {3} Staff
-					</span>
-				</body>
-				</html>
-				]]>
-			</value>
-		</property>
-				
-		<!-- specify the actual template in this configuration -->
-		<property>
-			<name>activationIssueEmail</name>
-			<value>
-			    <![CDATA[
-				<html>
-				<body>
-					<span>
-					The following account needs to be activated as requested by the user 
-					Login : {0} <br/>
-					Registered Email Address : {1} <br/>
-					Email Address specified by the user to be contacted at : {2} <br/>
-					IP address when the request was issued : {3} <br/>
-					Password Verified in the process : {4} <br/>
-					Click this link <a href="{5}">{5}</a> to activate this account. <br/>
-					Click this link <a href="{6}">{6}</a> to look at this user's profile. <br/>
-					</span>
-				</body>
-				</html>
-				]]>
-			</value>
-		</property>				
-	</component>						
-</configuration>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/config.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,171 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<configuration>
+
+	<component class="org.jboss.website.config.Configuration">
+		<property>
+			<name>siteName</name>
+			<value>@siteName@</value>
+		</property>
+		<property>
+			<name>siteURL</name>
+			<value>@siteURL@</value>
+		</property>
+		<property>
+			<name>siteSSLURL</name>
+			<value>@siteSSLURL@</value>
+		</property>
+	</component>	
+	
+	<component class="org.jboss.website.service.mail.MailManagerImpl">
+	    <!--  required, without this value, the server defaults to localhost -->
+		<property>
+			<name>smtpServer</name>
+			<value>@smtpServer@</value>
+		</property>				
+		<!--  optional if not provided uses the default port=25 -->
+		<property>
+			<name>smtpPort</name>
+			<value>@smtpPort@</value>
+		</property>
+		<property>
+			<name>debug</name>
+			<value>@smtpDebug@</value>
+		</property>
+		<!--  optional. if not provided smtp server is used without authentication -->
+		<property>
+			<name>smtpUser</name>
+			<value>@smtpUser@</value>
+		</property>
+		<!--  optional. if not provided smtp server is used without authentication -->
+		<property>
+			<name>smtpPassword</name>
+			<value>@smtpPassword@</value>
+		</property>
+	</component>	
+	
+	<component class="org.jboss.website.user.ejb.UserManagerImpl">	    	    
+	    <!--  set registrationMode to EMAIL_ACTIVATION or DIRECT_ACTIVATION depending on your requirement -->
+		<property>
+			<name>registrationMode</name>
+			<value>@registrationMode@</value>
+		</property>
+		
+		<!-- email address of the account sending out this automatic email -->
+		<property>
+			<name>activationSender</name>
+			<value>@activationSender@</value>
+		</property>
+		<!-- subject of the activation email -->
+		<property>
+			<name>activationSubject</name>
+			<value>@activationSubject@</value>
+		</property>
+				
+		<!-- email address of the account sending out this automatic email -->
+		<property>
+			<name>issueSender</name>
+			<value>@issueSender@</value>
+		</property>
+		<property>
+			<name>activationIssueReceiver</name>
+			<value>@activationIssueReceiver@</value>
+		</property>
+		<!-- subject of the activation email -->
+		<property>
+			<name>activationIssueSubject</name>
+			<value>@activationIssueSubject@</value>
+		</property>		
+		
+		<!-- resetPasswordEmail configuration -->
+		<property>
+			<name>resetSender</name>
+			<value>@resetSender@</value>
+		</property>		
+		<property>
+			<name>resetSubject</name>
+			<value>@resetSubject@</value>
+		</property>
+		
+		<!-- links -->		
+		<property>
+			<name>activationLink</name>
+			<value>@activationLink@</value>
+		</property>
+		<property>
+			<name>profileLink</name>
+			<value>@profileLink@</value>
+		</property>
+		<property>
+			<name>resetPasswordLink</name>
+			<value>@resetPasswordLink@</value>
+		</property>
+								
+		<!-- specify the actual template in this configuration -->
+		<property>
+			<name>resetEmail</name>
+			<value>
+			    <![CDATA[
+				<html>
+					<body>
+					<span>
+						A <b style="color:red">Password Reset</b> has been requested on the following account:
+						JBoss Account : {0} <br/><br/>
+						Click this link <a href="{1}">{1}</a> to reset your password. <br/><br/>
+						If you did not request a password reset, no further action is required. <br/><br/>
+						Regards,<br/>The {2} Staff
+					</span>
+					</body>
+				</html>
+				]]>
+			</value>
+		</property>
+						
+		<!-- specify the actual template in this configuration -->
+		<property>
+			<name>activationEmail</name>
+			<value>
+			    <![CDATA[
+				<html>
+				<body>
+					<span>
+					A user with this email address has registered on our site at - {0} <br/><br/>
+					Please keep this email for your records. Your account information is as follows:<br/><br/>
+					----------------------------<br/>
+					UserName: {1} <br/>
+					----------------------------<br/><br/>
+					Your account is currently inactive. You cannot use it until you visit the following link: <br/>
+					<a href="{2}">{2}</a><br/><br/>
+					If you did not register for membership on our site, no further action is required. <br/><br/>
+					Regards,<br/>The {3} Staff
+					</span>
+				</body>
+				</html>
+				]]>
+			</value>
+		</property>
+				
+		<!-- specify the actual template in this configuration -->
+		<property>
+			<name>activationIssueEmail</name>
+			<value>
+			    <![CDATA[
+				<html>
+				<body>
+					<span>
+					The following account needs to be activated as requested by the user 
+					Login : {0} <br/>
+					Registered Email Address : {1} <br/>
+					Email Address specified by the user to be contacted at : {2} <br/>
+					IP address when the request was issued : {3} <br/>
+					Password Verified in the process : {4} <br/>
+					Click this link <a href="{5}">{5}</a> to activate this account. <br/>
+					Click this link <a href="{6}">{6}</a> to look at this user's profile. <br/>
+					</span>
+				</body>
+				</html>
+				]]>
+			</value>
+		</property>				
+	</component>						
+</configuration>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/maven.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,32 +0,0 @@
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-    <goal name="all">
-    	<attainGoal name="clean" />
-    	<attainGoal name="build" />
-    	<attainGoal name="deploy" />
-    </goal>
-    
-    <goal name="clean">
-		<attainGoal name="prj-clean"/>
-    </goal>
-
-    <goal name="build">
-        <!-- generate the src/etc/META-INF/config.xml file -->
-        <filter filtersfile="build.properties"/>
-		<ant:copy file="config.xml" 
-		tofile="src/etc/META-INF/config.xml" 
-		overwrite="true"
-		filtering="true"
-		/>
-        <attainGoal name="jar"/>
-        <ant:delete file="target/jbosswebsite-common-1.0.jar"/>
-		<ant:jar destfile="target/jbosswebsite-common-1.0.jar" basedir="target/classes"/>
-    </goal> 
-    
-    <goal name="deploy">
-    </goal>   
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/maven.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,32 @@
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+    <goal name="all">
+    	<attainGoal name="clean" />
+    	<attainGoal name="build" />
+    	<attainGoal name="deploy" />
+    </goal>
+    
+    <goal name="clean">
+		<attainGoal name="prj-clean"/>
+    </goal>
+
+    <goal name="build">
+        <!-- generate the src/etc/META-INF/config.xml file -->
+        <filter filtersfile="build.properties"/>
+		<ant:copy file="config.xml" 
+		tofile="src/etc/META-INF/config.xml" 
+		overwrite="true"
+		filtering="true"
+		/>
+        <attainGoal name="jar"/>
+        <ant:delete file="target/jbosswebsite-common-1.0.jar"/>
+		<ant:jar destfile="target/jbosswebsite-common-1.0.jar" basedir="target/classes"/>
+    </goal> 
+    
+    <goal name="deploy">
+    </goal>   
+</project>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/project.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,2 +0,0 @@
-maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
-maven.junit.fork=yes

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/project.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,2 @@
+maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
+maven.junit.fork=yes

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/project.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,180 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
-    <id>jbosswebsite-common</id>
-    <name>Common jboss website code</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Sohil Shah</name>
-        <url>http://www.jboss.org</url>
-    </organization>
-    <description></description>
-    
-    <dependencies>
-    
-       <!--  application-level dependencies -->
-       <dependency>
-	    	<groupId>jbosswebsite</groupId>
-	    	<artifactId>jbwebsite-security</artifactId>
-	    	<version>1.0</version>
-	   </dependency>
-	   
-	   <!--  jboss sso framework libraries -->
-    	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-security-common</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-security-common.jar</jar>
-    	</dependency>
-    	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-identity-management</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-identity-management.jar</jar>
-    	</dependency>
-    	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-acl</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-acl.jar</jar>
-    	</dependency>
-    		            	
-    	<!--  jsf/facelets/el dependencies -->
-    	<dependency>
-    		<groupId>myfaces</groupId>
-            <artifactId>myfaces-all</artifactId>
-            <version>1.1.1</version>
-            <jar>myfaces-all-1.1.1.jar</jar>
-    	</dependency>
-    	<dependency>
-    		<groupId>myfaces</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.0</version>
-            <jar>jsf-facelets.jar</jar>
-    	</dependency>
-    	<dependency>
-    		<groupId>el</groupId>
-            <artifactId>el-api.jar</artifactId>
-            <version>1.0</version>
-            <jar>el-api.jar</jar>
-    	</dependency>
-    	    		   	   
-	       	
-    	<!-- jboss cache dependency -->
-    	<dependency>
-	    	<groupId>jbosscache</groupId>
-	    	<artifactId>jboss-cache</artifactId>
-	    	<version>1.4.0.SP1</version>
-	    	<jar>jboss-cache.jar</jar>
-		</dependency>
-		
-		<dependency>
-            <groupId>validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.2.0</version>
-            <jar>commons-validator-1.2.0.jar</jar>
-    	</dependency>
-    	
-       <dependency>
-		<groupId>email</groupId>
-		<artifactId>commons-email</artifactId>
-		<version>1.0</version>
-    	<jar>commons-email-1.0.jar</jar>
-	   </dependency>
-	   
-	   <dependency>
-		<groupId>email</groupId>
-		<artifactId>mail</artifactId>
-		<version>1.0</version>
-    	<jar>mail.jar</jar>
-	   </dependency>
-    	    	
-        	
-    	<!--  core jboss dependencies -->
-    	<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>hibernate3</artifactId>
-            <version>1.0</version>
-            <jar>hibernate3.jar</jar>
-    	</dependency>
-    	    	
-    	<dependency>
-                <groupId>jboss</groupId>
-                <artifactId>jboss-j2ee</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-j2ee.jar</jar>
-    	</dependency>    	    	
-    	    		   
-	   <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.0</version>
-            <jar>activation.jar</jar>
-        </dependency>
-            	
-    	<dependency>
-		    <groupId>jboss</groupId>
-		    <artifactId>jsp</artifactId>
-		    <version>1.0</version>
-		    <jar>javax.servlet.jsp.jar</jar>
-    	</dependency>
-		
-		<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-ejb3</artifactId>
-            <version>1.0</version>
-            <jar>jboss-ejb3.jar</jar>
-        </dependency>
-        
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-ejb3x</artifactId>
-            <version>1.0</version>
-            <jar>jboss-ejb3x.jar</jar>
-        </dependency>
-                
-        <dependency>
-                <groupId>jboss</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.0</version>
-                <jar>log4j.jar</jar>
-    	</dependency>
-    		   
-	   <dependency>
-                <groupId>jboss</groupId>
-                <artifactId>javax.servlet</artifactId>
-                <version>1.0</version>
-                <jar>javax.servlet.jar</jar>
-       </dependency>
-                  	
-    	<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-system</artifactId>
-            <version>1.0</version>
-            <jar>jboss-system.jar</jar>
-    	</dependency>
-    	
-    	<dependency>
-    		<groupId>jboss</groupId>
-    		<artifactId>jbosssx</artifactId>
-    		<version>3.2.3</version>
-    		<jar>jbosssx.jar</jar>
-		</dependency>
-    	        
-    </dependencies>
-    
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/etc/</directory>                
-            </resource>
-        </resources>
-    </build>
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/project.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/project.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,180 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../common.xml</extend>
+    <id>jbosswebsite-common</id>
+    <name>Common jboss website code</name>
+    <currentVersion>1.0</currentVersion>
+    <organization>
+        <name>Sohil Shah</name>
+        <url>http://www.jboss.org</url>
+    </organization>
+    <description></description>
+    
+    <dependencies>
+    
+       <!--  application-level dependencies -->
+       <dependency>
+	    	<groupId>jbosswebsite</groupId>
+	    	<artifactId>jbwebsite-security</artifactId>
+	    	<version>1.0</version>
+	   </dependency>
+	   
+	   <!--  jboss sso framework libraries -->
+    	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-security-common</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-security-common.jar</jar>
+    	</dependency>
+    	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-identity-management</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-identity-management.jar</jar>
+    	</dependency>
+    	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-acl</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-acl.jar</jar>
+    	</dependency>
+    		            	
+    	<!--  jsf/facelets/el dependencies -->
+    	<dependency>
+    		<groupId>myfaces</groupId>
+            <artifactId>myfaces-all</artifactId>
+            <version>1.1.1</version>
+            <jar>myfaces-all-1.1.1.jar</jar>
+    	</dependency>
+    	<dependency>
+    		<groupId>myfaces</groupId>
+            <artifactId>jsf-facelets</artifactId>
+            <version>1.0</version>
+            <jar>jsf-facelets.jar</jar>
+    	</dependency>
+    	<dependency>
+    		<groupId>el</groupId>
+            <artifactId>el-api.jar</artifactId>
+            <version>1.0</version>
+            <jar>el-api.jar</jar>
+    	</dependency>
+    	    		   	   
+	       	
+    	<!-- jboss cache dependency -->
+    	<dependency>
+	    	<groupId>jbosscache</groupId>
+	    	<artifactId>jboss-cache</artifactId>
+	    	<version>1.4.0.SP1</version>
+	    	<jar>jboss-cache.jar</jar>
+		</dependency>
+		
+		<dependency>
+            <groupId>validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.2.0</version>
+            <jar>commons-validator-1.2.0.jar</jar>
+    	</dependency>
+    	
+       <dependency>
+		<groupId>email</groupId>
+		<artifactId>commons-email</artifactId>
+		<version>1.0</version>
+    	<jar>commons-email-1.0.jar</jar>
+	   </dependency>
+	   
+	   <dependency>
+		<groupId>email</groupId>
+		<artifactId>mail</artifactId>
+		<version>1.0</version>
+    	<jar>mail.jar</jar>
+	   </dependency>
+    	    	
+        	
+    	<!--  core jboss dependencies -->
+    	<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>hibernate3</artifactId>
+            <version>1.0</version>
+            <jar>hibernate3.jar</jar>
+    	</dependency>
+    	    	
+    	<dependency>
+                <groupId>jboss</groupId>
+                <artifactId>jboss-j2ee</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-j2ee.jar</jar>
+    	</dependency>    	    	
+    	    		   
+	   <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.0</version>
+            <jar>activation.jar</jar>
+        </dependency>
+            	
+    	<dependency>
+		    <groupId>jboss</groupId>
+		    <artifactId>jsp</artifactId>
+		    <version>1.0</version>
+		    <jar>javax.servlet.jsp.jar</jar>
+    	</dependency>
+		
+		<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-ejb3</artifactId>
+            <version>1.0</version>
+            <jar>jboss-ejb3.jar</jar>
+        </dependency>
+        
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-ejb3x</artifactId>
+            <version>1.0</version>
+            <jar>jboss-ejb3x.jar</jar>
+        </dependency>
+                
+        <dependency>
+                <groupId>jboss</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.0</version>
+                <jar>log4j.jar</jar>
+    	</dependency>
+    		   
+	   <dependency>
+                <groupId>jboss</groupId>
+                <artifactId>javax.servlet</artifactId>
+                <version>1.0</version>
+                <jar>javax.servlet.jar</jar>
+       </dependency>
+                  	
+    	<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-system</artifactId>
+            <version>1.0</version>
+            <jar>jboss-system.jar</jar>
+    	</dependency>
+    	
+    	<dependency>
+    		<groupId>jboss</groupId>
+    		<artifactId>jbosssx</artifactId>
+    		<version>3.2.3</version>
+    		<jar>jbosssx.jar</jar>
+		</dependency>
+    	        
+    </dependencies>
+    
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/etc/</directory>                
+            </resource>
+        </resources>
+    </build>
+</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/sar)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/sar/META-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,587 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<server>
-
-	<!-- configute the site Startup service -->	
-	<mbean name="jbwebsite:service=Startup"	
-	code="org.jboss.website.utils.Startup"
-	xmbean-dd=""
-	>    
-		<xmbean>
-			<class>org.jboss.website.utils.Startup</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.website.utils.Startup</name>
-   			</constructor>			
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>		    
-		</xmbean>
-	</mbean>
-	
-	<!-- Resource Factory service -->	
-	<mbean name="jbwebsite:service=Resources"	
-	code="org.jboss.website.utils.CMSResources"
-	xmbean-dd=""
-	>
-	    <depends>jbwebsite:service=ContentManager</depends>	    
-	    <attribute name="base">/code/bundles</attribute>	    
-	    <attribute name="resources">org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages</attribute>	    
-		<xmbean>
-			<class>org.jboss.website.utils.CMSResources</class>
-			<attribute access="read-write" getMethod="getResources" setMethod="setResources">
-				     <name>resources</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages"/>
-					 </descriptors>
-		    </attribute>
-		    <attribute access="read-write" getMethod="getBase" setMethod="setBase">
-				     <name>base</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="/code/bundles"/>
-					 </descriptors>
-		    </attribute>
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get Label from a bundle</description>
-		    	<name>getString</name>
-		    	<parameter>
-			      <description>Bundle Name</description>
-			      <name>bundleName</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>Key</description>
-			      <name>key</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get Label from a bundle</description>
-		    	<name>getString</name>
-		    	<parameter>
-			      <description>Bundle Name</description>
-			      <name>bundleName</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>Key</description>
-			      <name>key</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>input</description>
-			      <name>input</name>
-			      <type>[Ljava.lang.Object;</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>		    
-		</xmbean>
-	</mbean>
-
-
-	<!--  configure the PortalCMSContentManager that integrates with the PortalCMS -->
-	<mbean name="jbwebsite:service=ContentManager"	
-	code="org.jboss.website.cms.PortalCMSContentManager" 
-	xmbean-dd=""
-	>
-	    <attribute name="basePath">/services/dotcom/cms-cache</attribute>
-	    <attribute name="rootPath">/nukes</attribute>
-		<xmbean>
-			<class>org.jboss.website.cms.PortalCMSContentManager</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.website.cms.PortalCMSContentManager</name>
-   			</constructor>
-			<attribute access="read-write" getMethod="getBasePath" setMethod="setBasePath">
-				     <name>basePath</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="/services/dotcom/cms-cache"/>
-					 </descriptors>
-		    </attribute>
-		    <attribute access="read-write" getMethod="getRootPath" setMethod="setRootPath">
-				     <name>rootPath</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="/nukes"/>
-					 </descriptors>
-		    </attribute>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get the inputstream to a resource</description>
-		    	<name>getInputStream</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>name</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.io.InputStream</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Copies the CMS Resource to a file on the local drive</description>
-		    	<name>copyResourceToFile</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>name</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>(no description)</description>
-			      <name>destination</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>void</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Checks if a resource exists in the CMS</description>
-		    	<name>exists</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>boolean</return-type>		    	
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>Get the CMS Resource in byte[] format</description>
-		    	<name>getResource</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>[B</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get the CMS Resource in String format</description>
-		    	<name>getResourceAsString</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get the CMS Resource in byte[] format</description>
-		    	<name>getProtectedResource</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>[B</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get the CMS Resource in String format</description>
-		    	<name>getProtectedResourceAsString</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Copies the CMS Resource to a file on the local drive</description>
-		    	<name>copyResourceToFile</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>name</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>(no description)</description>
-			      <name>destination</name>
-			      <type>java.io.File</type>
-			    </parameter>
-    			<return-type>void</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description></description>
-		    	<name>getRealPath</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description></description>
-		    	<name>getParentPath</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description></description>
-		    	<name>getRootPath</name>		    	
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>		    
-		    <operation impact="ACTION_INFO">
-		    	<description></description>
-		    	<name>isFolder</name>
-		    	<parameter>
-			      <description>(no description)</description>
-			      <name>path</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>boolean</return-type>		    	
-		    </operation>
-		</xmbean>
-	</mbean>
-			
-	<!-- configute the DownloadsManager service -->	
-	<mbean name="jbwebsite:service=DownloadsManager"	
-	code="org.jboss.website.downloads.controller.DownloadsManagerImpl"
-	xmbean-dd=""
-	>    
-		<attribute name="basePath">/services/dotcom/downloads-cache</attribute>
-	    <attribute name="rootPath">/downloads-repo</attribute>
-		<xmbean>
-			<class>org.jboss.website.downloads.controller.DownloadsManagerImpl</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.website.downloads.controller.DownloadsManagerImpl</name>
-   			</constructor>
-   			<attribute access="read-write" getMethod="getBasePath" setMethod="setBasePath">
-				     <name>basePath</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="/services/dotcom/downloads-cache"/>
-					 </descriptors>
-		    </attribute>
-		    <attribute access="read-write" getMethod="getRootPath" setMethod="setRootPath">
-				     <name>rootPath</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="/downloads-repo"/>
-					 </descriptors>
-		    </attribute>			 
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Returns a the specified DownloadFolder</description>
-		    	<name>getFolder</name>
-		    	<parameter>
-			      <description>Id of the Download Folder to be fetched</description>
-			      <name>folderId</name>
-			      <type>java.lang.String</type>
-			    </parameter>			    
-    			<return-type>org.jboss.website.downloads.bo.DownloadFolder</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Fully loads all the content of the specified file</description>
-		    	<name>getFile</name>
-		    	<parameter>
-			      <description>Id of the Download File to be fetched</description>
-			      <name>fileId</name>
-			      <type>java.lang.String</type>
-			    </parameter>			    
-    			<return-type>org.jboss.website.downloads.bo.DownloadFile</return-type>		    	
-		    </operation>		    
-		</xmbean>
-	</mbean>	
-	
-	<!-- configute the NewsCrawler service -->	
-	<!--mbean name="jbwebsite:service=NewsCrawler"	
-	code="org.jboss.website.news.controller.NewsCrawlerImpl"
-	xmbean-dd=""
-	>    
-		<xmbean>
-			<class>org.jboss.website.news.controller.NewsCrawlerImpl</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.website.news.controller.NewsCrawlerImpl</name>
-   			</constructor>			 
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get the topic that the news archive is organized into</description>
-		    	<name>getTopics</name>		    			    	
-    			<return-type>java.util.Collection</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Returns a bunch of news entries</description>
-		    	<name>getEntries</name>
-		    	<parameter>
-			      <description>Id of the Topic to which the News Entries belong to</description>
-			      <name>topicId</name>
-			      <type>java.lang.String</type>
-			    </parameter>		    	
-    			<return-type>java.util.Collection</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Returns a the news details about the specified news entry</description>
-		    	<name>getEntry</name>
-		    	<parameter>
-			      <description>Id of the News Entry to be fetched</description>
-			      <name>newsId</name>
-			      <type>java.lang.String</type>
-			    </parameter>			    
-    			<return-type>org.jboss.website.news.bo.NewsEntry</return-type>		    	
-		    </operation>		    		    
-		</xmbean>
-	</mbean-->
-	
-	<!-- integrating the clustered jboss cache service -->
-   <mbean code="org.jboss.cache.TreeCache"
-          name="jbwebsite:service=TreeCache">
-           <depends>jboss:service=Naming</depends>
-           <depends>jboss:service=TransactionManager</depends>           
-      <!--
-      Configure the TransactionManager
-      -->
-      <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-
-      <!--
-        Node locking scheme:
-        OPTIMISTIC
-        PESSIMISTIC (default)
-        using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
-        -->
-      <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name="CacheMode">REPL_ASYNC</attribute>      
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name="UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name="ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name="ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all clusters, in order
-           to find each other
-      -->
-      <attribute name="ClusterName">JBossDotComCache</attribute>
-
-      <!-- JGroups protocol stack properties. Can also be a URL,
-           e.g. file:/home/bela/default.xml
-         <attribute name="ClusterProperties"></attribute>
-      -->
-
-      <attribute name="ClusterConfig">
-               <config>
-                   <!-- UDP: if you have a multihomed machine,
-                   set the bind_addr attribute to the appropriate NIC IP address -->
-                  <!-- UDP: On Windows machines, because of the media sense feature
-            being broken with multicast (even after disabling media sense)
-            set the loopback attribute to true -->
-                  <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-                       ip_ttl="64" ip_mcast="true"
-                       receive_on_all_interfaces="true"
-                       mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
-                       ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
-                       loopback="false"/>                   
-                   <PING timeout="2000" num_initial_members="3"
-                         up_thread="false" down_thread="false"/>
-                   <MERGE2 min_interval="10000" max_interval="20000"/>
-                  <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
-                  <FD_SOCK/>
-                   <VERIFY_SUSPECT timeout="1500"
-                                   up_thread="false" down_thread="false"/>
-                   <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-                                  max_xmit_size="8192" up_thread="false" down_thread="false"/>
-                   <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-                            down_thread="false"/>
-                   <pbcast.STABLE desired_avg_gossip="20000"
-                                  up_thread="false" down_thread="false"/>
-                   <FRAG frag_size="8192"
-                         down_thread="false" up_thread="false"/>
-                   <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-                               shun="true" print_local_addr="true"/>
-                   <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
-               </config>
-           </attribute>
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
-
-       Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
-      -->
-      <!--attribute name="FetchInMemoryState">false</attribute-->
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          initial state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name="InitialStateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name="SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name="LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Name of the eviction policy class. -->
-      <attribute name="EvictionPolicyClass"></attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "false".
-
-         Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
-      -->
-      <!--attribute name="UseRegionBasedMarshalling">false</attribute-->      
-    </mbean>
-    
-    <mbean name="jbwebsite:service=Cache"	
-	code="org.jboss.website.cache.CacheServiceImpl"
-	xmbean-dd=""
-	>
-	    <depends>jbwebsite:service=TreeCache</depends>
-	    <attribute name="cache">jbwebsite:service=TreeCache</attribute>
-		<xmbean>
-			<class>org.jboss.website.cache.CacheServiceImpl</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.website.cache.CacheServiceImpl</name>
-   			</constructor>
-   			<attribute access="read-write" getMethod="getCache" setMethod="setCache">
-				     <name>cache</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="jbwebsite:service=TreeCache"/>
-					 </descriptors>
-		    </attribute>		    
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Puts the specified node into the cache</description>
-		    	<name>put</name>
-		    	<parameter>
-			      <description>Node Name</description>
-			      <name>node</name>
-			      <type>java.lang.String</type>
-			    </parameter>			    
-    			<return-type>void</return-type>		    	
-		    </operation>		    
-		</xmbean>
-	</mbean>
-    
-    <!-- Proxy factory for JBossDotCom Cache Service used only for unit testing  -->
-   <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
-      name="jboss.jmx:type=adaptor,name=RemoteCache,protocol=jrmp,service=proxyFactory">
-      <!-- Use the standard JRMPInvoker from conf/jboss-service.xxml -->
-      <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
-      <!-- The target MBean -->
-      <depends optional-attribute-name="TargetName">jbwebsite:service=TreeCache</depends>
-      <!-- Where to bind the proxy factory -->
-      <attribute name="JndiName">RemoteCache</attribute>
-      <!-- Invoke target method instead of invoke(Invocation mi) -->
-      <attribute name="InvokeTargetMethod">true</attribute>
-      <!-- Comma-separated list of exported interfaces -->
-      <attribute name="ExportedInterfaces">org.jboss.cache.TreeCacheMBean</attribute>
-      <!-- client-side interceptors -->
-      <attribute name="ClientInterceptors">
-          <interceptors>
-             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
-             <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
-             <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
-             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
-          </interceptors>
-      </attribute>
-   </mbean>
-   
-   <!-- Proxy factory for CMS used only for unit testing -->
-   <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
-      name="jboss.jmx:type=adaptor,name=RemoteCMS,protocol=jrmp,service=proxyFactory">
-      <!-- Use the standard JRMPInvoker from conf/jboss-service.xxml -->
-      <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
-      <!-- The target MBean -->
-      <depends optional-attribute-name="TargetName">jbwebsite:service=ContentManager</depends>
-      <!-- Where to bind the proxy factory -->
-      <attribute name="JndiName">RemoteCMS</attribute>
-      <!-- Invoke target method instead of invoke(Invocation mi) -->
-      <attribute name="InvokeTargetMethod">true</attribute>
-      <!-- Comma-separated list of exported interfaces -->
-      <attribute name="ExportedInterfaces">org.jboss.website.cms.CMS</attribute>
-      <!-- client-side interceptors -->
-      <attribute name="ClientInterceptors">
-          <interceptors>
-             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
-             <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
-             <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
-             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
-          </interceptors>
-      </attribute>
-   </mbean>
-</server>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/sar/META-INF/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,587 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<server>
+
+	<!-- configute the site Startup service -->	
+	<mbean name="jbwebsite:service=Startup"	
+	code="org.jboss.website.utils.Startup"
+	xmbean-dd=""
+	>    
+		<xmbean>
+			<class>org.jboss.website.utils.Startup</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.website.utils.Startup</name>
+   			</constructor>			
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>		    
+		</xmbean>
+	</mbean>
+	
+	<!-- Resource Factory service -->	
+	<mbean name="jbwebsite:service=Resources"	
+	code="org.jboss.website.utils.CMSResources"
+	xmbean-dd=""
+	>
+	    <depends>jbwebsite:service=ContentManager</depends>	    
+	    <attribute name="base">/code/bundles</attribute>	    
+	    <attribute name="resources">org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages</attribute>	    
+		<xmbean>
+			<class>org.jboss.website.utils.CMSResources</class>
+			<attribute access="read-write" getMethod="getResources" setMethod="setResources">
+				     <name>resources</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages"/>
+					 </descriptors>
+		    </attribute>
+		    <attribute access="read-write" getMethod="getBase" setMethod="setBase">
+				     <name>base</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="/code/bundles"/>
+					 </descriptors>
+		    </attribute>
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get Label from a bundle</description>
+		    	<name>getString</name>
+		    	<parameter>
+			      <description>Bundle Name</description>
+			      <name>bundleName</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>Key</description>
+			      <name>key</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get Label from a bundle</description>
+		    	<name>getString</name>
+		    	<parameter>
+			      <description>Bundle Name</description>
+			      <name>bundleName</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>Key</description>
+			      <name>key</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>input</description>
+			      <name>input</name>
+			      <type>[Ljava.lang.Object;</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>		    
+		</xmbean>
+	</mbean>
+
+
+	<!--  configure the PortalCMSContentManager that integrates with the PortalCMS -->
+	<mbean name="jbwebsite:service=ContentManager"	
+	code="org.jboss.website.cms.PortalCMSContentManager" 
+	xmbean-dd=""
+	>
+	    <attribute name="basePath">/services/dotcom/cms-cache</attribute>
+	    <attribute name="rootPath">/nukes</attribute>
+		<xmbean>
+			<class>org.jboss.website.cms.PortalCMSContentManager</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.website.cms.PortalCMSContentManager</name>
+   			</constructor>
+			<attribute access="read-write" getMethod="getBasePath" setMethod="setBasePath">
+				     <name>basePath</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="/services/dotcom/cms-cache"/>
+					 </descriptors>
+		    </attribute>
+		    <attribute access="read-write" getMethod="getRootPath" setMethod="setRootPath">
+				     <name>rootPath</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="/nukes"/>
+					 </descriptors>
+		    </attribute>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get the inputstream to a resource</description>
+		    	<name>getInputStream</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>name</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.io.InputStream</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Copies the CMS Resource to a file on the local drive</description>
+		    	<name>copyResourceToFile</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>name</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>(no description)</description>
+			      <name>destination</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>void</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Checks if a resource exists in the CMS</description>
+		    	<name>exists</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>boolean</return-type>		    	
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>Get the CMS Resource in byte[] format</description>
+		    	<name>getResource</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>[B</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get the CMS Resource in String format</description>
+		    	<name>getResourceAsString</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get the CMS Resource in byte[] format</description>
+		    	<name>getProtectedResource</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>[B</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get the CMS Resource in String format</description>
+		    	<name>getProtectedResourceAsString</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Copies the CMS Resource to a file on the local drive</description>
+		    	<name>copyResourceToFile</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>name</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>(no description)</description>
+			      <name>destination</name>
+			      <type>java.io.File</type>
+			    </parameter>
+    			<return-type>void</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description></description>
+		    	<name>getRealPath</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description></description>
+		    	<name>getParentPath</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description></description>
+		    	<name>getRootPath</name>		    	
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>		    
+		    <operation impact="ACTION_INFO">
+		    	<description></description>
+		    	<name>isFolder</name>
+		    	<parameter>
+			      <description>(no description)</description>
+			      <name>path</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>boolean</return-type>		    	
+		    </operation>
+		</xmbean>
+	</mbean>
+			
+	<!-- configute the DownloadsManager service -->	
+	<mbean name="jbwebsite:service=DownloadsManager"	
+	code="org.jboss.website.downloads.controller.DownloadsManagerImpl"
+	xmbean-dd=""
+	>    
+		<attribute name="basePath">/services/dotcom/downloads-cache</attribute>
+	    <attribute name="rootPath">/downloads-repo</attribute>
+		<xmbean>
+			<class>org.jboss.website.downloads.controller.DownloadsManagerImpl</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.website.downloads.controller.DownloadsManagerImpl</name>
+   			</constructor>
+   			<attribute access="read-write" getMethod="getBasePath" setMethod="setBasePath">
+				     <name>basePath</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="/services/dotcom/downloads-cache"/>
+					 </descriptors>
+		    </attribute>
+		    <attribute access="read-write" getMethod="getRootPath" setMethod="setRootPath">
+				     <name>rootPath</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="/downloads-repo"/>
+					 </descriptors>
+		    </attribute>			 
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Returns a the specified DownloadFolder</description>
+		    	<name>getFolder</name>
+		    	<parameter>
+			      <description>Id of the Download Folder to be fetched</description>
+			      <name>folderId</name>
+			      <type>java.lang.String</type>
+			    </parameter>			    
+    			<return-type>org.jboss.website.downloads.bo.DownloadFolder</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Fully loads all the content of the specified file</description>
+		    	<name>getFile</name>
+		    	<parameter>
+			      <description>Id of the Download File to be fetched</description>
+			      <name>fileId</name>
+			      <type>java.lang.String</type>
+			    </parameter>			    
+    			<return-type>org.jboss.website.downloads.bo.DownloadFile</return-type>		    	
+		    </operation>		    
+		</xmbean>
+	</mbean>	
+	
+	<!-- configute the NewsCrawler service -->	
+	<!--mbean name="jbwebsite:service=NewsCrawler"	
+	code="org.jboss.website.news.controller.NewsCrawlerImpl"
+	xmbean-dd=""
+	>    
+		<xmbean>
+			<class>org.jboss.website.news.controller.NewsCrawlerImpl</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.website.news.controller.NewsCrawlerImpl</name>
+   			</constructor>			 
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get the topic that the news archive is organized into</description>
+		    	<name>getTopics</name>		    			    	
+    			<return-type>java.util.Collection</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Returns a bunch of news entries</description>
+		    	<name>getEntries</name>
+		    	<parameter>
+			      <description>Id of the Topic to which the News Entries belong to</description>
+			      <name>topicId</name>
+			      <type>java.lang.String</type>
+			    </parameter>		    	
+    			<return-type>java.util.Collection</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Returns a the news details about the specified news entry</description>
+		    	<name>getEntry</name>
+		    	<parameter>
+			      <description>Id of the News Entry to be fetched</description>
+			      <name>newsId</name>
+			      <type>java.lang.String</type>
+			    </parameter>			    
+    			<return-type>org.jboss.website.news.bo.NewsEntry</return-type>		    	
+		    </operation>		    		    
+		</xmbean>
+	</mbean-->
+	
+	<!-- integrating the clustered jboss cache service -->
+   <mbean code="org.jboss.cache.TreeCache"
+          name="jbwebsite:service=TreeCache">
+           <depends>jboss:service=Naming</depends>
+           <depends>jboss:service=TransactionManager</depends>           
+      <!--
+      Configure the TransactionManager
+      -->
+      <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+      <!--
+        Node locking scheme:
+        OPTIMISTIC
+        PESSIMISTIC (default)
+        using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
+        -->
+      <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name="CacheMode">REPL_ASYNC</attribute>      
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name="UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name="ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name="ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all clusters, in order
+           to find each other
+      -->
+      <attribute name="ClusterName">JBossDotComCache</attribute>
+
+      <!-- JGroups protocol stack properties. Can also be a URL,
+           e.g. file:/home/bela/default.xml
+         <attribute name="ClusterProperties"></attribute>
+      -->
+
+      <attribute name="ClusterConfig">
+               <config>
+                   <!-- UDP: if you have a multihomed machine,
+                   set the bind_addr attribute to the appropriate NIC IP address -->
+                  <!-- UDP: On Windows machines, because of the media sense feature
+            being broken with multicast (even after disabling media sense)
+            set the loopback attribute to true -->
+                  <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+                       ip_ttl="64" ip_mcast="true"
+                       receive_on_all_interfaces="true"
+                       mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
+                       ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
+                       loopback="false"/>                   
+                   <PING timeout="2000" num_initial_members="3"
+                         up_thread="false" down_thread="false"/>
+                   <MERGE2 min_interval="10000" max_interval="20000"/>
+                  <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
+                  <FD_SOCK/>
+                   <VERIFY_SUSPECT timeout="1500"
+                                   up_thread="false" down_thread="false"/>
+                   <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
+                                  max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                   <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
+                            down_thread="false"/>
+                   <pbcast.STABLE desired_avg_gossip="20000"
+                                  up_thread="false" down_thread="false"/>
+                   <FRAG frag_size="8192"
+                         down_thread="false" up_thread="false"/>
+                   <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
+                               shun="true" print_local_addr="true"/>
+                   <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
+               </config>
+           </attribute>
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
+
+       Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+      -->
+      <!--attribute name="FetchInMemoryState">false</attribute-->
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          initial state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name="SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Name of the eviction policy class. -->
+      <attribute name="EvictionPolicyClass"></attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "false".
+
+         Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+      -->
+      <!--attribute name="UseRegionBasedMarshalling">false</attribute-->      
+    </mbean>
+    
+    <mbean name="jbwebsite:service=Cache"	
+	code="org.jboss.website.cache.CacheServiceImpl"
+	xmbean-dd=""
+	>
+	    <depends>jbwebsite:service=TreeCache</depends>
+	    <attribute name="cache">jbwebsite:service=TreeCache</attribute>
+		<xmbean>
+			<class>org.jboss.website.cache.CacheServiceImpl</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.website.cache.CacheServiceImpl</name>
+   			</constructor>
+   			<attribute access="read-write" getMethod="getCache" setMethod="setCache">
+				     <name>cache</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="jbwebsite:service=TreeCache"/>
+					 </descriptors>
+		    </attribute>		    
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Puts the specified node into the cache</description>
+		    	<name>put</name>
+		    	<parameter>
+			      <description>Node Name</description>
+			      <name>node</name>
+			      <type>java.lang.String</type>
+			    </parameter>			    
+    			<return-type>void</return-type>		    	
+		    </operation>		    
+		</xmbean>
+	</mbean>
+    
+    <!-- Proxy factory for JBossDotCom Cache Service used only for unit testing  -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+      name="jboss.jmx:type=adaptor,name=RemoteCache,protocol=jrmp,service=proxyFactory">
+      <!-- Use the standard JRMPInvoker from conf/jboss-service.xxml -->
+      <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
+      <!-- The target MBean -->
+      <depends optional-attribute-name="TargetName">jbwebsite:service=TreeCache</depends>
+      <!-- Where to bind the proxy factory -->
+      <attribute name="JndiName">RemoteCache</attribute>
+      <!-- Invoke target method instead of invoke(Invocation mi) -->
+      <attribute name="InvokeTargetMethod">true</attribute>
+      <!-- Comma-separated list of exported interfaces -->
+      <attribute name="ExportedInterfaces">org.jboss.cache.TreeCacheMBean</attribute>
+      <!-- client-side interceptors -->
+      <attribute name="ClientInterceptors">
+          <interceptors>
+             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+             <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+             <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
+             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+          </interceptors>
+      </attribute>
+   </mbean>
+   
+   <!-- Proxy factory for CMS used only for unit testing -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+      name="jboss.jmx:type=adaptor,name=RemoteCMS,protocol=jrmp,service=proxyFactory">
+      <!-- Use the standard JRMPInvoker from conf/jboss-service.xxml -->
+      <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
+      <!-- The target MBean -->
+      <depends optional-attribute-name="TargetName">jbwebsite:service=ContentManager</depends>
+      <!-- Where to bind the proxy factory -->
+      <attribute name="JndiName">RemoteCMS</attribute>
+      <!-- Invoke target method instead of invoke(Invocation mi) -->
+      <attribute name="InvokeTargetMethod">true</attribute>
+      <!-- Comma-separated list of exported interfaces -->
+      <attribute name="ExportedInterfaces">org.jboss.website.cms.CMS</attribute>
+      <!-- client-side interceptors -->
+      <attribute name="ClientInterceptors">
+          <interceptors>
+             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+             <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+             <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
+             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+          </interceptors>
+      </attribute>
+   </mbean>
+</server>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/META-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,171 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<configuration>
-
-	<component class="org.jboss.website.config.Configuration">
-		<property>
-			<name>siteName</name>
-			<value>JBoss.com</value>
-		</property>
-		<property>
-			<name>siteURL</name>
-			<value>http://localhost</value>
-		</property>
-		<property>
-			<name>siteSSLURL</name>
-			<value>https://localhost:8443</value>
-		</property>
-	</component>	
-	
-	<component class="org.jboss.website.service.mail.MailManagerImpl">
-	    <!--  required, without this value, the server defaults to localhost -->
-		<property>
-			<name>smtpServer</name>
-			<value>mail.bellsouth.net</value>
-		</property>				
-		<!--  optional if not provided uses the default port=25 -->
-		<property>
-			<name>smtpPort</name>
-			<value>25</value>
-		</property>
-		<property>
-			<name>debug</name>
-			<value>true</value>
-		</property>
-		<!--  optional. if not provided smtp server is used without authentication -->
-		<property>
-			<name>smtpUser</name>
-			<value></value>
-		</property>
-		<!--  optional. if not provided smtp server is used without authentication -->
-		<property>
-			<name>smtpPassword</name>
-			<value></value>
-		</property>
-	</component>	
-	
-	<component class="org.jboss.website.user.ejb.UserManagerImpl">	    	    
-	    <!--  set registrationMode to EMAIL_ACTIVATION or DIRECT_ACTIVATION depending on your requirement -->
-		<property>
-			<name>registrationMode</name>
-			<value>EMAIL_ACTIVATION</value>
-		</property>
-		
-		<!-- email address of the account sending out this automatic email -->
-		<property>
-			<name>activationSender</name>
-			<value>siteadmin at jboss.com</value>
-		</property>
-		<!-- subject of the activation email -->
-		<property>
-			<name>activationSubject</name>
-			<value>Email Verification needed.</value>
-		</property>
-				
-		<!-- email address of the account sending out this automatic email -->
-		<property>
-			<name>issueSender</name>
-			<value>do-not-reply at jboss.com</value>
-		</property>
-		<property>
-			<name>activationIssueReceiver</name>
-			<value>sohil.shah at jboss.com</value>
-		</property>
-		<!-- subject of the activation email -->
-		<property>
-			<name>activationIssueSubject</name>
-			<value>Account Activation - {0}</value>
-		</property>		
-		
-		<!-- resetPasswordEmail configuration -->
-		<property>
-			<name>resetSender</name>
-			<value>do-not-reply at jboss.com</value>
-		</property>		
-		<property>
-			<name>resetSubject</name>
-			<value>Reset Password Notification - {0}</value>
-		</property>
-		
-		<!-- links -->		
-		<property>
-			<name>activationLink</name>
-			<value>/admin/activation/activate?id={0}&amp;token={1}</value>
-		</property>
-		<property>
-			<name>profileLink</name>
-			<value>/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/profile/view.jsf&amp;id={0}</value>
-		</property>
-		<property>
-			<name>resetPasswordLink</name>
-			<value>/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/password/tempPassword.jsf&amp;id={0}&amp;token={1}</value>
-		</property>
-								
-		<!-- specify the actual template in this configuration -->
-		<property>
-			<name>resetEmail</name>
-			<value>
-			    <![CDATA[
-				<html>
-					<body>
-					<span>
-						A <b style="color:red">Password Reset</b> has been requested on the following account:
-						JBoss Account : {0} <br/><br/>
-						Click this link <a href="{1}">{1}</a> to reset your password. <br/><br/>
-						If you did not request a password reset, no further action is required. <br/><br/>
-						Regards,<br/>The {2} Staff
-					</span>
-					</body>
-				</html>
-				]]>
-			</value>
-		</property>
-						
-		<!-- specify the actual template in this configuration -->
-		<property>
-			<name>activationEmail</name>
-			<value>
-			    <![CDATA[
-				<html>
-				<body>
-					<span>
-					A user with this email address has registered on our site at - {0} <br/><br/>
-					Please keep this email for your records. Your account information is as follows:<br/><br/>
-					----------------------------<br/>
-					UserName: {1} <br/>
-					----------------------------<br/><br/>
-					Your account is currently inactive. You cannot use it until you visit the following link: <br/>
-					<a href="{2}">{2}</a><br/><br/>
-					If you did not register for membership on our site, no further action is required. <br/><br/>
-					Regards,<br/>The {3} Staff
-					</span>
-				</body>
-				</html>
-				]]>
-			</value>
-		</property>
-				
-		<!-- specify the actual template in this configuration -->
-		<property>
-			<name>activationIssueEmail</name>
-			<value>
-			    <![CDATA[
-				<html>
-				<body>
-					<span>
-					The following account needs to be activated as requested by the user 
-					Login : {0} <br/>
-					Registered Email Address : {1} <br/>
-					Email Address specified by the user to be contacted at : {2} <br/>
-					IP address when the request was issued : {3} <br/>
-					Password Verified in the process : {4} <br/>
-					Click this link <a href="{5}">{5}</a> to activate this account. <br/>
-					Click this link <a href="{6}">{6}</a> to look at this user's profile. <br/>
-					</span>
-				</body>
-				</html>
-				]]>
-			</value>
-		</property>				
-	</component>						
-</configuration>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/META-INF/config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,171 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<configuration>
+
+	<component class="org.jboss.website.config.Configuration">
+		<property>
+			<name>siteName</name>
+			<value>JBoss.com</value>
+		</property>
+		<property>
+			<name>siteURL</name>
+			<value>http://localhost</value>
+		</property>
+		<property>
+			<name>siteSSLURL</name>
+			<value>https://localhost:8443</value>
+		</property>
+	</component>	
+	
+	<component class="org.jboss.website.service.mail.MailManagerImpl">
+	    <!--  required, without this value, the server defaults to localhost -->
+		<property>
+			<name>smtpServer</name>
+			<value>mail.bellsouth.net</value>
+		</property>				
+		<!--  optional if not provided uses the default port=25 -->
+		<property>
+			<name>smtpPort</name>
+			<value>25</value>
+		</property>
+		<property>
+			<name>debug</name>
+			<value>true</value>
+		</property>
+		<!--  optional. if not provided smtp server is used without authentication -->
+		<property>
+			<name>smtpUser</name>
+			<value></value>
+		</property>
+		<!--  optional. if not provided smtp server is used without authentication -->
+		<property>
+			<name>smtpPassword</name>
+			<value></value>
+		</property>
+	</component>	
+	
+	<component class="org.jboss.website.user.ejb.UserManagerImpl">	    	    
+	    <!--  set registrationMode to EMAIL_ACTIVATION or DIRECT_ACTIVATION depending on your requirement -->
+		<property>
+			<name>registrationMode</name>
+			<value>EMAIL_ACTIVATION</value>
+		</property>
+		
+		<!-- email address of the account sending out this automatic email -->
+		<property>
+			<name>activationSender</name>
+			<value>siteadmin at jboss.com</value>
+		</property>
+		<!-- subject of the activation email -->
+		<property>
+			<name>activationSubject</name>
+			<value>Email Verification needed.</value>
+		</property>
+				
+		<!-- email address of the account sending out this automatic email -->
+		<property>
+			<name>issueSender</name>
+			<value>do-not-reply at jboss.com</value>
+		</property>
+		<property>
+			<name>activationIssueReceiver</name>
+			<value>sohil.shah at jboss.com</value>
+		</property>
+		<!-- subject of the activation email -->
+		<property>
+			<name>activationIssueSubject</name>
+			<value>Account Activation - {0}</value>
+		</property>		
+		
+		<!-- resetPasswordEmail configuration -->
+		<property>
+			<name>resetSender</name>
+			<value>do-not-reply at jboss.com</value>
+		</property>		
+		<property>
+			<name>resetSubject</name>
+			<value>Reset Password Notification - {0}</value>
+		</property>
+		
+		<!-- links -->		
+		<property>
+			<name>activationLink</name>
+			<value>/admin/activation/activate?id={0}&amp;token={1}</value>
+		</property>
+		<property>
+			<name>profileLink</name>
+			<value>/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/profile/view.jsf&amp;id={0}</value>
+		</property>
+		<property>
+			<name>resetPasswordLink</name>
+			<value>/usercp/usercp?action=1&amp;org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/admin/password/tempPassword.jsf&amp;id={0}&amp;token={1}</value>
+		</property>
+								
+		<!-- specify the actual template in this configuration -->
+		<property>
+			<name>resetEmail</name>
+			<value>
+			    <![CDATA[
+				<html>
+					<body>
+					<span>
+						A <b style="color:red">Password Reset</b> has been requested on the following account:
+						JBoss Account : {0} <br/><br/>
+						Click this link <a href="{1}">{1}</a> to reset your password. <br/><br/>
+						If you did not request a password reset, no further action is required. <br/><br/>
+						Regards,<br/>The {2} Staff
+					</span>
+					</body>
+				</html>
+				]]>
+			</value>
+		</property>
+						
+		<!-- specify the actual template in this configuration -->
+		<property>
+			<name>activationEmail</name>
+			<value>
+			    <![CDATA[
+				<html>
+				<body>
+					<span>
+					A user with this email address has registered on our site at - {0} <br/><br/>
+					Please keep this email for your records. Your account information is as follows:<br/><br/>
+					----------------------------<br/>
+					UserName: {1} <br/>
+					----------------------------<br/><br/>
+					Your account is currently inactive. You cannot use it until you visit the following link: <br/>
+					<a href="{2}">{2}</a><br/><br/>
+					If you did not register for membership on our site, no further action is required. <br/><br/>
+					Regards,<br/>The {3} Staff
+					</span>
+				</body>
+				</html>
+				]]>
+			</value>
+		</property>
+				
+		<!-- specify the actual template in this configuration -->
+		<property>
+			<name>activationIssueEmail</name>
+			<value>
+			    <![CDATA[
+				<html>
+				<body>
+					<span>
+					The following account needs to be activated as requested by the user 
+					Login : {0} <br/>
+					Registered Email Address : {1} <br/>
+					Email Address specified by the user to be contacted at : {2} <br/>
+					IP address when the request was issued : {3} <br/>
+					Password Verified in the process : {4} <br/>
+					Click this link <a href="{5}">{5}</a> to activate this account. <br/>
+					Click this link <a href="{6}">{6}</a> to look at this user's profile. <br/>
+					</span>
+				</body>
+				</html>
+				]]>
+			</value>
+		</property>				
+	</component>						
+</configuration>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!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.website.user.bo.ProfileBean"
-        table="jbcom_profile"
-    >
-
-        <id
-            name="id"
-            column="id"
-            type="long"
-        >
-            <generator class="native"/>
-        </id>
-        
-        
-        <!--  foreign key (UserBean) -->
-        <many-to-one 
-        name="user" 
-        column="uid"
-        update="false"
-        insert="true"
-        not-null="true"
-        class="org.jboss.website.user.bo.UserBean"        
-        unique="true"
-        />
-        
-        
-        <property
-            name="companyType"
-            type="string"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="companyType"
-        		length="20"
-        	/>
-        </property>
-        
-        <property
-            name="companySize"
-            type="string"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="companySize"
-        		length="10"
-        	/>
-        </property>
-        
-        <property
-            name="interestType"
-            type="string"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="interestType"
-        		length="20"
-        	/>
-        </property>
-        
-        <property
-            name="industry"
-            type="string"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="industry"
-        		length="50"
-        	/>
-        </property>
-        
-        <property
-            name="newsLetter"
-            type="boolean"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="newsLetter"
-        	/>
-        </property>
-        
-        <property
-            name="salesContact"
-            type="boolean"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="salesContact"
-        	/>
-        </property>
-        
-        <property
-            name="supportContact"
-            type="boolean"
-            update="true"
-            insert="true"
-        >
-        	<column
-        		name="supportContact"
-        	/>
-        </property>
-                
-    </class>
-
-</hibernate-mapping>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/ProfileBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!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.website.user.bo.ProfileBean"
+        table="jbcom_profile"
+    >
+
+        <id
+            name="id"
+            column="id"
+            type="long"
+        >
+            <generator class="native"/>
+        </id>
+        
+        
+        <!--  foreign key (UserBean) -->
+        <many-to-one 
+        name="user" 
+        column="uid"
+        update="false"
+        insert="true"
+        not-null="true"
+        class="org.jboss.website.user.bo.UserBean"        
+        unique="true"
+        />
+        
+        
+        <property
+            name="companyType"
+            type="string"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="companyType"
+        		length="20"
+        	/>
+        </property>
+        
+        <property
+            name="companySize"
+            type="string"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="companySize"
+        		length="10"
+        	/>
+        </property>
+        
+        <property
+            name="interestType"
+            type="string"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="interestType"
+        		length="20"
+        	/>
+        </property>
+        
+        <property
+            name="industry"
+            type="string"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="industry"
+        		length="50"
+        	/>
+        </property>
+        
+        <property
+            name="newsLetter"
+            type="boolean"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="newsLetter"
+        	/>
+        </property>
+        
+        <property
+            name="salesContact"
+            type="boolean"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="salesContact"
+        	/>
+        </property>
+        
+        <property
+            name="supportContact"
+            type="boolean"
+            update="true"
+            insert="true"
+        >
+        	<column
+        		name="supportContact"
+        	/>
+        </property>
+                
+    </class>
+
+</hibernate-mapping>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!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.website.user.bo.UserBean"
-        table="jbcom_users"
-    >
-
-        <id
-            name="id"
-            column="id"
-            type="long"
-        >
-            <generator class="native"/>
-        </id>
-        
-        <!--  map the user's profile  -->
-        <one-to-one 
-        name="profile" 
-        property-ref="user"
-        class="org.jboss.website.user.bo.ProfileBean"         
-        cascade="all"
-        />
-
-        <!--  map the username -->
-        <property
-            name="userName"
-            column="userName"
-            type="string"
-            update="false"
-            insert="true"            
-            unique="true"
-            not-null="true"
-        />        
-        <property
-            name="forceResetEnabled"
-            column="forcePassResetEnabled"
-            type="boolean"
-            update="true"
-            insert="true"            
-            not-null="true"
-        />
-        <property
-            name="oldNukesPass"
-            column="oldNukesPass"
-            type="string"
-            update="true"
-            insert="true"            
-        />               
-    </class>
-</hibernate-mapping>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/UserBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!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.website.user.bo.UserBean"
+        table="jbcom_users"
+    >
+
+        <id
+            name="id"
+            column="id"
+            type="long"
+        >
+            <generator class="native"/>
+        </id>
+        
+        <!--  map the user's profile  -->
+        <one-to-one 
+        name="profile" 
+        property-ref="user"
+        class="org.jboss.website.user.bo.ProfileBean"         
+        cascade="all"
+        />
+
+        <!--  map the username -->
+        <property
+            name="userName"
+            column="userName"
+            type="string"
+            update="false"
+            insert="true"            
+            unique="true"
+            not-null="true"
+        />        
+        <property
+            name="forceResetEnabled"
+            column="forcePassResetEnabled"
+            type="boolean"
+            update="true"
+            insert="true"            
+            not-null="true"
+        />
+        <property
+            name="oldNukesPass"
+            column="oldNukesPass"
+            type="string"
+            update="true"
+            insert="true"            
+        />               
+    </class>
+</hibernate-mapping>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,36 +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 name="java:jbwebsite/SessionFactory">
-         
-      <!--  properties when deployed in J2EE app server) -->     
-      <property name="connection.datasource">java:PortalDS</property>      
-      <property name="show_sql">false</property>      
-      <property name="hibernate.transaction.flush_before_completion">true</property>
-      <property name="hibernate.transaction.auto_close_session">true</property>
-      <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
-      <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-            
-      <!--  properties for testing stuff locally -->        
-      <!--property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-      <property name="connection.url">jdbc:mysql://localhost:3306/jbossportal_2_0?autoReconnectForPools=true&amp;maintainTimeStats=false&amp;cacheResultSetMetaData=true&amp;zeroDateTimeBehavior=convertToNull</property>
-      <property name="connection.username">portal</property>
-      <property name="connection.password">portalpassword</property>  
-      <property name="hibernate.current_session_context_class">thread</property>      
-      <property name="show_sql">true</property-->
-                 
-      
-      <!--  caching properties -->
-      <property name="hibernate.cache.use_second_level_cache">false</property>
-      
-      
-      <!--  set the dialect for MySQLInnoDB -->
-      <property name="dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
-                        
-      <!-- Mapping files -->  
-      <mapping resource="org/jboss/website/hibernate/UserBean.hbm.xml"/>
-      <mapping resource="org/jboss/website/hibernate/ProfileBean.hbm.xml"/>                
-   </session-factory>
-</hibernate-configuration>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/hibernate/jbwebsite.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -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 name="java:jbwebsite/SessionFactory">
+         
+      <!--  properties when deployed in J2EE app server) -->     
+      <property name="connection.datasource">java:PortalDS</property>      
+      <property name="show_sql">false</property>      
+      <property name="hibernate.transaction.flush_before_completion">true</property>
+      <property name="hibernate.transaction.auto_close_session">true</property>
+      <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+      <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+            
+      <!--  properties for testing stuff locally -->        
+      <!--property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+      <property name="connection.url">jdbc:mysql://localhost:3306/jbossportal_2_0?autoReconnectForPools=true&amp;maintainTimeStats=false&amp;cacheResultSetMetaData=true&amp;zeroDateTimeBehavior=convertToNull</property>
+      <property name="connection.username">portal</property>
+      <property name="connection.password">portalpassword</property>  
+      <property name="hibernate.current_session_context_class">thread</property>      
+      <property name="show_sql">true</property-->
+                 
+      
+      <!--  caching properties -->
+      <property name="hibernate.cache.use_second_level_cache">false</property>
+      
+      
+      <!--  set the dialect for MySQLInnoDB -->
+      <property name="dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
+                        
+      <!-- Mapping files -->  
+      <mapping resource="org/jboss/website/hibernate/UserBean.hbm.xml"/>
+      <mapping resource="org/jboss/website/hibernate/ProfileBean.hbm.xml"/>                
+   </session-factory>
+</hibernate-configuration>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,10 +0,0 @@
-#Email Validator messages
-
-invalidEmailAddress=Invalid Email Address
-invalidEmailAddressDetail={0}: is an invalid email address.
-
-
-#Password Validator messages
-
-invalidPasswordFormat=Invalid Password Format
-invalidPasswordFormatDetail=The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/jsf/validator/messages.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,10 @@
+#Email Validator messages
+
+invalidEmailAddress=Invalid Email Address
+invalidEmailAddressDetail={0}: is an invalid email address.
+
+
+#Password Validator messages
+
+invalidPasswordFormat=Invalid Password Format
+invalidPasswordFormatDetail=The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,2 +0,0 @@
-#General website messages
-testMessage=The Test Message is: {0}
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/messages.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,2 @@
+#General website messages
+testMessage=The Test Message is: {0}
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,23 +0,0 @@
-#User Administration Module related messages
-
-# validation related messages
-passwordMismatch=Password mismatch
-passwordMismatchDetail=The confirmation password does not match the password.
-
-currentPasswordInvalid=
-currentPasswordInvalidDetail=The current password you submitted is invalid.
-
-emailMismatch=Email mismatch
-emailMismatchDetail=Your Real Email value does not match the Confirm Real Email value.
-
-interestInJBossMissing=Interest in JBoss is required
-interestInJBossMissingDetail=Interest in JBoss, must be selected
-
-contactError=Contact Issue detected
-contactErrorDetail=Please uncheck either the 'optout of email' or the 'support contact' checkboxes.
-
-userAlreadyRegistered=Username already registered
-userAlreadyRegisteredDetail={0}: is already registered.
-
-userNotFound=User Not Found
-userNotFoundDetail={0} : is not registered.
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/user/ui/messages.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,23 @@
+#User Administration Module related messages
+
+# validation related messages
+passwordMismatch=Password mismatch
+passwordMismatchDetail=The confirmation password does not match the password.
+
+currentPasswordInvalid=
+currentPasswordInvalidDetail=The current password you submitted is invalid.
+
+emailMismatch=Email mismatch
+emailMismatchDetail=Your Real Email value does not match the Confirm Real Email value.
+
+interestInJBossMissing=Interest in JBoss is required
+interestInJBossMissingDetail=Interest in JBoss, must be selected
+
+contactError=Contact Issue detected
+contactErrorDetail=Please uncheck either the 'optout of email' or the 'support contact' checkboxes.
+
+userAlreadyRegistered=Username already registered
+userAlreadyRegisteredDetail={0}: is already registered.
+
+userNotFound=User Not Found
+userNotFoundDetail={0} : is not registered.
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,59 +0,0 @@
-<form-validation>
-	<!--  generic validation rules -->
-	<global>
-		  <!--  required field validator --> 
-       	  <validator name="required" 
-          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
-          method="validateRequired" 
-          methodParams="java.lang.Object,org.apache.commons.validator.Field"
-          />
-          <!--  minlength field validator --> 
-       	  <validator name="minlength" 
-          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
-          method="validateMinLength" 
-          methodParams="java.lang.Object,org.apache.commons.validator.Field"
-          />
-          <!--  passwordformat field validator --> 
-       	  <validator name="passwordformat" 
-          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
-          method="validatePasswordFormat" 
-          methodParams="java.lang.Object,org.apache.commons.validator.Field"          
-          /> 
-          <!--  email format field validator -->
-          <validator name="emailformat" 
-          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
-          method="validateEmailFormat" 
-          methodParams="java.lang.Object,org.apache.commons.validator.Field"          
-          />
-    </global>
-
-	<!--  bean validation rules -->
-	<formset>
-       <form name="org.jboss.website.user.bo.UserBean">
-          <field property="userName" depends="required"/> 
-          <!--  generic identity fields --> 
-          <field property="identity.userName" depends="required"/>
-          <field property="password" depends="required,minlength,passwordformat">
-          	<var>
-				<var-name>minlength</var-name>
-				<var-value>8</var-value>
-			</var>
-          </field>          
-          <!--  Jboss.com identity fields (for now these are commented out since UI layer validation will take care of this) -->
-          <!--field property="identity.email" depends="required,emailformat"/-->
-          <!--field property="identity.fullName" depends="required"/>
-          <field property="identity.phoneNumbers" depends="required"/>
-          <field property="identity.companyName" depends="required"/>
-          <field property="identity.companyRole" depends="required"/>
-          <field property="identity.companyTitle" depends="required"/>  
-          <field property="identity.companyAddress.street" depends="required"/>
-          <field property="identity.companyAddress.city" depends="required"/>
-          <field property="identity.companyAddress.country" depends="required"/-->
-          <!--  JBoss.com profile fields (for now these are commented out since UI layer validation will take care of this) -->     
-          <!--field property="profile.companySize" depends="required"/>
-          <field property="profile.companyType" depends="required"/>
-          <field property="profile.interestType" depends="required"/>
-          <field property="profile.industry" depends="required"/-->
-       </form>
-    </formset>	
-</form-validation>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/etc/org/jboss/website/validation/domain-validation.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,59 @@
+<form-validation>
+	<!--  generic validation rules -->
+	<global>
+		  <!--  required field validator --> 
+       	  <validator name="required" 
+          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
+          method="validateRequired" 
+          methodParams="java.lang.Object,org.apache.commons.validator.Field"
+          />
+          <!--  minlength field validator --> 
+       	  <validator name="minlength" 
+          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
+          method="validateMinLength" 
+          methodParams="java.lang.Object,org.apache.commons.validator.Field"
+          />
+          <!--  passwordformat field validator --> 
+       	  <validator name="passwordformat" 
+          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
+          method="validatePasswordFormat" 
+          methodParams="java.lang.Object,org.apache.commons.validator.Field"          
+          /> 
+          <!--  email format field validator -->
+          <validator name="emailformat" 
+          classname="org.jboss.website.bo.JBossDotComDomainValidator" 
+          method="validateEmailFormat" 
+          methodParams="java.lang.Object,org.apache.commons.validator.Field"          
+          />
+    </global>
+
+	<!--  bean validation rules -->
+	<formset>
+       <form name="org.jboss.website.user.bo.UserBean">
+          <field property="userName" depends="required"/> 
+          <!--  generic identity fields --> 
+          <field property="identity.userName" depends="required"/>
+          <field property="password" depends="required,minlength,passwordformat">
+          	<var>
+				<var-name>minlength</var-name>
+				<var-value>8</var-value>
+			</var>
+          </field>          
+          <!--  Jboss.com identity fields (for now these are commented out since UI layer validation will take care of this) -->
+          <!--field property="identity.email" depends="required,emailformat"/-->
+          <!--field property="identity.fullName" depends="required"/>
+          <field property="identity.phoneNumbers" depends="required"/>
+          <field property="identity.companyName" depends="required"/>
+          <field property="identity.companyRole" depends="required"/>
+          <field property="identity.companyTitle" depends="required"/>  
+          <field property="identity.companyAddress.street" depends="required"/>
+          <field property="identity.companyAddress.city" depends="required"/>
+          <field property="identity.companyAddress.country" depends="required"/-->
+          <!--  JBoss.com profile fields (for now these are commented out since UI layer validation will take care of this) -->     
+          <!--field property="profile.companySize" depends="required"/>
+          <field property="profile.companyType" depends="required"/>
+          <field property="profile.interestType" depends="required"/>
+          <field property="profile.industry" depends="required"/-->
+       </form>
+    </formset>	
+</form-validation>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,138 +0,0 @@
-package org.jboss.website.bo;
-
-import java.io.Serializable;
-
-import org.apache.log4j.Logger;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.jboss.website.hibernate.Tools;
-
-import org.apache.commons.validator.*;
-import org.jboss.website.validation.ValidationException;
-
-public abstract class AbstractBean implements Serializable
-{
-	private static final Logger log = Logger.getLogger(AbstractBean.class);
-	
-	private Long id = null;
-	private boolean validated = false;
-	
-	public AbstractBean()
-	{
-		super();
-	}
-	
-	public Long getId()
-	{
-		return id;
-	}
-	
-	private void setId(Long id)
-	{
-		this.id = id;
-	}
-	
-		
-	public void save() throws DomainException
-    {
-		Session session = null;
-	    Transaction tx = null;
-		try
-		{
-			  session = Tools.getCurrentSession();
-			  tx = session.beginTransaction();
-			  
-			  //persist this object in the database
-			  session.saveOrUpdate(this);
-			  
-			  tx.commit();
-		}
-		catch(Exception e)
-		{		  
-			  AbstractBean.log.error(this,e);
-			  if(tx!=null)
-			  {
-				  tx.rollback();
-			  }
-			  throw new DomainException(e);
-		}
-		finally
-		{
-			Tools.closeSession(session);
-		}
-    }
-   
-    public void remove() throws DomainException
-    {    
-    	Session session = null;
-	    Transaction tx = null;
-		try
-		{
-			  session = Tools.getCurrentSession();
-			  tx = session.beginTransaction();
-			  
-			  //remove this user from the database			  
-			  session.delete(this);			  
-			  
-			  tx.commit();
-		}
-		catch(Exception e)
-		{		  
-			  AbstractBean.log.error(this,e);
-			  if(tx!=null)
-			  {
-				  tx.rollback();
-			  }
-			  throw new DomainException(e);
-		}
-		finally
-		{
-			Tools.closeSession(session);
-		}
-    }
-    
-    //domain validation related behavior---------------------------------------------------------------------------------------
-    public boolean isValidated()
-	{
-		return this.validated;
-	}
-	
-	public void setValidated(boolean validated)
-	{
-		this.validated = validated;
-	}
-	
-	public void validate() throws ValidationException
-	{
-		if(!this.isValidated())
-		{			
-			ValidatorResults results = null;			
-			try
-			{
-				ValidatorResources resources = org.jboss.website.validation.Tools.getJBossDotComDomain();
-				//setup the validator
-				Validator validator = new Validator(resources,this.getClass().getName());
-				validator.setParameter(Validator.BEAN_PARAM,this);
-				validator.setOnlyReturnErrors(true);
-				
-				//perform the validation
-				results = validator.validate();
-			}
-			catch(Exception e)
-			{
-				throw new ValidationException(e);
-			}
-			
-			//process the results
-			if(!results.isEmpty())
-			{
-				throw new ValidationException(results);
-			}
-			else
-			{
-				this.validated = true;
-			}
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/AbstractBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,138 @@
+package org.jboss.website.bo;
+
+import java.io.Serializable;
+
+import org.apache.log4j.Logger;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.jboss.website.hibernate.Tools;
+
+import org.apache.commons.validator.*;
+import org.jboss.website.validation.ValidationException;
+
+public abstract class AbstractBean implements Serializable
+{
+	private static final Logger log = Logger.getLogger(AbstractBean.class);
+	
+	private Long id = null;
+	private boolean validated = false;
+	
+	public AbstractBean()
+	{
+		super();
+	}
+	
+	public Long getId()
+	{
+		return id;
+	}
+	
+	private void setId(Long id)
+	{
+		this.id = id;
+	}
+	
+		
+	public void save() throws DomainException
+    {
+		Session session = null;
+	    Transaction tx = null;
+		try
+		{
+			  session = Tools.getCurrentSession();
+			  tx = session.beginTransaction();
+			  
+			  //persist this object in the database
+			  session.saveOrUpdate(this);
+			  
+			  tx.commit();
+		}
+		catch(Exception e)
+		{		  
+			  AbstractBean.log.error(this,e);
+			  if(tx!=null)
+			  {
+				  tx.rollback();
+			  }
+			  throw new DomainException(e);
+		}
+		finally
+		{
+			Tools.closeSession(session);
+		}
+    }
+   
+    public void remove() throws DomainException
+    {    
+    	Session session = null;
+	    Transaction tx = null;
+		try
+		{
+			  session = Tools.getCurrentSession();
+			  tx = session.beginTransaction();
+			  
+			  //remove this user from the database			  
+			  session.delete(this);			  
+			  
+			  tx.commit();
+		}
+		catch(Exception e)
+		{		  
+			  AbstractBean.log.error(this,e);
+			  if(tx!=null)
+			  {
+				  tx.rollback();
+			  }
+			  throw new DomainException(e);
+		}
+		finally
+		{
+			Tools.closeSession(session);
+		}
+    }
+    
+    //domain validation related behavior---------------------------------------------------------------------------------------
+    public boolean isValidated()
+	{
+		return this.validated;
+	}
+	
+	public void setValidated(boolean validated)
+	{
+		this.validated = validated;
+	}
+	
+	public void validate() throws ValidationException
+	{
+		if(!this.isValidated())
+		{			
+			ValidatorResults results = null;			
+			try
+			{
+				ValidatorResources resources = org.jboss.website.validation.Tools.getJBossDotComDomain();
+				//setup the validator
+				Validator validator = new Validator(resources,this.getClass().getName());
+				validator.setParameter(Validator.BEAN_PARAM,this);
+				validator.setOnlyReturnErrors(true);
+				
+				//perform the validation
+				results = validator.validate();
+			}
+			catch(Exception e)
+			{
+				throw new ValidationException(e);
+			}
+			
+			//process the results
+			if(!results.isEmpty())
+			{
+				throw new ValidationException(results);
+			}
+			else
+			{
+				this.validated = true;
+			}
+		}
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,19 +0,0 @@
-package org.jboss.website.bo;
-
-public class DomainException extends Exception 
-{
-	public DomainException()
-	{
-		this("");
-	}
-	
-	public DomainException(String ex)
-	{
-		super(ex);
-	}
-	
-	public DomainException(Exception ex)
-	{
-		super(ex);
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/DomainException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,19 @@
+package org.jboss.website.bo;
+
+public class DomainException extends Exception 
+{
+	public DomainException()
+	{
+		this("");
+	}
+	
+	public DomainException(String ex)
+	{
+		super(ex);
+	}
+	
+	public DomainException(Exception ex)
+	{
+		super(ex);
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,55 +0,0 @@
-package org.jboss.website.bo;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import org.apache.commons.validator.Field;
-import org.apache.commons.validator.Var;
-import org.apache.commons.validator.GenericValidator;
-import org.apache.commons.validator.util.ValidatorUtils;
-
-import org.jboss.website.validation.ValidatorUtil;
-
-
-public class JBossDotComDomainValidator 
-{
-	public static boolean validateRequired(Object object,Field field)
-	{
-		boolean isValid = false;
-		
-		String value = ValidatorUtils.getValueAsString(object, field.getProperty());
-		isValid = !GenericValidator.isBlankOrNull(value);
-				
-		return isValid;
-	}
-	
-	public static boolean validateMinLength(Object object,Field field)
-	{
-		boolean isValid = false;
-		
-		String value = ValidatorUtils.getValueAsString(object,field.getProperty());
-		//grab the minlength value specified in the var attribute
-		String minLength = field.getVarValue("minlength");		
-		
-		isValid = GenericValidator.minValue(value.length(),Integer.parseInt(minLength));
-						
-		return isValid;
-	}
-	
-	public static boolean validatePasswordFormat(Object object,Field field)
-	{		
-		String value = ValidatorUtils.getValueAsString(object,field.getProperty());
-		return ValidatorUtil.isPasswordValid(value);
-	}
-	
-	public static boolean validateEmailFormat(Object object,Field field)
-	{
-		boolean isValid = false;
-		
-		String value = ValidatorUtils.getValueAsString(object,field.getProperty());				
-		
-		isValid = GenericValidator.isEmail(value);
-						
-		return isValid;
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/bo/JBossDotComDomainValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,55 @@
+package org.jboss.website.bo;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import org.apache.commons.validator.Field;
+import org.apache.commons.validator.Var;
+import org.apache.commons.validator.GenericValidator;
+import org.apache.commons.validator.util.ValidatorUtils;
+
+import org.jboss.website.validation.ValidatorUtil;
+
+
+public class JBossDotComDomainValidator 
+{
+	public static boolean validateRequired(Object object,Field field)
+	{
+		boolean isValid = false;
+		
+		String value = ValidatorUtils.getValueAsString(object, field.getProperty());
+		isValid = !GenericValidator.isBlankOrNull(value);
+				
+		return isValid;
+	}
+	
+	public static boolean validateMinLength(Object object,Field field)
+	{
+		boolean isValid = false;
+		
+		String value = ValidatorUtils.getValueAsString(object,field.getProperty());
+		//grab the minlength value specified in the var attribute
+		String minLength = field.getVarValue("minlength");		
+		
+		isValid = GenericValidator.minValue(value.length(),Integer.parseInt(minLength));
+						
+		return isValid;
+	}
+	
+	public static boolean validatePasswordFormat(Object object,Field field)
+	{		
+		String value = ValidatorUtils.getValueAsString(object,field.getProperty());
+		return ValidatorUtil.isPasswordValid(value);
+	}
+	
+	public static boolean validateEmailFormat(Object object,Field field)
+	{
+		boolean isValid = false;
+		
+		String value = ValidatorUtils.getValueAsString(object,field.getProperty());				
+		
+		isValid = GenericValidator.isEmail(value);
+						
+		return isValid;
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,74 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.website.cache;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.ArrayList;
-
-import org.jboss.cache.AbstractTreeCacheListener;
-import org.jboss.cache.Fqn;
-
-import org.jboss.website.notify.Registrar;
-import org.jboss.website.notify.cms.UpdatePayLoad;
-
-/**
- * Created on : Jan 19, 2007
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class CacheListener extends AbstractTreeCacheListener implements Serializable
-{
-	/**
-	 * 
-	 *
-	 */
-	public CacheListener()
-	{
-		super();
-	}	
-	//-----------------tree cache listener implementation---------------------------------------
-	/**
-	 * 
-	 */
-	public void nodeModify(Fqn node,boolean pre,boolean isLocal)
-	{
-		if(!isLocal && !pre && !node.isRoot())
-		{
-			UpdatePayLoad payLoad = new UpdatePayLoad();
-			String nodeName = node.getName();
-			Collection files = new ArrayList();
-			files.add(nodeName);
-			payLoad.setFiles(files);
-			
-			//no need to notify other nodes in the cluster
-			//this *is* the notification to refresh my memory
-			//if i send a notification here, it will be an 
-			//inifinte series of cluster notifications and memory 
-			//refreshes
-			payLoad.setNotifyCluster(false);
-			
-			Registrar.getInstance().sendNotification(payLoad);
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheListener.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,74 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.website.cache;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.ArrayList;
+
+import org.jboss.cache.AbstractTreeCacheListener;
+import org.jboss.cache.Fqn;
+
+import org.jboss.website.notify.Registrar;
+import org.jboss.website.notify.cms.UpdatePayLoad;
+
+/**
+ * Created on : Jan 19, 2007
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class CacheListener extends AbstractTreeCacheListener implements Serializable
+{
+	/**
+	 * 
+	 *
+	 */
+	public CacheListener()
+	{
+		super();
+	}	
+	//-----------------tree cache listener implementation---------------------------------------
+	/**
+	 * 
+	 */
+	public void nodeModify(Fqn node,boolean pre,boolean isLocal)
+	{
+		if(!isLocal && !pre && !node.isRoot())
+		{
+			UpdatePayLoad payLoad = new UpdatePayLoad();
+			String nodeName = node.getName();
+			Collection files = new ArrayList();
+			files.add(nodeName);
+			payLoad.setFiles(files);
+			
+			//no need to notify other nodes in the cluster
+			//this *is* the notification to refresh my memory
+			//if i send a notification here, it will be an 
+			//inifinte series of cluster notifications and memory 
+			//refreshes
+			payLoad.setNotifyCluster(false);
+			
+			Registrar.getInstance().sendNotification(payLoad);
+		}
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,39 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.website.cache;
-
-import org.jboss.cache.CacheException;
-
-/**
- * Created on : Jan 19, 2007
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public interface CacheService
-{
-	/**
-	 * 
-	 * @param node
-	 */
-	public void put(String node) throws CacheException;
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheService.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.website.cache;
+
+import org.jboss.cache.CacheException;
+
+/**
+ * Created on : Jan 19, 2007
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public interface CacheService
+{
+	/**
+	 * 
+	 * @param node
+	 */
+	public void put(String node) throws CacheException;
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,98 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.website.cache;
-
-import org.apache.log4j.Logger;
-import org.jboss.cache.TreeCacheMBean;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.CacheException;
-
-import org.jboss.website.utils.ServiceUtil;
-
-/**
- * Created on : Jan 19, 2007
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class CacheServiceImpl implements CacheService
-{
-	private static Logger log = Logger.getLogger(CacheServiceImpl.class);
-	
-	private TreeCacheMBean treeCache = null;
-	private String cacheServiceName = null;
-	
-	public String getCache()
-	{
-		return this.cacheServiceName;
-	}
-	
-	public void setCache(String cacheServiceName)
-	{
-		this.cacheServiceName = cacheServiceName;
-	}
-	
-	/**
-	 * 
-	 *
-	 */
-	public CacheServiceImpl()
-	{
-		
-	}
-	
-	/**
-	 * 
-	 *
-	 */
-	public void start()
-	{
-		try
-		{
-			this.treeCache = (TreeCacheMBean)ServiceUtil.getService(this.cacheServiceName, TreeCacheMBean.class);
-			this.treeCache.addTreeCacheListener(new CacheListener());
-		}
-		catch(Exception e)
-		{
-			this.stop();
-			log.error(this, e);
-			throw new RuntimeException(e);
-		}
-	}
-	
-	/**
-	 * 
-	 *
-	 */
-	public void stop()
-	{
-		this.treeCache = null;
-	}
-	
-	/**
-	 * 
-	 */
-	public void put(String node) throws CacheException
-	{
-		this.treeCache.put(new Fqn(node), "value", "modified");
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/cache/CacheServiceImpl.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,98 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.website.cache;
+
+import org.apache.log4j.Logger;
+import org.jboss.cache.TreeCacheMBean;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.CacheException;
+
+import org.jboss.website.utils.ServiceUtil;
+
+/**
+ * Created on : Jan 19, 2007
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class CacheServiceImpl implements CacheService
+{
+	private static Logger log = Logger.getLogger(CacheServiceImpl.class);
+	
+	private TreeCacheMBean treeCache = null;
+	private String cacheServiceName = null;
+	
+	public String getCache()
+	{
+		return this.cacheServiceName;
+	}
+	
+	public void setCache(String cacheServiceName)
+	{
+		this.cacheServiceName = cacheServiceName;
+	}
+	
+	/**
+	 * 
+	 *
+	 */
+	public CacheServiceImpl()
+	{
+		
+	}
+	
+	/**
+	 * 
+	 *
+	 */
+	public void start()
+	{
+		try
+		{
+			this.treeCache = (TreeCacheMBean)ServiceUtil.getService(this.cacheServiceName, TreeCacheMBean.class);
+			this.treeCache.addTreeCacheListener(new CacheListener());
+		}
+		catch(Exception e)
+		{
+			this.stop();
+			log.error(this, e);
+			throw new RuntimeException(e);
+		}
+	}
+	
+	/**
+	 * 
+	 *
+	 */
+	public void stop()
+	{
+		this.treeCache = null;
+	}
+	
+	/**
+	 * 
+	 */
+	public void put(String node) throws CacheException
+	{
+		this.treeCache.put(new Fqn(node), "value", "modified");
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,34 +0,0 @@
-package org.jboss.website.config;
-
-import java.io.Serializable;
-
-import java.util.Properties;
-
-public class Component implements Serializable
-{
-	private Properties properties = null;
-	
-	Component()
-	{
-		super();
-	}
-	
-	Properties getProperties()
-	{
-		return this.properties;
-	}
-	
-	void setProperties(Properties properties)
-	{
-		this.properties = properties;
-	}
-	
-	public String getProperty(String name)
-	{
-		String value = null;
-		
-		value = this.properties.getProperty(name);
-		
-		return value;
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Component.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,34 @@
+package org.jboss.website.config;
+
+import java.io.Serializable;
+
+import java.util.Properties;
+
+public class Component implements Serializable
+{
+	private Properties properties = null;
+	
+	Component()
+	{
+		super();
+	}
+	
+	Properties getProperties()
+	{
+		return this.properties;
+	}
+	
+	void setProperties(Properties properties)
+	{
+		this.properties = properties;
+	}
+	
+	public String getProperty(String name)
+	{
+		String value = null;
+		
+		value = this.properties.getProperty(name);
+		
+		return value;
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,115 +0,0 @@
-package org.jboss.website.config;
-
-//xml related classes
-import org.w3c.dom.*;
-
-//standard java classes
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-
-
-import org.apache.log4j.Logger;
-import org.jboss.website.utils.Util;
-
-public class Configuration 
-{
-	//configuration state
-	private static final Logger log = Logger.getLogger(Configuration.class);
-	private static final String configLocation = "/META-INF/config.xml";
-	
-	//names of elements and attributes in the xml document that carries the system configuration
-	//of the website
-	private static final String component = "component";
-	private static final String classStr = "class";
-	private static final String property = "property";
-	private static final String name = "name";
-	private static final String value = "value";
-	
-	//application state
-	private static Map<String,Component> components = null;
-	
-	static
-	{
-		InputStream is = null;
-		try
-		{
-			Configuration.components = new HashMap<String,Component>();
-			
-			//get inputstream to configLocation
-			is = Configuration.class.getResourceAsStream(Configuration.configLocation);
-			
-			//load the configuration
-			Document configDocument = Util.parseXml(is);
-			
-			//load the configuration
-			Configuration.loadConfiguration(configDocument);
-		}
-		catch(Exception e)
-		{
-			log.error(Configuration.class.getName(),e);
-			Configuration.components = null;
-		}
-		finally
-		{
-			if(is!=null)
-			{
-				try{is.close();}catch(IOException ioe){/*dont worry, we tried to cleanup*/}
-			}
-		}
-	}
-	
-	public static void init()
-	{
-		//just so that the class will be loaded and the configuration of the system is loaded
-	}
-	
-	public static Component getComponent(String className)
-	{
-		Component component = null;
-		component = Configuration.components.get(className);
-		return component;
-	}
-	
-	public static Component getComponent(Object o)
-	{
-		return Configuration.getComponent(o.getClass().getName());
-	}
-	
-	private static void loadConfiguration(Document document)
-	throws Exception
-	{
-		NodeList components = document.getElementsByTagName(Configuration.component);
-		for(int i=0;i<components.getLength();i++)
-		{
-			Element component = (Element)components.item(i);
-			String className = component.getAttribute(Configuration.classStr);
-			Component componentObj = new Component();
-			
-			//get the properties for this component
-			NodeList properties = component.getElementsByTagName(Configuration.property);
-			Properties p = new Properties();
-			for(int j=0;j<properties.getLength();j++)
-			{
-				Element property = (Element)properties.item(j);
-				Element name = (Element)property.getElementsByTagName(Configuration.name).item(0);
-				Element value = (Element)property.getElementsByTagName(Configuration.value).item(0);
-				
-				String nameValue = name.getFirstChild().getNodeValue(); 
-            String valueValue = "";
-            if(value.getFirstChild()!=null)
-            {
-               valueValue = value.getFirstChild().getNodeValue();
-            }
-				
-				p.put(nameValue,valueValue);
-			}
-			
-			//add this componet
-			componentObj.setProperties(p);
-			Configuration.components.put(className,componentObj);
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/config/Configuration.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,115 @@
+package org.jboss.website.config;
+
+//xml related classes
+import org.w3c.dom.*;
+
+//standard java classes
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
+
+
+import org.apache.log4j.Logger;
+import org.jboss.website.utils.Util;
+
+public class Configuration 
+{
+	//configuration state
+	private static final Logger log = Logger.getLogger(Configuration.class);
+	private static final String configLocation = "/META-INF/config.xml";
+	
+	//names of elements and attributes in the xml document that carries the system configuration
+	//of the website
+	private static final String component = "component";
+	private static final String classStr = "class";
+	private static final String property = "property";
+	private static final String name = "name";
+	private static final String value = "value";
+	
+	//application state
+	private static Map<String,Component> components = null;
+	
+	static
+	{
+		InputStream is = null;
+		try
+		{
+			Configuration.components = new HashMap<String,Component>();
+			
+			//get inputstream to configLocation
+			is = Configuration.class.getResourceAsStream(Configuration.configLocation);
+			
+			//load the configuration
+			Document configDocument = Util.parseXml(is);
+			
+			//load the configuration
+			Configuration.loadConfiguration(configDocument);
+		}
+		catch(Exception e)
+		{
+			log.error(Configuration.class.getName(),e);
+			Configuration.components = null;
+		}
+		finally
+		{
+			if(is!=null)
+			{
+				try{is.close();}catch(IOException ioe){/*dont worry, we tried to cleanup*/}
+			}
+		}
+	}
+	
+	public static void init()
+	{
+		//just so that the class will be loaded and the configuration of the system is loaded
+	}
+	
+	public static Component getComponent(String className)
+	{
+		Component component = null;
+		component = Configuration.components.get(className);
+		return component;
+	}
+	
+	public static Component getComponent(Object o)
+	{
+		return Configuration.getComponent(o.getClass().getName());
+	}
+	
+	private static void loadConfiguration(Document document)
+	throws Exception
+	{
+		NodeList components = document.getElementsByTagName(Configuration.component);
+		for(int i=0;i<components.getLength();i++)
+		{
+			Element component = (Element)components.item(i);
+			String className = component.getAttribute(Configuration.classStr);
+			Component componentObj = new Component();
+			
+			//get the properties for this component
+			NodeList properties = component.getElementsByTagName(Configuration.property);
+			Properties p = new Properties();
+			for(int j=0;j<properties.getLength();j++)
+			{
+				Element property = (Element)properties.item(j);
+				Element name = (Element)property.getElementsByTagName(Configuration.name).item(0);
+				Element value = (Element)property.getElementsByTagName(Configuration.value).item(0);
+				
+				String nameValue = name.getFirstChild().getNodeValue(); 
+            String valueValue = "";
+            if(value.getFirstChild()!=null)
+            {
+               valueValue = value.getFirstChild().getNodeValue();
+            }
+				
+				p.put(nameValue,valueValue);
+			}
+			
+			//add this componet
+			componentObj.setProperties(p);
+			Configuration.components.put(className,componentObj);
+		}
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,170 +0,0 @@
-package org.jboss.website.hibernate;
-
-
-import javax.naming.InitialContext;
-
-import org.apache.log4j.Logger;
-
-import org.hibernate.Query;
-import org.hibernate.HibernateException;
-import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-
-import org.hibernate.*;
-
-
-public class Tools 
-{
-	private static final Logger log = Logger.getLogger(Tools.class);
-	
-	//hibernate configuration relation information
-	private static SessionFactory sessionFactory = null;
-	private static Configuration cfg = null;
-	private static boolean autoClose = false;
-	
-	static
-	{
-		//load the SessionFactory
-		try
-		{
-			Tools.cfg = new Configuration();
-			Tools.cfg.configure("/org/jboss/website/hibernate/jbwebsite.cfg.xml");
-			String autoCloseProperty = Tools.cfg.getProperty("hibernate.transaction.auto_close_session");
-			Tools.autoClose = Boolean.parseBoolean(autoCloseProperty);
-		}
-		catch(Exception e)
-		{
-			Tools.cfg = null;
-			Tools.sessionFactory = null;			
-			Tools.log.error("org.jboss.website.hibernate.Tools",e);
-		}
-	}
-	
-    /**
-     * 
-     *
-     */
-	public static void init()
-	{
-		try
-		{
-			//just to initialize the session factory
-			Tools.sessionFactory = (SessionFactory)new InitialContext().lookup("java:jbwebsite/SessionFactory");
-		}
-		catch(Exception e)
-		{
-			Tools.sessionFactory = Tools.cfg.buildSessionFactory();
-		}		
-		//generate the schema in the database
-		Tools.generateSiteSchema(cfg);
-	}
-    
-    //---------------------------------------------------------------------------------------------------------------------------------------------------
-	
-    /**
-     * 
-     * @return
-     */
-	public static Session getCurrentSession()
-	{
-        if(Tools.sessionFactory==null)
-        {
-            Tools.init();
-        }
-		Session session = Tools.sessionFactory.getCurrentSession();
-		return session;
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	public static Session getOpenSession()
-	{
-        if(Tools.sessionFactory==null)
-        {
-            Tools.init();
-        }
-		Session session = Tools.sessionFactory.openSession();
-		return session;
-	}
-	
-	/**
-     * 
-     * @param session
-	 */	
-	public static void closeSession(Session session)
-	{
-		if(session!=null && !Tools.autoClose)
-		{			
-			session.close();
-		}
-	}
-    
-    //---------------------------------------------------------------------------------------------------------------------------------------------
-	
-	/**
-     * 
-     * @param cfg
-	 */	
-	private static void generateSiteSchema(Configuration cfg)	
-	{				
-		if(!doesSiteSchemaExist())
-		{
-			SchemaExport export = new SchemaExport(cfg);
-			export.create(true, //print to the console
-					true //run inside the database
-			);
-		}
-		else
-		{
-			log.info("Site Schema successfully found....No need to recreate it.");
-		}
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	private static boolean doesSiteSchemaExist()
-	{		
-		Session session = null;
-		Transaction tx = null;
-        try
-        {
-	         session = Tools.sessionFactory.openSession();
-	         tx = session.beginTransaction();
-	         ClassMetadata cmd = (ClassMetadata)Tools.sessionFactory.getAllClassMetadata().values().iterator().next();
-	         if(cmd!=null)
-	         {
-	             Query query = session.createQuery("from " + cmd.getEntityName());
-	             query.setFirstResult(0);
-	             query.setMaxResults(0);
-		         try
-		         {
-		               query.list();
-		         }
-	             catch (HibernateException e)
-	             {
-	               // We consider that exception means that the schema deos not exist
-	               return false;               
-	             }
-	         }             
-             //if I get here the schemaExists, dont recreate it
-             return true;
-        }
-        finally
-        {
-        	if(tx!=null)
-        	{
-        		tx.rollback(); //does not matter since this is only a read operation
-        		//this is only so that this operation executes within the context
-        		//of a transaction that performs any necessary cleanup automatically
-        	}
-        	Tools.closeSession(session);        	
-        }		
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/hibernate/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,170 @@
+package org.jboss.website.hibernate;
+
+
+import javax.naming.InitialContext;
+
+import org.apache.log4j.Logger;
+
+import org.hibernate.Query;
+import org.hibernate.HibernateException;
+import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+
+import org.hibernate.*;
+
+
+public class Tools 
+{
+	private static final Logger log = Logger.getLogger(Tools.class);
+	
+	//hibernate configuration relation information
+	private static SessionFactory sessionFactory = null;
+	private static Configuration cfg = null;
+	private static boolean autoClose = false;
+	
+	static
+	{
+		//load the SessionFactory
+		try
+		{
+			Tools.cfg = new Configuration();
+			Tools.cfg.configure("/org/jboss/website/hibernate/jbwebsite.cfg.xml");
+			String autoCloseProperty = Tools.cfg.getProperty("hibernate.transaction.auto_close_session");
+			Tools.autoClose = Boolean.parseBoolean(autoCloseProperty);
+		}
+		catch(Exception e)
+		{
+			Tools.cfg = null;
+			Tools.sessionFactory = null;			
+			Tools.log.error("org.jboss.website.hibernate.Tools",e);
+		}
+	}
+	
+    /**
+     * 
+     *
+     */
+	public static void init()
+	{
+		try
+		{
+			//just to initialize the session factory
+			Tools.sessionFactory = (SessionFactory)new InitialContext().lookup("java:jbwebsite/SessionFactory");
+		}
+		catch(Exception e)
+		{
+			Tools.sessionFactory = Tools.cfg.buildSessionFactory();
+		}		
+		//generate the schema in the database
+		Tools.generateSiteSchema(cfg);
+	}
+    
+    //---------------------------------------------------------------------------------------------------------------------------------------------------
+	
+    /**
+     * 
+     * @return
+     */
+	public static Session getCurrentSession()
+	{
+        if(Tools.sessionFactory==null)
+        {
+            Tools.init();
+        }
+		Session session = Tools.sessionFactory.getCurrentSession();
+		return session;
+	}
+	
+    /**
+     * 
+     * @return
+     */
+	public static Session getOpenSession()
+	{
+        if(Tools.sessionFactory==null)
+        {
+            Tools.init();
+        }
+		Session session = Tools.sessionFactory.openSession();
+		return session;
+	}
+	
+	/**
+     * 
+     * @param session
+	 */	
+	public static void closeSession(Session session)
+	{
+		if(session!=null && !Tools.autoClose)
+		{			
+			session.close();
+		}
+	}
+    
+    //---------------------------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+     * 
+     * @param cfg
+	 */	
+	private static void generateSiteSchema(Configuration cfg)	
+	{				
+		if(!doesSiteSchemaExist())
+		{
+			SchemaExport export = new SchemaExport(cfg);
+			export.create(true, //print to the console
+					true //run inside the database
+			);
+		}
+		else
+		{
+			log.info("Site Schema successfully found....No need to recreate it.");
+		}
+	}
+	
+    /**
+     * 
+     * @return
+     */
+	private static boolean doesSiteSchemaExist()
+	{		
+		Session session = null;
+		Transaction tx = null;
+        try
+        {
+	         session = Tools.sessionFactory.openSession();
+	         tx = session.beginTransaction();
+	         ClassMetadata cmd = (ClassMetadata)Tools.sessionFactory.getAllClassMetadata().values().iterator().next();
+	         if(cmd!=null)
+	         {
+	             Query query = session.createQuery("from " + cmd.getEntityName());
+	             query.setFirstResult(0);
+	             query.setMaxResults(0);
+		         try
+		         {
+		               query.list();
+		         }
+	             catch (HibernateException e)
+	             {
+	               // We consider that exception means that the schema deos not exist
+	               return false;               
+	             }
+	         }             
+             //if I get here the schemaExists, dont recreate it
+             return true;
+        }
+        finally
+        {
+        	if(tx!=null)
+        	{
+        		tx.rollback(); //does not matter since this is only a read operation
+        		//this is only so that this operation executes within the context
+        		//of a transaction that performs any necessary cleanup automatically
+        	}
+        	Tools.closeSession(session);        	
+        }		
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/listeners (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/listeners)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,19 +0,0 @@
-package org.jboss.website.jsf.tags;
-
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
-
-public class IteratorTEI extends TagExtraInfo
-{
-	public VariableInfo[] getVariableInfo(TagData data) 
-	{		  
-	      VariableInfo info1 = new VariableInfo(
-	      data.getAttributeString(IteratorTag.VAR_LABEL),
-	      "Object",
-	      true,
-	      VariableInfo.NESTED);
-	      VariableInfo[] info = {info1};
-	      return info;
-	 }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTEI.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,19 @@
+package org.jboss.website.jsf.tags;
+
+import javax.servlet.jsp.tagext.TagData;
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.VariableInfo;
+
+public class IteratorTEI extends TagExtraInfo
+{
+	public VariableInfo[] getVariableInfo(TagData data) 
+	{		  
+	      VariableInfo info1 = new VariableInfo(
+	      data.getAttributeString(IteratorTag.VAR_LABEL),
+	      "Object",
+	      true,
+	      VariableInfo.NESTED);
+	      VariableInfo[] info = {info1};
+	      return info;
+	 }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,115 +0,0 @@
-package org.jboss.website.jsf.tags;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.io.IOException;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.faces.context.FacesContext;
-import javax.faces.application.Application;
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
-
-import org.jboss.website.utils.Util;
-
-public class IteratorTag extends BodyTagSupport
-{
-	public static final String VAR_LABEL = "var";
-	
-	//attributes
-	private String items = null;	
-	private String var = null;
-	
-	//iterator
-	private Iterator iterator = null;
-	
-	
-	public IteratorTag()
-	{
-		super();		
-	}
-	
-	public String getItems()
-	{
-		return this.items;
-	}
-	
-	public void setItems(String items)
-	{
-		this.items = items;
-		
-		if(UIComponentTag.isValueReference(this.items))
-		{
-			//setup the iterator 
-			//extract it from the JSF environment
-			FacesContext context = FacesContext.getCurrentInstance();
-			Application app = context.getApplication();
-			ValueBinding vb = app.createValueBinding(this.items);
-			Object cour = vb.getValue(context); 
-			if((cour instanceof Collection) && !Util.isEmpty((Collection)cour))
-			{
-				this.iterator = ((Collection)cour).iterator();
-			}
-		}
-	}
-	
-	public String getVar()
-	{
-		return this.var;
-	}
-	
-	public void setVar(String var)
-	{
-		this.var = var;
-	}
-	
-	public void release()
-	{		
-		super.release();						
-		this.items = null;
-		this.var = null;
-		this.iterator = null;				
-	}
-		
-	public int doStartTag() throws JspException
-	{								
-		//perform the first iteration
-		return this.processIteration();
-	}
-	
-	public int doAfterBody() throws JspException
-	{		
-		BodyContent body = this.getBodyContent();
-		if(body!=null)
-		{
-			try 
-			{
-				body.writeOut(this.getPreviousOut());
-		    } 
-			catch (IOException e) 
-			{
-		      throw new JspTagException("IterationTag: " + e.getMessage());
-		    }
-			//clear up so the next time the body content is empty	
-			body.clearBody();
-		}	   
-	    return this.processIteration();
-	}
-	
-	private int processIteration()
-	{
-	   if (this.iterator!=null && this.iterator.hasNext()) 
-	   {
-		  Object cour = this.iterator.next();
-		  pageContext.setAttribute(this.var,cour);		  
-	      return EVAL_BODY_AGAIN;
-	   } 
-	   else 
-	   {
-	      return SKIP_BODY;
-	   }
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/IteratorTag.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,115 @@
+package org.jboss.website.jsf.tags;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.io.IOException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.tagext.BodyContent;
+import javax.faces.context.FacesContext;
+import javax.faces.application.Application;
+import javax.faces.el.ValueBinding;
+import javax.faces.webapp.UIComponentTag;
+
+import org.jboss.website.utils.Util;
+
+public class IteratorTag extends BodyTagSupport
+{
+	public static final String VAR_LABEL = "var";
+	
+	//attributes
+	private String items = null;	
+	private String var = null;
+	
+	//iterator
+	private Iterator iterator = null;
+	
+	
+	public IteratorTag()
+	{
+		super();		
+	}
+	
+	public String getItems()
+	{
+		return this.items;
+	}
+	
+	public void setItems(String items)
+	{
+		this.items = items;
+		
+		if(UIComponentTag.isValueReference(this.items))
+		{
+			//setup the iterator 
+			//extract it from the JSF environment
+			FacesContext context = FacesContext.getCurrentInstance();
+			Application app = context.getApplication();
+			ValueBinding vb = app.createValueBinding(this.items);
+			Object cour = vb.getValue(context); 
+			if((cour instanceof Collection) && !Util.isEmpty((Collection)cour))
+			{
+				this.iterator = ((Collection)cour).iterator();
+			}
+		}
+	}
+	
+	public String getVar()
+	{
+		return this.var;
+	}
+	
+	public void setVar(String var)
+	{
+		this.var = var;
+	}
+	
+	public void release()
+	{		
+		super.release();						
+		this.items = null;
+		this.var = null;
+		this.iterator = null;				
+	}
+		
+	public int doStartTag() throws JspException
+	{								
+		//perform the first iteration
+		return this.processIteration();
+	}
+	
+	public int doAfterBody() throws JspException
+	{		
+		BodyContent body = this.getBodyContent();
+		if(body!=null)
+		{
+			try 
+			{
+				body.writeOut(this.getPreviousOut());
+		    } 
+			catch (IOException e) 
+			{
+		      throw new JspTagException("IterationTag: " + e.getMessage());
+		    }
+			//clear up so the next time the body content is empty	
+			body.clearBody();
+		}	   
+	    return this.processIteration();
+	}
+	
+	private int processIteration()
+	{
+	   if (this.iterator!=null && this.iterator.hasNext()) 
+	   {
+		  Object cour = this.iterator.next();
+		  pageContext.setAttribute(this.var,cour);		  
+	      return EVAL_BODY_AGAIN;
+	   } 
+	   else 
+	   {
+	      return SKIP_BODY;
+	   }
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,99 +0,0 @@
-package org.jboss.website.jsf.tags;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Iterator;
-import java.io.IOException;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.faces.context.FacesContext;
-import javax.faces.application.Application;
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
-
-import org.jboss.website.utils.Util;
-
-public class SetValueTag extends TagSupport
-{		
-	//attributes
-	private String target = null;	
-	private String property = null;
-	private Object value = null;
-	
-	private Object targetObject = null;
-		
-	public SetValueTag()
-	{
-		super();		
-	}
-	
-	public String getTarget()
-	{
-		return this.target;
-	}
-	
-	public void setTarget(String target)
-	{
-		this.target = target;
-		
-		if(UIComponentTag.isValueReference(this.target))
-		{
-			//setup the iterator 
-			//extract it from the JSF environment
-			FacesContext context = FacesContext.getCurrentInstance();
-			Application app = context.getApplication();
-			ValueBinding vb = app.createValueBinding(this.target);
-			this.targetObject = vb.getValue(context); 			
-		}
-	}
-	
-	public String getProperty()
-	{
-		return this.property;
-	}
-	
-	public void setProperty(String property)
-	{
-		this.property = property;
-	}
-	
-	public Object getValue()
-	{
-		return this.value;
-	}
-	
-	public void setValue(Object value)
-	{
-		this.value = value;
-	}
-	
-	public void release()
-	{		
-		super.release();						
-		this.target = null;
-		this.property = null;
-		this.value = null;
-		this.targetObject = null;
-	}
-		
-	public int doStartTag() throws JspException
-	{
-		try
-		{
-			if(this.targetObject!=null)
-			{
-				//get the setProperty method name
-				String methodName = "set"+this.property.substring(0,1).toUpperCase()+this.property.substring(1);
-				Method setMethod = this.targetObject.getClass().getMethod(methodName,new Class[]{this.value.getClass()});
-				setMethod.invoke(this.targetObject,new Object[]{this.value});
-			}
-		}
-		catch(Exception e)
-		{
-			throw new JspException(e);
-		}
-		return this.SKIP_BODY;
-	}	
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/tags/SetValueTag.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,99 @@
+package org.jboss.website.jsf.tags;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Iterator;
+import java.io.IOException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.faces.context.FacesContext;
+import javax.faces.application.Application;
+import javax.faces.el.ValueBinding;
+import javax.faces.webapp.UIComponentTag;
+
+import org.jboss.website.utils.Util;
+
+public class SetValueTag extends TagSupport
+{		
+	//attributes
+	private String target = null;	
+	private String property = null;
+	private Object value = null;
+	
+	private Object targetObject = null;
+		
+	public SetValueTag()
+	{
+		super();		
+	}
+	
+	public String getTarget()
+	{
+		return this.target;
+	}
+	
+	public void setTarget(String target)
+	{
+		this.target = target;
+		
+		if(UIComponentTag.isValueReference(this.target))
+		{
+			//setup the iterator 
+			//extract it from the JSF environment
+			FacesContext context = FacesContext.getCurrentInstance();
+			Application app = context.getApplication();
+			ValueBinding vb = app.createValueBinding(this.target);
+			this.targetObject = vb.getValue(context); 			
+		}
+	}
+	
+	public String getProperty()
+	{
+		return this.property;
+	}
+	
+	public void setProperty(String property)
+	{
+		this.property = property;
+	}
+	
+	public Object getValue()
+	{
+		return this.value;
+	}
+	
+	public void setValue(Object value)
+	{
+		this.value = value;
+	}
+	
+	public void release()
+	{		
+		super.release();						
+		this.target = null;
+		this.property = null;
+		this.value = null;
+		this.targetObject = null;
+	}
+		
+	public int doStartTag() throws JspException
+	{
+		try
+		{
+			if(this.targetObject!=null)
+			{
+				//get the setProperty method name
+				String methodName = "set"+this.property.substring(0,1).toUpperCase()+this.property.substring(1);
+				Method setMethod = this.targetObject.getClass().getMethod(methodName,new Class[]{this.value.getClass()});
+				setMethod.invoke(this.targetObject,new Object[]{this.value});
+			}
+		}
+		catch(Exception e)
+		{
+			throw new JspException(e);
+		}
+		return this.SKIP_BODY;
+	}	
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,39 +0,0 @@
-package org.jboss.website.jsf.utils;
-
-import javax.faces.application.FacesMessage;
-
-import org.jboss.website.utils.ResourceFactory;
-
-public class FacesBundleMessage extends FacesMessage 
-{
-	private String bundleName = null;
-	
-	public FacesBundleMessage(String bundleName)
-	{
-		super();
-		this.bundleName = bundleName;
-	}
-		
-	public void setSummary(String summary)
-	{
-		super.setSummary(ResourceFactory.getResources().getString(this.bundleName,summary));
-	}
-	
-	public void setSummary(String summary,Object[] parameters)
-	{
-		String message = ResourceFactory.getResources().getString(this.bundleName,summary,parameters);
-		super.setSummary(message);
-	}
-	
-	public void setDetail(String detail)
-	{
-		super.setDetail(ResourceFactory.getResources().getString(this.bundleName,detail));
-	}
-	
-	public void setDetail(String detail,Object[] parameters)
-	{
-		String message = ResourceFactory.getResources().getString(this.bundleName,detail,parameters);
-		super.setDetail(message);
-	}
-	
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/FacesBundleMessage.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,39 @@
+package org.jboss.website.jsf.utils;
+
+import javax.faces.application.FacesMessage;
+
+import org.jboss.website.utils.ResourceFactory;
+
+public class FacesBundleMessage extends FacesMessage 
+{
+	private String bundleName = null;
+	
+	public FacesBundleMessage(String bundleName)
+	{
+		super();
+		this.bundleName = bundleName;
+	}
+		
+	public void setSummary(String summary)
+	{
+		super.setSummary(ResourceFactory.getResources().getString(this.bundleName,summary));
+	}
+	
+	public void setSummary(String summary,Object[] parameters)
+	{
+		String message = ResourceFactory.getResources().getString(this.bundleName,summary,parameters);
+		super.setSummary(message);
+	}
+	
+	public void setDetail(String detail)
+	{
+		super.setDetail(ResourceFactory.getResources().getString(this.bundleName,detail));
+	}
+	
+	public void setDetail(String detail,Object[] parameters)
+	{
+		String message = ResourceFactory.getResources().getString(this.bundleName,detail,parameters);
+		super.setDetail(message);
+	}
+	
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,244 +0,0 @@
-package org.jboss.website.jsf.utils;
-
-//core java
-import java.util.Map;
-import java.util.Iterator;
-import javax.ejb.EJBException;
-
-//core logger
-import org.apache.log4j.Logger;
-
-import javax.portlet.PortletRequest;
-
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.application.FacesMessage;
-
-
-import org.jboss.security.acl.AccessDenied;
-import org.jboss.security.acl.User;
-import org.jboss.security.acl.UserThreadLocal;
-
-import org.jboss.website.security.Tools;
-import org.jboss.website.utils.Constants;
-
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class JSFUtil 
-{
-    public static final String ERROR = "error";
-    private static Logger log = Logger.getLogger(JSFUtil.class);
-    
-    /**
-     * 
-     * @param parameter
-     * @return
-     */
-	public static String getParameter(String parameter)
-	{
-		String value = null;
-		ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();			
-		Map parameters = context.getRequestParameterMap();
-		value = (String)parameters.get(parameter);
-		return value;
-	}
-    
-    /**
-     * 
-     * @param attribute
-     * @param value
-     */
-    public static void setSessionAttribute(String attribute,Object value)
-    {
-        ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();
-        context.getSessionMap().put(attribute,value);
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static ExternalContext getContext()
-    {
-        return FacesContext.getCurrentInstance().getExternalContext();
-    }
-    
-    /**
-     * 
-     * @return
-     * @throws Exception
-     */
-    public static User getAclUser() throws Exception
-    {        
-        ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();        
-        User user = (User)context.getSessionMap().get(Constants.ACL_USER);        
-        if(user==null)
-        {            
-            user = User.getUser(context.getRemoteUser());
-            Tools.populateRoles(user);
-            if(user.getIdentity()!=null)
-            {
-                context.getSessionMap().put(Constants.ACL_USER,user);
-            }
-        }
-        
-        //populate the treadlocal
-        UserThreadLocal.setUser(user);
-        
-        return user;
-    }
-           
-    /**
-     * 
-     * @return
-     */
-    public static String getContextPath()
-    {
-        String contextPath = "";
-        
-        contextPath = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
-        
-        return contextPath;
-    }  
-    
-    /**
-     * 
-     * @author sshah
-     *
-     */
-    public static String handleException(Exception e)
-    {
-        String navState = null;
-        
-        if(e instanceof EJBException)
-        {
-            Exception cause = ((EJBException)e).getCausedByException();
-            if(cause!=null)
-            {
-                e = cause;
-            }
-        }
-        
-        
-        if(e instanceof AccessDenied)
-        {
-            //setup the message
-            String msg = e.toString();        
-            FacesMessage message = new FacesMessage(
-              FacesMessage.SEVERITY_ERROR,//severity
-              "accessDenied",//summary
-              "accessDenied"//detail
-            );  
-            FacesContext.getCurrentInstance().addMessage(ERROR,message);
-        }
-        else
-        {
-            //setup the message
-            String msg = e.toString();        
-            FacesMessage message = new FacesMessage(
-              FacesMessage.SEVERITY_ERROR,//severity
-              msg,//summary
-              msg//detail
-            );  
-            FacesContext.getCurrentInstance().addMessage(ERROR,message);
-        }
-        
-        //spit the stack trace
-        log.error(JSFUtil.class.getName(),e);
-        
-        return navState;
-        
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static String getErrorMsg()
-    {
-        String errorMsg = null;
-        
-        Iterator msgs = FacesContext.getCurrentInstance().getMessages(ERROR);
-        if(msgs!=null)
-        {
-            if(msgs.hasNext())
-            {
-                FacesMessage message = (FacesMessage)msgs.next();
-                errorMsg = message.getDetail();
-            }
-        }
-        
-        return errorMsg;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static boolean isAccessDenied()
-    {
-        boolean isAccessDenied = false;
-        
-        String msg = JSFUtil.getErrorMsg();
-        if(msg!=null && msg.equalsIgnoreCase("accessdenied"))
-        {
-            isAccessDenied = true;
-        }
-        
-        return isAccessDenied;
-    } 
-    
-    /**
-     * 
-     * @return
-     */
-    public static boolean isRunningInPortal()
-    {
-       boolean isRunningPortal = false;
-       
-       if(FacesContext.getCurrentInstance().getExternalContext().getRequest() instanceof PortletRequest)
-       {
-           isRunningPortal = true;
-       }
-       
-       return isRunningPortal;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static boolean isAnonymous()
-    {
-        boolean anonymous = true;
-        
-        String remoteUser = FacesContext.getCurrentInstance().getExternalContext().getRemoteUser();
-        if(remoteUser!=null && remoteUser.trim().length()>0)
-        {
-            anonymous = false;
-        }
-        
-        return anonymous;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static String getAuthenticatedUser()
-    {
-        String authenticatedUser = null;
-        
-        authenticatedUser = FacesContext.getCurrentInstance().getExternalContext().getRemoteUser();
-        if(authenticatedUser!=null && authenticatedUser.trim().length()==0)
-        {
-            authenticatedUser = null;
-        }
-        
-        return authenticatedUser;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/JSFUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,244 @@
+package org.jboss.website.jsf.utils;
+
+//core java
+import java.util.Map;
+import java.util.Iterator;
+import javax.ejb.EJBException;
+
+//core logger
+import org.apache.log4j.Logger;
+
+import javax.portlet.PortletRequest;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.application.FacesMessage;
+
+
+import org.jboss.security.acl.AccessDenied;
+import org.jboss.security.acl.User;
+import org.jboss.security.acl.UserThreadLocal;
+
+import org.jboss.website.security.Tools;
+import org.jboss.website.utils.Constants;
+
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class JSFUtil 
+{
+    public static final String ERROR = "error";
+    private static Logger log = Logger.getLogger(JSFUtil.class);
+    
+    /**
+     * 
+     * @param parameter
+     * @return
+     */
+	public static String getParameter(String parameter)
+	{
+		String value = null;
+		ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();			
+		Map parameters = context.getRequestParameterMap();
+		value = (String)parameters.get(parameter);
+		return value;
+	}
+    
+    /**
+     * 
+     * @param attribute
+     * @param value
+     */
+    public static void setSessionAttribute(String attribute,Object value)
+    {
+        ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();
+        context.getSessionMap().put(attribute,value);
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static ExternalContext getContext()
+    {
+        return FacesContext.getCurrentInstance().getExternalContext();
+    }
+    
+    /**
+     * 
+     * @return
+     * @throws Exception
+     */
+    public static User getAclUser() throws Exception
+    {        
+        ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();        
+        User user = (User)context.getSessionMap().get(Constants.ACL_USER);        
+        if(user==null)
+        {            
+            user = User.getUser(context.getRemoteUser());
+            Tools.populateRoles(user);
+            if(user.getIdentity()!=null)
+            {
+                context.getSessionMap().put(Constants.ACL_USER,user);
+            }
+        }
+        
+        //populate the treadlocal
+        UserThreadLocal.setUser(user);
+        
+        return user;
+    }
+           
+    /**
+     * 
+     * @return
+     */
+    public static String getContextPath()
+    {
+        String contextPath = "";
+        
+        contextPath = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
+        
+        return contextPath;
+    }  
+    
+    /**
+     * 
+     * @author sshah
+     *
+     */
+    public static String handleException(Exception e)
+    {
+        String navState = null;
+        
+        if(e instanceof EJBException)
+        {
+            Exception cause = ((EJBException)e).getCausedByException();
+            if(cause!=null)
+            {
+                e = cause;
+            }
+        }
+        
+        
+        if(e instanceof AccessDenied)
+        {
+            //setup the message
+            String msg = e.toString();        
+            FacesMessage message = new FacesMessage(
+              FacesMessage.SEVERITY_ERROR,//severity
+              "accessDenied",//summary
+              "accessDenied"//detail
+            );  
+            FacesContext.getCurrentInstance().addMessage(ERROR,message);
+        }
+        else
+        {
+            //setup the message
+            String msg = e.toString();        
+            FacesMessage message = new FacesMessage(
+              FacesMessage.SEVERITY_ERROR,//severity
+              msg,//summary
+              msg//detail
+            );  
+            FacesContext.getCurrentInstance().addMessage(ERROR,message);
+        }
+        
+        //spit the stack trace
+        log.error(JSFUtil.class.getName(),e);
+        
+        return navState;
+        
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static String getErrorMsg()
+    {
+        String errorMsg = null;
+        
+        Iterator msgs = FacesContext.getCurrentInstance().getMessages(ERROR);
+        if(msgs!=null)
+        {
+            if(msgs.hasNext())
+            {
+                FacesMessage message = (FacesMessage)msgs.next();
+                errorMsg = message.getDetail();
+            }
+        }
+        
+        return errorMsg;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static boolean isAccessDenied()
+    {
+        boolean isAccessDenied = false;
+        
+        String msg = JSFUtil.getErrorMsg();
+        if(msg!=null && msg.equalsIgnoreCase("accessdenied"))
+        {
+            isAccessDenied = true;
+        }
+        
+        return isAccessDenied;
+    } 
+    
+    /**
+     * 
+     * @return
+     */
+    public static boolean isRunningInPortal()
+    {
+       boolean isRunningPortal = false;
+       
+       if(FacesContext.getCurrentInstance().getExternalContext().getRequest() instanceof PortletRequest)
+       {
+           isRunningPortal = true;
+       }
+       
+       return isRunningPortal;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static boolean isAnonymous()
+    {
+        boolean anonymous = true;
+        
+        String remoteUser = FacesContext.getCurrentInstance().getExternalContext().getRemoteUser();
+        if(remoteUser!=null && remoteUser.trim().length()>0)
+        {
+            anonymous = false;
+        }
+        
+        return anonymous;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static String getAuthenticatedUser()
+    {
+        String authenticatedUser = null;
+        
+        authenticatedUser = FacesContext.getCurrentInstance().getExternalContext().getRemoteUser();
+        if(authenticatedUser!=null && authenticatedUser.trim().length()==0)
+        {
+            authenticatedUser = null;
+        }
+        
+        return authenticatedUser;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,206 +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.website.jsf.utils;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.ArrayList;
-
-/*
- * Created on May 11, 2006
- *
- * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
- */
-public class PageNavigator implements Serializable
-{
-    /**
-     * 
-     */    
-    private int totalPages = 0;
-    private int pageSize = 0;
-    private int currentPage = 0;
-    private Object[] entries = null;
-    
-    /**
-     * 
-     *
-     */
-    public PageNavigator(Object[] entries,int pageSize,int currentPage)
-    { 
-        if(entries==null)
-        {
-            throw new IllegalStateException("PageNavigator cannot be initialized with a null set of entries");
-        }
-        
-        this.pageSize = pageSize;
-        this.currentPage = currentPage;
-        int totalEntries = 0;
-        if(entries!=null)
-        {
-            this.entries = entries;
-            totalEntries = this.entries.length;
-        }
-        
-        
-        //calculate the totalNumberofPages that will be made
-        double totalDbl = totalEntries;
-        double pageSizeDbl = this.pageSize;
-        double pageCountDbl = totalDbl/pageSizeDbl;
-        this.totalPages = (int)Math.ceil(pageCountDbl);                
-    }
-    
-    /**
-     * 
-     *
-     */
-    public int getTotalPages()
-    {
-        return this.totalPages;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public int getCurrentPage()
-    {
-        return this.currentPage;
-    }
-    
-      
-    /**
-     * 
-     *
-     */
-    public int getBeginIndex()
-    {
-        int beginIndex = 0;
-        
-        beginIndex = this.currentPage * this.pageSize;
-        
-        return beginIndex;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public int getEndIndex()
-    {
-        int endIndex = 0;
-        
-        endIndex = this.getBeginIndex() + this.pageSize;
-        int totalEntries = 0;
-        if(this.entries!=null)
-        {
-            totalEntries = this.entries.length;
-        }
-        if(endIndex >= totalEntries)
-        {
-            endIndex = totalEntries;
-        }
-        
-        return endIndex;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public Collection getPage()
-    {
-        Collection page = new ArrayList();
-        
-        int beginIndex = this.getBeginIndex();
-        int endIndex = this.getEndIndex();
-        int totalEntries = 0;
-        if(this.entries!=null)
-        {
-           totalEntries = this.entries.length;
-        }
-        
-        //reset the page navigation if the start cursor is outside the range (both forward and backward)
-        if(beginIndex >= totalEntries || beginIndex < 0)
-        {
-            this.setCurrentPage(0); //go to the first page
-            beginIndex = this.getBeginIndex();
-            endIndex = this.getEndIndex();
-        }
-        	            
-        //get the entries for this page	            	            
-        for(int i=beginIndex;i<endIndex;i++)
-        {
-            page.add(this.entries[i]);
-        }
-                
-        return page;
-    }
-    
-        
-    /**
-     * 
-     *
-     */
-    public String getPageNumber()
-    {        
-        return String.valueOf(this.getCurrentPage()+1);
-    }
-    
-    /**
-     * 
-     *
-     */
-    public int[] getPages()
-    {
-        int[] pages = new int[this.getTotalPages()];
-        for(int i=0;i<pages.length;i++)
-        {
-            pages[i] = i+1;
-        }
-        return pages;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public int getPageAfterAdd()
-    {
-       int pageAfterAdd = 0;
-       
-       double totalDbl = this.entries.length+1;
-       double pageSizeDbl = this.pageSize;
-       double pageCountDbl = totalDbl/pageSizeDbl;
-       pageAfterAdd = ((int)Math.ceil(pageCountDbl))-1;       
-       
-       return pageAfterAdd;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public void setCurrentPage(int currentPage)
-    {
-        this.currentPage = currentPage;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PageNavigator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,206 @@
+/*
+* 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.website.jsf.utils;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.ArrayList;
+
+/*
+ * Created on May 11, 2006
+ *
+ * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
+ */
+public class PageNavigator implements Serializable
+{
+    /**
+     * 
+     */    
+    private int totalPages = 0;
+    private int pageSize = 0;
+    private int currentPage = 0;
+    private Object[] entries = null;
+    
+    /**
+     * 
+     *
+     */
+    public PageNavigator(Object[] entries,int pageSize,int currentPage)
+    { 
+        if(entries==null)
+        {
+            throw new IllegalStateException("PageNavigator cannot be initialized with a null set of entries");
+        }
+        
+        this.pageSize = pageSize;
+        this.currentPage = currentPage;
+        int totalEntries = 0;
+        if(entries!=null)
+        {
+            this.entries = entries;
+            totalEntries = this.entries.length;
+        }
+        
+        
+        //calculate the totalNumberofPages that will be made
+        double totalDbl = totalEntries;
+        double pageSizeDbl = this.pageSize;
+        double pageCountDbl = totalDbl/pageSizeDbl;
+        this.totalPages = (int)Math.ceil(pageCountDbl);                
+    }
+    
+    /**
+     * 
+     *
+     */
+    public int getTotalPages()
+    {
+        return this.totalPages;
+    }
+    
+    /**
+     * 
+     *
+     */
+    public int getCurrentPage()
+    {
+        return this.currentPage;
+    }
+    
+      
+    /**
+     * 
+     *
+     */
+    public int getBeginIndex()
+    {
+        int beginIndex = 0;
+        
+        beginIndex = this.currentPage * this.pageSize;
+        
+        return beginIndex;
+    }
+    
+    /**
+     * 
+     *
+     */
+    public int getEndIndex()
+    {
+        int endIndex = 0;
+        
+        endIndex = this.getBeginIndex() + this.pageSize;
+        int totalEntries = 0;
+        if(this.entries!=null)
+        {
+            totalEntries = this.entries.length;
+        }
+        if(endIndex >= totalEntries)
+        {
+            endIndex = totalEntries;
+        }
+        
+        return endIndex;
+    }
+    
+    /**
+     * 
+     *
+     */
+    public Collection getPage()
+    {
+        Collection page = new ArrayList();
+        
+        int beginIndex = this.getBeginIndex();
+        int endIndex = this.getEndIndex();
+        int totalEntries = 0;
+        if(this.entries!=null)
+        {
+           totalEntries = this.entries.length;
+        }
+        
+        //reset the page navigation if the start cursor is outside the range (both forward and backward)
+        if(beginIndex >= totalEntries || beginIndex < 0)
+        {
+            this.setCurrentPage(0); //go to the first page
+            beginIndex = this.getBeginIndex();
+            endIndex = this.getEndIndex();
+        }
+        	            
+        //get the entries for this page	            	            
+        for(int i=beginIndex;i<endIndex;i++)
+        {
+            page.add(this.entries[i]);
+        }
+                
+        return page;
+    }
+    
+        
+    /**
+     * 
+     *
+     */
+    public String getPageNumber()
+    {        
+        return String.valueOf(this.getCurrentPage()+1);
+    }
+    
+    /**
+     * 
+     *
+     */
+    public int[] getPages()
+    {
+        int[] pages = new int[this.getTotalPages()];
+        for(int i=0;i<pages.length;i++)
+        {
+            pages[i] = i+1;
+        }
+        return pages;
+    }
+    
+    /**
+     * 
+     *
+     */
+    public int getPageAfterAdd()
+    {
+       int pageAfterAdd = 0;
+       
+       double totalDbl = this.entries.length+1;
+       double pageSizeDbl = this.pageSize;
+       double pageCountDbl = totalDbl/pageSizeDbl;
+       pageAfterAdd = ((int)Math.ceil(pageCountDbl))-1;       
+       
+       return pageAfterAdd;
+    }
+    
+    /**
+     * 
+     *
+     */
+    public void setCurrentPage(int currentPage)
+    {
+        this.currentPage = currentPage;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,170 +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.website.jsf.utils;
-
-
-import java.net.URLEncoder;
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
-
-//jsf
-import javax.faces.context.FacesContext;
-
-//portal
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import org.jboss.website.utils.Util; 
-
-/**
- * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
- *
- */
-public class PortalUtil 
-{
-    /**
-     * 
-     */
-    private static Logger log = Logger.getLogger(PortalUtil.class);
-       
-    /**
-     * 
-     * @author sshah
-     *
-     */
-    public static String outputLink(String outputLink,boolean isAction)
-    {        
-        try
-        {
-	        String url = null;
-	        	        
-	        Object response = FacesContext.getCurrentInstance().getExternalContext().getResponse();
-	        
-            //make sure outputLink has proper structure
-	        if(!outputLink.startsWith("/"))
-	        {
-	            outputLink = "/" + outputLink;
-	        }
-	        	        
-            //check if this is a portal request/response
-	        if(response instanceof RenderResponse)
-	        {
-	            RenderResponse renderResponse = (RenderResponse)response;
-	            
-	            PortletURL portletURL = null;
-	            
-	            if(isAction)
-	            {
-	                portletURL = renderResponse.createActionURL();
-	            }
-	            else
-	            {
-	                portletURL = renderResponse.createRenderURL();
-	            }
-                
-                String jsfPage = null;
-                String jsfParams = null;
-                int questionMarkIndex = outputLink.indexOf('?');
-                if(questionMarkIndex!=-1)
-                {                    
-                    //this includes a link to the jsf page and a query string of parameters to pass
-                    jsfPage = outputLink.substring(0,questionMarkIndex);
-                    jsfParams = outputLink.substring(questionMarkIndex+1);
-                }
-                else
-                {
-                    //no parameters to be included....just plain link to a jsf page
-                    jsfPage = outputLink;
-                }
-	            
-	            String jsfUrl = portletURL.toString();
-	            jsfUrl += "&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID="+
-	            URLEncoder.encode(jsfPage,"UTF-8");
-                
-                if(jsfParams!=null && jsfParams.trim().length()>0)
-                {
-                    jsfUrl += "&" + jsfParams;
-                }
-	            
-	            url = jsfUrl;
-	        }
-	        else
-	        {
-                //this is a plain stanalone jsf request/response
-	            String contextPath = JSFUtil.getContextPath();
-	            url = contextPath + outputLink;
-	        }
-	                        
-	        return url;
-        }
-        catch(Exception e)
-        {
-            log.error(PortalUtil.class.getName(),e);
-            return null;
-        }
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static String goBackLink()
-    {
-       String backLink = "javascript:history.back();";       
-       return backLink;
-    }
-    
-    /**
-     * 
-     * @param request
-     * @param param
-     * @return
-     */
-    public static String getParameter(ActionRequest request,String param)
-    {
-        String parameter = null;
-        
-        parameter = request.getParameter(param);
-        
-        return parameter;
-    }
-    
-    /**
-     * 
-     * @param response
-     */
-    public static void sendRedirect(RenderResponse response,String resource) throws IOException
-    {
-        StringBuffer buffer = new StringBuffer();
-        
-        buffer.append("<script language=\"javascript\" type=\"text/javascript\">\n");
-        buffer.append("window.location.href='"+resource+"';\n");
-        buffer.append("</script>\n");
-        
-        response.setContentType("text/html");
-        response.getPortletOutputStream().write(buffer.toString().getBytes());
-        response.getPortletOutputStream().flush();
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/utils/PortalUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,170 @@
+/*
+* 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.website.jsf.utils;
+
+
+import java.net.URLEncoder;
+import java.io.IOException;
+
+import org.apache.log4j.Logger;
+
+//jsf
+import javax.faces.context.FacesContext;
+
+//portal
+import javax.portlet.ActionRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderResponse;
+
+import org.jboss.website.utils.Util; 
+
+/**
+ * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
+ *
+ */
+public class PortalUtil 
+{
+    /**
+     * 
+     */
+    private static Logger log = Logger.getLogger(PortalUtil.class);
+       
+    /**
+     * 
+     * @author sshah
+     *
+     */
+    public static String outputLink(String outputLink,boolean isAction)
+    {        
+        try
+        {
+	        String url = null;
+	        	        
+	        Object response = FacesContext.getCurrentInstance().getExternalContext().getResponse();
+	        
+            //make sure outputLink has proper structure
+	        if(!outputLink.startsWith("/"))
+	        {
+	            outputLink = "/" + outputLink;
+	        }
+	        	        
+            //check if this is a portal request/response
+	        if(response instanceof RenderResponse)
+	        {
+	            RenderResponse renderResponse = (RenderResponse)response;
+	            
+	            PortletURL portletURL = null;
+	            
+	            if(isAction)
+	            {
+	                portletURL = renderResponse.createActionURL();
+	            }
+	            else
+	            {
+	                portletURL = renderResponse.createRenderURL();
+	            }
+                
+                String jsfPage = null;
+                String jsfParams = null;
+                int questionMarkIndex = outputLink.indexOf('?');
+                if(questionMarkIndex!=-1)
+                {                    
+                    //this includes a link to the jsf page and a query string of parameters to pass
+                    jsfPage = outputLink.substring(0,questionMarkIndex);
+                    jsfParams = outputLink.substring(questionMarkIndex+1);
+                }
+                else
+                {
+                    //no parameters to be included....just plain link to a jsf page
+                    jsfPage = outputLink;
+                }
+	            
+	            String jsfUrl = portletURL.toString();
+	            jsfUrl += "&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID="+
+	            URLEncoder.encode(jsfPage,"UTF-8");
+                
+                if(jsfParams!=null && jsfParams.trim().length()>0)
+                {
+                    jsfUrl += "&" + jsfParams;
+                }
+	            
+	            url = jsfUrl;
+	        }
+	        else
+	        {
+                //this is a plain stanalone jsf request/response
+	            String contextPath = JSFUtil.getContextPath();
+	            url = contextPath + outputLink;
+	        }
+	                        
+	        return url;
+        }
+        catch(Exception e)
+        {
+            log.error(PortalUtil.class.getName(),e);
+            return null;
+        }
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static String goBackLink()
+    {
+       String backLink = "javascript:history.back();";       
+       return backLink;
+    }
+    
+    /**
+     * 
+     * @param request
+     * @param param
+     * @return
+     */
+    public static String getParameter(ActionRequest request,String param)
+    {
+        String parameter = null;
+        
+        parameter = request.getParameter(param);
+        
+        return parameter;
+    }
+    
+    /**
+     * 
+     * @param response
+     */
+    public static void sendRedirect(RenderResponse response,String resource) throws IOException
+    {
+        StringBuffer buffer = new StringBuffer();
+        
+        buffer.append("<script language=\"javascript\" type=\"text/javascript\">\n");
+        buffer.append("window.location.href='"+resource+"';\n");
+        buffer.append("</script>\n");
+        
+        response.setContentType("text/html");
+        response.getPortletOutputStream().write(buffer.toString().getBytes());
+        response.getPortletOutputStream().flush();
+    }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,31 +0,0 @@
-package org.jboss.website.jsf.validator;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
-
-import org.jboss.website.jsf.utils.FacesBundleMessage;
-import org.apache.commons.validator.GenericValidator;
-
-public class EmailValidator implements Validator 
-{
-	public void validate(FacesContext context,UIComponent component,Object value)
-	{
-		String email = (String)value;
-		
-		//check the email format
-		boolean isValid = GenericValidator.isEmail(email);
-		
-		if(!isValid)
-		{
-			//validator exception, invalid value was submitted
-			FacesMessage message = new FacesBundleMessage("org.jboss.website.jsf.validator.messages");
-			message.setSummary("invalidEmailAddress");
-			message.setDetail("invalidEmailAddressDetail");
-			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-			throw new ValidatorException(message);
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/EmailValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,31 @@
+package org.jboss.website.jsf.validator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+import org.jboss.website.jsf.utils.FacesBundleMessage;
+import org.apache.commons.validator.GenericValidator;
+
+public class EmailValidator implements Validator 
+{
+	public void validate(FacesContext context,UIComponent component,Object value)
+	{
+		String email = (String)value;
+		
+		//check the email format
+		boolean isValid = GenericValidator.isEmail(email);
+		
+		if(!isValid)
+		{
+			//validator exception, invalid value was submitted
+			FacesMessage message = new FacesBundleMessage("org.jboss.website.jsf.validator.messages");
+			message.setSummary("invalidEmailAddress");
+			message.setDetail("invalidEmailAddressDetail");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			throw new ValidatorException(message);
+		}
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,32 +0,0 @@
-package org.jboss.website.jsf.validator;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
-
-
-import org.jboss.website.jsf.utils.FacesBundleMessage;
-import org.jboss.website.validation.ValidatorUtil;
-
-public class PasswordValidator implements Validator 
-{
-	public void validate(FacesContext context,UIComponent component,Object value)
-	{
-		String password = (String)value;
-		
-		//check the password format
-		boolean isValid = ValidatorUtil.isPasswordValid(password);
-		
-		if(!isValid)
-		{
-			//validator exception, invalid value was submitted
-			FacesMessage message = new FacesBundleMessage("org.jboss.website.jsf.validator.messages");
-			message.setSummary("invalidPasswordFormat");
-			message.setDetail("invalidPasswordFormatDetail");
-			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-			throw new ValidatorException(message);
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/jsf/validator/PasswordValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,32 @@
+package org.jboss.website.jsf.validator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+
+import org.jboss.website.jsf.utils.FacesBundleMessage;
+import org.jboss.website.validation.ValidatorUtil;
+
+public class PasswordValidator implements Validator 
+{
+	public void validate(FacesContext context,UIComponent component,Object value)
+	{
+		String password = (String)value;
+		
+		//check the password format
+		boolean isValid = ValidatorUtil.isPasswordValid(password);
+		
+		if(!isValid)
+		{
+			//validator exception, invalid value was submitted
+			FacesMessage message = new FacesBundleMessage("org.jboss.website.jsf.validator.messages");
+			message.setSummary("invalidPasswordFormat");
+			message.setDetail("invalidPasswordFormatDetail");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			throw new ValidatorException(message);
+		}
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,20 +0,0 @@
-/*****************************************
- *                                       *                                         *
- *   Distributable under LGPL license.   *
- *   See terms of license at gnu.org.    *
- *                                       *
- *****************************************/
-package org.jboss.website.notify;
-
-/**
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public interface NotificationListener 
-{ 
-    /**
-     * 
-     * @param payLoad
-     */
-    public void receiveNotification(PayLoad payLoad);
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/NotificationListener.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,20 @@
+/*****************************************
+ *                                       *                                         *
+ *   Distributable under LGPL license.   *
+ *   See terms of license at gnu.org.    *
+ *                                       *
+ *****************************************/
+package org.jboss.website.notify;
+
+/**
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public interface NotificationListener 
+{ 
+    /**
+     * 
+     * @param payLoad
+     */
+    public void receiveNotification(PayLoad payLoad);
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,16 +0,0 @@
-/*****************************************
- *                                       *                                         *
- *   Distributable under LGPL license.   *
- *   See terms of license at gnu.org.    *
- *                                       *
- *****************************************/
-package org.jboss.website.notify;
-
-/**
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public interface PayLoad 
-{
-
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/PayLoad.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,16 @@
+/*****************************************
+ *                                       *                                         *
+ *   Distributable under LGPL license.   *
+ *   See terms of license at gnu.org.    *
+ *                                       *
+ *****************************************/
+package org.jboss.website.notify;
+
+/**
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public interface PayLoad 
+{
+
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,130 +0,0 @@
-/*****************************************
- *                                       *                                         *
- *   Distributable under LGPL license.   *
- *   See terms of license at gnu.org.    *
- *                                       *
- *****************************************/
-package org.jboss.website.notify;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-
-import org.jboss.website.utils.Util;
-
-/**
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class Registrar 
-{
-    private static Registrar singleton = null;
-    
-    private Map listeners = new HashMap();
-    
-    /**
-     * 
-     *
-     */
-    private Registrar()
-    {        
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static Registrar getInstance()
-    {
-        if(Registrar.singleton==null)
-        {
-            Registrar.singleton = new Registrar();
-        }
-        return Registrar.singleton;
-    }
-    
-    public void register(NotificationListener listener)
-    {
-        listeners.put(listener.getClass().getName(),listener);
-    }
-    
-    public void unregister(NotificationListener listener)
-    {
-        listeners.remove(listener.getClass().getName());
-    }
-    
-    public void sendNotification(PayLoad payLoad)
-    {
-        this.sendNotification(payLoad,0);
-    }
-    
-    /**
-     * 
-     * @param payLoad
-     * @param delay - delay in milliseconds that the notifier should wait before issuing the notifications
-     */
-    public void sendNotification(PayLoad payLoad,long delay)
-    {
-        //for now send notifications on a single thread spawned thread....later this can be made more
-        //efficient by using a group of workers that can divide the task of sending out notifications
-        Worker worker = new Worker(this.listeners.values(),payLoad,delay);
-        worker.start();
-        
-        //also, later the notification process can be optimized by sending notifications to listeners
-        //based on the type of the payload they are interested in. This reduces the number of
-        //notificiations being sent out
-    }
-    
-    /**
-     * 
-     * @author Sohil Shah - sohil.shah at jboss.com - Mar 20, 2006
-     *
-     */
-    private static class Worker extends Thread
-    {
-        /**
-         * 
-         */
-        private Collection listeners = null;
-        private PayLoad payLoad = null;
-        private long delay = 0;
-        
-        /**
-         * 
-         * @param listeners
-         * @param payLoad
-         * @param delay
-         */
-        private Worker(Collection listeners,PayLoad payLoad,long delay)
-        {
-            this.listeners = listeners;
-            this.payLoad = payLoad;
-            this.delay = delay;
-        }
-           
-        /**
-         * 
-         */
-        public void run()
-        {
-            try
-            {
-                Thread.currentThread().sleep(delay);
-            }
-            catch(InterruptedException ie)
-            {
-                //ok if interrupted ahead of time, go ahead and execute the notifications
-            }
-            
-            if(!Util.isEmpty(this.listeners))
-            {
-                for(Iterator itr=this.listeners.iterator();itr.hasNext();)
-                {
-                    NotificationListener listener = (NotificationListener)itr.next();
-                    listener.receiveNotification(this.payLoad);
-                }
-            }
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/Registrar.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,130 @@
+/*****************************************
+ *                                       *                                         *
+ *   Distributable under LGPL license.   *
+ *   See terms of license at gnu.org.    *
+ *                                       *
+ *****************************************/
+package org.jboss.website.notify;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.jboss.website.utils.Util;
+
+/**
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class Registrar 
+{
+    private static Registrar singleton = null;
+    
+    private Map listeners = new HashMap();
+    
+    /**
+     * 
+     *
+     */
+    private Registrar()
+    {        
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static Registrar getInstance()
+    {
+        if(Registrar.singleton==null)
+        {
+            Registrar.singleton = new Registrar();
+        }
+        return Registrar.singleton;
+    }
+    
+    public void register(NotificationListener listener)
+    {
+        listeners.put(listener.getClass().getName(),listener);
+    }
+    
+    public void unregister(NotificationListener listener)
+    {
+        listeners.remove(listener.getClass().getName());
+    }
+    
+    public void sendNotification(PayLoad payLoad)
+    {
+        this.sendNotification(payLoad,0);
+    }
+    
+    /**
+     * 
+     * @param payLoad
+     * @param delay - delay in milliseconds that the notifier should wait before issuing the notifications
+     */
+    public void sendNotification(PayLoad payLoad,long delay)
+    {
+        //for now send notifications on a single thread spawned thread....later this can be made more
+        //efficient by using a group of workers that can divide the task of sending out notifications
+        Worker worker = new Worker(this.listeners.values(),payLoad,delay);
+        worker.start();
+        
+        //also, later the notification process can be optimized by sending notifications to listeners
+        //based on the type of the payload they are interested in. This reduces the number of
+        //notificiations being sent out
+    }
+    
+    /**
+     * 
+     * @author Sohil Shah - sohil.shah at jboss.com - Mar 20, 2006
+     *
+     */
+    private static class Worker extends Thread
+    {
+        /**
+         * 
+         */
+        private Collection listeners = null;
+        private PayLoad payLoad = null;
+        private long delay = 0;
+        
+        /**
+         * 
+         * @param listeners
+         * @param payLoad
+         * @param delay
+         */
+        private Worker(Collection listeners,PayLoad payLoad,long delay)
+        {
+            this.listeners = listeners;
+            this.payLoad = payLoad;
+            this.delay = delay;
+        }
+           
+        /**
+         * 
+         */
+        public void run()
+        {
+            try
+            {
+                Thread.currentThread().sleep(delay);
+            }
+            catch(InterruptedException ie)
+            {
+                //ok if interrupted ahead of time, go ahead and execute the notifications
+            }
+            
+            if(!Util.isEmpty(this.listeners))
+            {
+                for(Iterator itr=this.listeners.iterator();itr.hasNext();)
+                {
+                    NotificationListener listener = (NotificationListener)itr.next();
+                    listener.receiveNotification(this.payLoad);
+                }
+            }
+        }
+    }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,45 +0,0 @@
-/*****************************************
- *                                       *                                         *
- *   Distributable under LGPL license.   *
- *   See terms of license at gnu.org.    *
- *                                       *
- *****************************************/
-package org.jboss.website.notify.cms;
-
-import java.util.Collection;
-import org.jboss.website.notify.PayLoad;
-
-/**
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class UpdatePayLoad implements PayLoad 
-{
-    private Collection files = null;
-    private boolean notifyCluster = true; //cluster notification is turned on by default
-    
-    public UpdatePayLoad()
-    {
-        super();
-    }
-    
-    public Collection getFiles()
-    {
-        return this.files;
-    }
-    
-    public void setFiles(Collection files)
-    {
-        this.files = files;
-    }
-    
-    public boolean isNotifyCluster()
-    {
-    	return this.notifyCluster;
-    }
-    
-    public void setNotifyCluster(boolean notifyCluster)
-    {
-    	this.notifyCluster = notifyCluster;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/notify/cms/UpdatePayLoad.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,45 @@
+/*****************************************
+ *                                       *                                         *
+ *   Distributable under LGPL license.   *
+ *   See terms of license at gnu.org.    *
+ *                                       *
+ *****************************************/
+package org.jboss.website.notify.cms;
+
+import java.util.Collection;
+import org.jboss.website.notify.PayLoad;
+
+/**
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class UpdatePayLoad implements PayLoad 
+{
+    private Collection files = null;
+    private boolean notifyCluster = true; //cluster notification is turned on by default
+    
+    public UpdatePayLoad()
+    {
+        super();
+    }
+    
+    public Collection getFiles()
+    {
+        return this.files;
+    }
+    
+    public void setFiles(Collection files)
+    {
+        this.files = files;
+    }
+    
+    public boolean isNotifyCluster()
+    {
+    	return this.notifyCluster;
+    }
+    
+    public void setNotifyCluster(boolean notifyCluster)
+    {
+    	this.notifyCluster = notifyCluster;
+    }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,146 +0,0 @@
-package org.jboss.website.security.impl;
-
-import java.util.StringTokenizer;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import org.apache.log4j.Logger;
-
-//jboss-acl lib
-import org.jboss.security.acl.AclProcessor;
-import org.jboss.security.acl.AccessDenied;
-
-//jbosswebsite-common lib
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.utils.Util;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class ACLTag extends BodyTagSupport
-{
-    /**
-     * 
-     */
-    private static final Logger log = Logger.getLogger(ACLTag.class);
-    
-    //attributes
-    /**
-     * 
-     */
-    private String fragmentId = null;
-    private String runtimeInfo = null;
-    
-    /**
-     * 
-     *
-     */
-    public ACLTag()
-    {
-        super();
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getFragmentId()
-    {
-        return this.fragmentId;
-    }
-    
-    /**
-     * 
-     * @param fragmentId
-     */
-    public void setFragmentId(String fragmentId)
-    {
-        this.fragmentId = fragmentId;
-    }
-    
-    /**
-     * 
-     * @return
-     */    
-    public String getRuntimeInfo() 
-    {
-        return runtimeInfo;
-    }
-
-    /**
-     * 
-     * @param runtimeInfo
-     */
-    public void setRuntimeInfo(String runtimeInfo) 
-    {
-        this.runtimeInfo = runtimeInfo;
-    }
-
-    /**
-     * 
-     */
-    public int doStartTag() throws JspException
-    {    
-        try
-        {
-            //get the acl user
-            /*HttpServletRequest request = (HttpServletRequest)this.pageContext.getRequest();
-            User aclUser = (User)request.getSession().getAttribute(Constants.ACL_USER);            
-            if(aclUser==null)
-            {
-                String remoteUser = request.getRemoteUser();
-                aclUser = User.getUser(remoteUser);
-                if(aclUser!=null && aclUser.getIdentity()!=null)
-                {
-                    JBossPortalUtil.populateRoles(aclUser);
-                    request.getSession().setAttribute(Constants.ACL_USER,aclUser);
-                }
-                else
-                {
-                    aclUser = null;
-                }
-            }        
-            
-            //usersetup
-            if(aclUser==null)
-            {
-                //this user is anonymous
-                aclUser = new User();
-            }
-            UserThreadLocal.setUser(aclUser);*/
-            
-            //resourcesetup
-            Object[] runtime = null;
-            if(!Util.isEmpty(this.runtimeInfo))
-            {
-                StringTokenizer st = new StringTokenizer(this.runtimeInfo,",");
-                runtime = new Object[st.countTokens()];
-                for(int i=0;i<st.countTokens();i++)
-                {
-                    runtime[i] = st.nextToken();
-                }
-            }
-                        
-            //make the call to the aclprocessor
-            try{JSFUtil.getAclUser();}catch(Exception e){}                        
-            try
-            {
-                AclProcessor.getInstance().processFragmentAccess(this.fragmentId,runtime);
-            }
-            catch(AccessDenied ae)
-            {
-                log.debug("Access Denied...");
-                return BodyTagSupport.SKIP_BODY;
-            }
-            
-            return BodyTagSupport.EVAL_BODY_INCLUDE;
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new JspException(e);
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTag.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,146 @@
+package org.jboss.website.security.impl;
+
+import java.util.StringTokenizer;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.log4j.Logger;
+
+//jboss-acl lib
+import org.jboss.security.acl.AclProcessor;
+import org.jboss.security.acl.AccessDenied;
+
+//jbosswebsite-common lib
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.utils.Util;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class ACLTag extends BodyTagSupport
+{
+    /**
+     * 
+     */
+    private static final Logger log = Logger.getLogger(ACLTag.class);
+    
+    //attributes
+    /**
+     * 
+     */
+    private String fragmentId = null;
+    private String runtimeInfo = null;
+    
+    /**
+     * 
+     *
+     */
+    public ACLTag()
+    {
+        super();
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getFragmentId()
+    {
+        return this.fragmentId;
+    }
+    
+    /**
+     * 
+     * @param fragmentId
+     */
+    public void setFragmentId(String fragmentId)
+    {
+        this.fragmentId = fragmentId;
+    }
+    
+    /**
+     * 
+     * @return
+     */    
+    public String getRuntimeInfo() 
+    {
+        return runtimeInfo;
+    }
+
+    /**
+     * 
+     * @param runtimeInfo
+     */
+    public void setRuntimeInfo(String runtimeInfo) 
+    {
+        this.runtimeInfo = runtimeInfo;
+    }
+
+    /**
+     * 
+     */
+    public int doStartTag() throws JspException
+    {    
+        try
+        {
+            //get the acl user
+            /*HttpServletRequest request = (HttpServletRequest)this.pageContext.getRequest();
+            User aclUser = (User)request.getSession().getAttribute(Constants.ACL_USER);            
+            if(aclUser==null)
+            {
+                String remoteUser = request.getRemoteUser();
+                aclUser = User.getUser(remoteUser);
+                if(aclUser!=null && aclUser.getIdentity()!=null)
+                {
+                    JBossPortalUtil.populateRoles(aclUser);
+                    request.getSession().setAttribute(Constants.ACL_USER,aclUser);
+                }
+                else
+                {
+                    aclUser = null;
+                }
+            }        
+            
+            //usersetup
+            if(aclUser==null)
+            {
+                //this user is anonymous
+                aclUser = new User();
+            }
+            UserThreadLocal.setUser(aclUser);*/
+            
+            //resourcesetup
+            Object[] runtime = null;
+            if(!Util.isEmpty(this.runtimeInfo))
+            {
+                StringTokenizer st = new StringTokenizer(this.runtimeInfo,",");
+                runtime = new Object[st.countTokens()];
+                for(int i=0;i<st.countTokens();i++)
+                {
+                    runtime[i] = st.nextToken();
+                }
+            }
+                        
+            //make the call to the aclprocessor
+            try{JSFUtil.getAclUser();}catch(Exception e){}                        
+            try
+            {
+                AclProcessor.getInstance().processFragmentAccess(this.fragmentId,runtime);
+            }
+            catch(AccessDenied ae)
+            {
+                log.debug("Access Denied...");
+                return BodyTagSupport.SKIP_BODY;
+            }
+            
+            return BodyTagSupport.EVAL_BODY_INCLUDE;
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new JspException(e);
+        }
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,125 +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.website.security.impl;
-
-//core java
-import java.io.IOException;
-import java.util.StringTokenizer;
-
-//servlet
-import javax.el.ELException;
-
-//jsf
-import javax.faces.FacesException; 
-import javax.faces.component.UIComponent;
-
-//logging
-import org.apache.log4j.Logger;
-
-//jboss-acl security
-import org.jboss.security.acl.AccessDenied;
-import org.jboss.security.acl.AclProcessor;
-
-//facelets
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.tag.TagConfig;
-import com.sun.facelets.tag.TagHandler;
-import com.sun.facelets.tag.TagAttribute;
-
-//jboss-common
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.utils.Util;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 29, 2006
- *
- */
-public class ACLTagHandler extends TagHandler 
-{
-    /**
-     * 
-     */
-    private static final Logger log = Logger.getLogger(ACLTagHandler.class);
-    
-    //possible attributes
-    private TagAttribute fragmentId = null; //required
-    private TagAttribute runtimeInfo = null; //optional
-
-    /**
-     * @param config
-     */
-    public ACLTagHandler(TagConfig config) 
-    {
-        super(config);
-        
-        // helper method for getting a required attribute
-        this.fragmentId = this.getRequiredAttribute("fragmentId");
-        
-        // helper method, optional attribute
-        this.runtimeInfo = this.getAttribute("runtimeInfo");
-    }
-
-    /**
-     * Threadsafe Method for controlling evaluation of
-     * its child tags, represented by "nextHandler"
-     */
-    public void apply(FaceletContext ctx, UIComponent parent)
-    throws IOException,FacesException,ELException 
-    {
-        String resource = this.fragmentId.getValue();
-        String runtimeData = null;
-        
-        if(this.runtimeInfo!=null)
-        {
-            runtimeData = this.runtimeInfo.getValue();
-        }
-        
-        //resourcesetup
-        Object[] runtime = null;
-        if(!Util.isEmpty(runtimeData))
-        {
-            StringTokenizer st = new StringTokenizer(runtimeData,",");
-            runtime = new Object[st.countTokens()];
-            for(int i=0;i<st.countTokens();i++)
-            {
-                runtime[i] = st.nextToken();
-            }
-        }
-                    
-        //make the call to the aclprocessor
-        //make sure the subject is available in the thread
-        try{JSFUtil.getAclUser();}catch(Exception e){}
-        try
-        {
-            AclProcessor.getInstance().processFragmentAccess(resource,runtime);
-        }
-        catch(AccessDenied ae)
-        {
-            log.debug("Access Denied...");
-            return;
-        }
-        
-                
-        this.nextHandler.apply(ctx, parent);
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/ACLTagHandler.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,125 @@
+/*
+* 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.website.security.impl;
+
+//core java
+import java.io.IOException;
+import java.util.StringTokenizer;
+
+//servlet
+import javax.el.ELException;
+
+//jsf
+import javax.faces.FacesException; 
+import javax.faces.component.UIComponent;
+
+//logging
+import org.apache.log4j.Logger;
+
+//jboss-acl security
+import org.jboss.security.acl.AccessDenied;
+import org.jboss.security.acl.AclProcessor;
+
+//facelets
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.tag.TagConfig;
+import com.sun.facelets.tag.TagHandler;
+import com.sun.facelets.tag.TagAttribute;
+
+//jboss-common
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.utils.Util;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 29, 2006
+ *
+ */
+public class ACLTagHandler extends TagHandler 
+{
+    /**
+     * 
+     */
+    private static final Logger log = Logger.getLogger(ACLTagHandler.class);
+    
+    //possible attributes
+    private TagAttribute fragmentId = null; //required
+    private TagAttribute runtimeInfo = null; //optional
+
+    /**
+     * @param config
+     */
+    public ACLTagHandler(TagConfig config) 
+    {
+        super(config);
+        
+        // helper method for getting a required attribute
+        this.fragmentId = this.getRequiredAttribute("fragmentId");
+        
+        // helper method, optional attribute
+        this.runtimeInfo = this.getAttribute("runtimeInfo");
+    }
+
+    /**
+     * Threadsafe Method for controlling evaluation of
+     * its child tags, represented by "nextHandler"
+     */
+    public void apply(FaceletContext ctx, UIComponent parent)
+    throws IOException,FacesException,ELException 
+    {
+        String resource = this.fragmentId.getValue();
+        String runtimeData = null;
+        
+        if(this.runtimeInfo!=null)
+        {
+            runtimeData = this.runtimeInfo.getValue();
+        }
+        
+        //resourcesetup
+        Object[] runtime = null;
+        if(!Util.isEmpty(runtimeData))
+        {
+            StringTokenizer st = new StringTokenizer(runtimeData,",");
+            runtime = new Object[st.countTokens()];
+            for(int i=0;i<st.countTokens();i++)
+            {
+                runtime[i] = st.nextToken();
+            }
+        }
+                    
+        //make the call to the aclprocessor
+        //make sure the subject is available in the thread
+        try{JSFUtil.getAclUser();}catch(Exception e){}
+        try
+        {
+            AclProcessor.getInstance().processFragmentAccess(resource,runtime);
+        }
+        catch(AccessDenied ae)
+        {
+            log.debug("Access Denied...");
+            return;
+        }
+        
+                
+        this.nextHandler.apply(ctx, parent);
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,98 +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.website.security.impl;
-
-import java.util.Collection;
-
-import org.apache.log4j.Logger;
-import org.jboss.security.acl.AccessDenied;
-import org.jboss.security.acl.AclProcessor;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.utils.Util;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Oct 20, 2006
- *
- */
-public class AclHelper 
-{
-    /**
-     * 
-     */
-    private static final Logger log = Logger.getLogger(AclHelper.class);
-    private static AclHelper singleton = null;
-
-    /**
-     * 
-     *
-     */
-    private AclHelper() 
-    {
-        super();
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public static AclHelper getInstance()
-    {
-       if(AclHelper.singleton == null)
-       {
-           AclHelper.singleton = new AclHelper();
-       }
-       return AclHelper.singleton;
-    }
-    
-    /**
-     * 
-     * @param resource
-     * @param fragmentId
-     * @return
-     */
-    public boolean isAllowed(String fragmentId,Collection runtimeInfo)
-    {
-        boolean isAllowed = false;
-        
-        //make the call to the aclprocessor
-        //make sure the subject is available in the thread
-        try{JSFUtil.getAclUser();}catch(Exception e){}
-        try
-        {
-            Object[] runtime = null;
-            if(!Util.isEmpty(runtimeInfo))
-            {
-                runtime = runtimeInfo.toArray();
-            }
-            AclProcessor.getInstance().processFragmentAccess(fragmentId,runtime);
-            isAllowed = true;
-        }
-        catch(AccessDenied ae)
-        {
-            log.debug("Access Denied...");
-            isAllowed = false;
-        }
-        
-        return isAllowed;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/security/impl/AclHelper.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,98 @@
+/*
+* 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.website.security.impl;
+
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import org.jboss.security.acl.AccessDenied;
+import org.jboss.security.acl.AclProcessor;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.utils.Util;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Oct 20, 2006
+ *
+ */
+public class AclHelper 
+{
+    /**
+     * 
+     */
+    private static final Logger log = Logger.getLogger(AclHelper.class);
+    private static AclHelper singleton = null;
+
+    /**
+     * 
+     *
+     */
+    private AclHelper() 
+    {
+        super();
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public static AclHelper getInstance()
+    {
+       if(AclHelper.singleton == null)
+       {
+           AclHelper.singleton = new AclHelper();
+       }
+       return AclHelper.singleton;
+    }
+    
+    /**
+     * 
+     * @param resource
+     * @param fragmentId
+     * @return
+     */
+    public boolean isAllowed(String fragmentId,Collection runtimeInfo)
+    {
+        boolean isAllowed = false;
+        
+        //make the call to the aclprocessor
+        //make sure the subject is available in the thread
+        try{JSFUtil.getAclUser();}catch(Exception e){}
+        try
+        {
+            Object[] runtime = null;
+            if(!Util.isEmpty(runtimeInfo))
+            {
+                runtime = runtimeInfo.toArray();
+            }
+            AclProcessor.getInstance().processFragmentAccess(fragmentId,runtime);
+            isAllowed = true;
+        }
+        catch(AccessDenied ae)
+        {
+            log.debug("Access Denied...");
+            isAllowed = false;
+        }
+        
+        return isAllowed;
+    }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,84 +0,0 @@
-package org.jboss.website.service;
-
-import java.util.Map;
-import java.util.HashMap;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.NameNotFoundException;
-
-public abstract class DomainService
-{
-   private static Map<String, Service> serviceMap = new HashMap<String, Service>();
-
-   protected DomainService()
-   {
-   }
-
-   /**
-    * This method resets all the local EJB3 proxies cached in the memory
-    * 
-    * @throws ServiceException
-    */
-   public static void reset() throws ServiceException
-   {
-      DomainService.serviceMap = new HashMap<String, Service>();
-   }
-
-   /**
-    * Looks up EJB3 based services in JNDI. A localCache is used to prevent a
-    * JNDI lookup once a service has been found. The method tries to find a
-    * local proxy first followed by a remote proxy
-    * 
-    * @param name
-    * @return Service
-    * @throws ServiceException
-    */
-   public static Service getService(String name) throws ServiceException
-   {
-      try
-      {
-         Service service = null;
-         
-         int index = name.lastIndexOf('.');
-         name = name.substring(index+1);
-         name += "Impl";
-
-         String localName = name + "/local";
-         String remoteName = name + "/remote";
-
-         if ((service = serviceMap.get(localName)) != null
-               || (service = serviceMap.get(remoteName)) != null)
-         {
-            return service;
-         }
-         else
-         {
-            InitialContext ctx = new InitialContext();
-            try
-            {
-               service = (Service) ctx.lookup(localName);
-               serviceMap.put(localName, service);
-            }
-            catch (NameNotFoundException nfe)
-            {
-               try
-               {
-                  // try to grab a remote interface
-                  service = (Service) ctx.lookup(remoteName);
-                  serviceMap.put(remoteName, service);
-               }
-               catch (NameNotFoundException nfe2)
-               {
-                  service = null;
-               }
-            }
-            return service;
-         }
-      }
-      catch (NamingException nme)
-      {
-         throw new ServiceException(nme);
-      }
-   }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/DomainService.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,84 @@
+package org.jboss.website.service;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.NameNotFoundException;
+
+public abstract class DomainService
+{
+   private static Map<String, Service> serviceMap = new HashMap<String, Service>();
+
+   protected DomainService()
+   {
+   }
+
+   /**
+    * This method resets all the local EJB3 proxies cached in the memory
+    * 
+    * @throws ServiceException
+    */
+   public static void reset() throws ServiceException
+   {
+      DomainService.serviceMap = new HashMap<String, Service>();
+   }
+
+   /**
+    * Looks up EJB3 based services in JNDI. A localCache is used to prevent a
+    * JNDI lookup once a service has been found. The method tries to find a
+    * local proxy first followed by a remote proxy
+    * 
+    * @param name
+    * @return Service
+    * @throws ServiceException
+    */
+   public static Service getService(String name) throws ServiceException
+   {
+      try
+      {
+         Service service = null;
+         
+         int index = name.lastIndexOf('.');
+         name = name.substring(index+1);
+         name += "Impl";
+
+         String localName = name + "/local";
+         String remoteName = name + "/remote";
+
+         if ((service = serviceMap.get(localName)) != null
+               || (service = serviceMap.get(remoteName)) != null)
+         {
+            return service;
+         }
+         else
+         {
+            InitialContext ctx = new InitialContext();
+            try
+            {
+               service = (Service) ctx.lookup(localName);
+               serviceMap.put(localName, service);
+            }
+            catch (NameNotFoundException nfe)
+            {
+               try
+               {
+                  // try to grab a remote interface
+                  service = (Service) ctx.lookup(remoteName);
+                  serviceMap.put(remoteName, service);
+               }
+               catch (NameNotFoundException nfe2)
+               {
+                  service = null;
+               }
+            }
+            return service;
+         }
+      }
+      catch (NamingException nme)
+      {
+         throw new ServiceException(nme);
+      }
+   }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,6 +0,0 @@
-package org.jboss.website.service;
-
-public interface Service 
-{
-
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/Service.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,6 @@
+package org.jboss.website.service;
+
+public interface Service 
+{
+
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,20 +0,0 @@
-package org.jboss.website.service;
-
-
-public class ServiceException extends Exception 
-{
-	public ServiceException()
-	{
-		this("");
-	}
-	
-	public ServiceException(String exception)
-	{
-		super(exception);
-	}
-	
-	public ServiceException(Exception exception)
-	{
-		super(exception);
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/ServiceException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,20 @@
+package org.jboss.website.service;
+
+
+public class ServiceException extends Exception 
+{
+	public ServiceException()
+	{
+		this("");
+	}
+	
+	public ServiceException(String exception)
+	{
+		super(exception);
+	}
+	
+	public ServiceException(Exception exception)
+	{
+		super(exception);
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,12 +0,0 @@
-package org.jboss.website.service.mail;
-
-import java.io.Serializable;
-import org.apache.commons.mail.HtmlEmail;
-
-public class Email extends HtmlEmail implements Serializable
-{
-	public Email()
-	{
-		super();
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/Email.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,12 @@
+package org.jboss.website.service.mail;
+
+import java.io.Serializable;
+import org.apache.commons.mail.HtmlEmail;
+
+public class Email extends HtmlEmail implements Serializable
+{
+	public Email()
+	{
+		super();
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,27 +0,0 @@
-package org.jboss.website.service.mail;
-
-import org.apache.commons.mail.EmailException;
-
-public class MailException extends Exception
-{
-	private EmailException emailException = null;
-	
-	public MailException(String ex)
-	{
-		super(ex);
-	}
-	
-	public MailException()
-	{
-		this("");
-	}
-	
-	public MailException(Exception e)
-	{
-		super(e);
-		if(e instanceof EmailException)
-		{
-			this.emailException = (EmailException)e;
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,27 @@
+package org.jboss.website.service.mail;
+
+import org.apache.commons.mail.EmailException;
+
+public class MailException extends Exception
+{
+	private EmailException emailException = null;
+	
+	public MailException(String ex)
+	{
+		super(ex);
+	}
+	
+	public MailException()
+	{
+		this("");
+	}
+	
+	public MailException(Exception e)
+	{
+		super(e);
+		if(e instanceof EmailException)
+		{
+			this.emailException = (EmailException)e;
+		}
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,9 +0,0 @@
-package org.jboss.website.service.mail;
-
-import org.jboss.website.service.Service;
-
-public interface MailManager extends Service 
-{
-	public void send(Email email) throws MailException;
-	public void send(String from,String to,String subject,String body) throws MailException;
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManager.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,9 @@
+package org.jboss.website.service.mail;
+
+import org.jboss.website.service.Service;
+
+public interface MailManager extends Service 
+{
+	public void send(Email email) throws MailException;
+	public void send(String from,String to,String subject,String body) throws MailException;
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,126 +0,0 @@
-package org.jboss.website.service.mail;
-
-import org.apache.log4j.Logger;
-
-import org.apache.commons.mail.EmailException;
-
-import org.jboss.website.config.Configuration;
-import org.jboss.website.config.Component;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.utils.Util;
-
-public class MailManagerImpl extends DomainService implements MailManager 
-{
-	private static final Logger log = Logger.getLogger(MailManagerImpl.class);
-	private static MailManagerImpl singleton = null;
-	
-	private Component myConfig = null;
-	private String smtpServer = null;
-	private String smtpPort = null;
-	private String smtpUser = null;
-	private String smtpPassword = null;
-	
-	private MailManagerImpl()
-	{
-		super();
-		
-		//load the configuration for this component
-		this.myConfig = Configuration.getComponent(this);
-		this.smtpServer = this.myConfig.getProperty("smtpServer"); //required information
-		this.smtpPort = this.myConfig.getProperty("smtpPort"); //optional, uses the default SMTP port
-		this.smtpUser = this.myConfig.getProperty("smtpUser"); //optional
-		this.smtpPassword = this.myConfig.getProperty("smtpPassword"); //optional
-		
-		//setup the proper state of this object
-		if(Util.isEmpty(this.smtpServer))
-		{
-			this.smtpServer = "localhost";
-		}
-		if(Util.isEmpty(this.smtpPort))
-		{
-			this.smtpPort = null;
-		}
-		if(Util.isEmpty(this.smtpUser))
-		{
-			this.smtpUser = null;
-			this.smtpPassword = null;
-		}
-	}
-	
-	public static MailManagerImpl getInstance()
-	{
-		if(MailManagerImpl.singleton==null)
-		{
-			MailManagerImpl.singleton = new MailManagerImpl();
-		}
-		return MailManagerImpl.singleton;
-	}
-	
-	public void send(String from,String to,String subject,String body) throws MailException
-	{
-		try
-		{
-			Email email = new Email();
-			email.setFrom(from);
-			email.addTo(to);
-			email.setSubject(subject);
-			email.setMsg(body);
-			this.send(email);
-		}
-		catch(EmailException me)
-		{
-			throw new MailException(me);
-		}
-	}
-	
-	public void send(Email email) throws MailException
-	{
-		//send out the email asynchronously
-		MailDeliveryDaemon daemon = new MailDeliveryDaemon(this,email);
-		Thread t = new Thread(daemon);
-		t.start();
-	}
-	
-	private static class MailDeliveryDaemon implements Runnable
-	{
-		private Email email = null;
-		private MailManagerImpl mailManager = null;
-		
-		private MailDeliveryDaemon(MailManagerImpl mailManager,Email email)
-		{
-			this.mailManager = mailManager;
-			this.email = email;
-		}
-		
-		public void run()
-		{
-			try
-			{
-				this.email.setHostName(this.mailManager.smtpServer);
-				
-				//set the smtp port if specified
-				if(!Util.isEmpty(this.mailManager.smtpPort))
-				{
-					this.email.setSmtpPort(Integer.parseInt(this.mailManager.smtpPort));
-				}
-				
-				//set the smtp username and password if specified
-				if(!Util.isEmpty(this.mailManager.smtpUser))
-				{
-					this.email.setAuthentication(this.mailManager.smtpUser,this.mailManager.smtpPassword);
-				}
-				
-				//set the debug property
-				String debug = mailManager.myConfig.getProperty("debug");
-				this.email.setDebug(Boolean.parseBoolean(debug));
-				
-				//send the email
-				this.email.send();
-			}
-			catch(EmailException me)
-			{
-				log.error(this,me);
-			}
-		}
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/service/mail/MailManagerImpl.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,126 @@
+package org.jboss.website.service.mail;
+
+import org.apache.log4j.Logger;
+
+import org.apache.commons.mail.EmailException;
+
+import org.jboss.website.config.Configuration;
+import org.jboss.website.config.Component;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.utils.Util;
+
+public class MailManagerImpl extends DomainService implements MailManager 
+{
+	private static final Logger log = Logger.getLogger(MailManagerImpl.class);
+	private static MailManagerImpl singleton = null;
+	
+	private Component myConfig = null;
+	private String smtpServer = null;
+	private String smtpPort = null;
+	private String smtpUser = null;
+	private String smtpPassword = null;
+	
+	private MailManagerImpl()
+	{
+		super();
+		
+		//load the configuration for this component
+		this.myConfig = Configuration.getComponent(this);
+		this.smtpServer = this.myConfig.getProperty("smtpServer"); //required information
+		this.smtpPort = this.myConfig.getProperty("smtpPort"); //optional, uses the default SMTP port
+		this.smtpUser = this.myConfig.getProperty("smtpUser"); //optional
+		this.smtpPassword = this.myConfig.getProperty("smtpPassword"); //optional
+		
+		//setup the proper state of this object
+		if(Util.isEmpty(this.smtpServer))
+		{
+			this.smtpServer = "localhost";
+		}
+		if(Util.isEmpty(this.smtpPort))
+		{
+			this.smtpPort = null;
+		}
+		if(Util.isEmpty(this.smtpUser))
+		{
+			this.smtpUser = null;
+			this.smtpPassword = null;
+		}
+	}
+	
+	public static MailManagerImpl getInstance()
+	{
+		if(MailManagerImpl.singleton==null)
+		{
+			MailManagerImpl.singleton = new MailManagerImpl();
+		}
+		return MailManagerImpl.singleton;
+	}
+	
+	public void send(String from,String to,String subject,String body) throws MailException
+	{
+		try
+		{
+			Email email = new Email();
+			email.setFrom(from);
+			email.addTo(to);
+			email.setSubject(subject);
+			email.setMsg(body);
+			this.send(email);
+		}
+		catch(EmailException me)
+		{
+			throw new MailException(me);
+		}
+	}
+	
+	public void send(Email email) throws MailException
+	{
+		//send out the email asynchronously
+		MailDeliveryDaemon daemon = new MailDeliveryDaemon(this,email);
+		Thread t = new Thread(daemon);
+		t.start();
+	}
+	
+	private static class MailDeliveryDaemon implements Runnable
+	{
+		private Email email = null;
+		private MailManagerImpl mailManager = null;
+		
+		private MailDeliveryDaemon(MailManagerImpl mailManager,Email email)
+		{
+			this.mailManager = mailManager;
+			this.email = email;
+		}
+		
+		public void run()
+		{
+			try
+			{
+				this.email.setHostName(this.mailManager.smtpServer);
+				
+				//set the smtp port if specified
+				if(!Util.isEmpty(this.mailManager.smtpPort))
+				{
+					this.email.setSmtpPort(Integer.parseInt(this.mailManager.smtpPort));
+				}
+				
+				//set the smtp username and password if specified
+				if(!Util.isEmpty(this.mailManager.smtpUser))
+				{
+					this.email.setAuthentication(this.mailManager.smtpUser,this.mailManager.smtpPassword);
+				}
+				
+				//set the debug property
+				String debug = mailManager.myConfig.getProperty("debug");
+				this.email.setDebug(Boolean.parseBoolean(debug));
+				
+				//send the email
+				this.email.send();
+			}
+			catch(EmailException me)
+			{
+				log.error(this,me);
+			}
+		}
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,19 +0,0 @@
-package org.jboss.website.utils;
-
-/**
- * Includes site wide constants
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public interface Constants 
-{
-    //session keys
-    public static final String ACL_USER = "aclUser";
-    
-    
-    //common jsf navigation constants
-    public static final String NO_AUTH = "noauth";
-    
-    //fragment ids for portions of the UI (html snippets) that are subject to role-based security protection
-    public static final String FRAGMENT_MANAGE_ROLES_LINK = "acl://manageRolesLink";
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Constants.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,19 @@
+package org.jboss.website.utils;
+
+/**
+ * Includes site wide constants
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public interface Constants 
+{
+    //session keys
+    public static final String ACL_USER = "aclUser";
+    
+    
+    //common jsf navigation constants
+    public static final String NO_AUTH = "noauth";
+    
+    //fragment ids for portions of the UI (html snippets) that are subject to role-based security protection
+    public static final String FRAGMENT_MANAGE_ROLES_LINK = "acl://manageRolesLink";
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,123 +0,0 @@
-package org.jboss.website.utils;
-
-import java.net.URI;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class HttpUtils 
-{
-	/**
-     * TODO: eventually roll this method into a utility package accessible globally to all the application components
-     * 
-     * extracts a relativeURL from an absoluteURL.
-     * @param absoluteURL
-     * @return
-     */
-    public static String getRelativeURL(String absoluteURL)
-    {        
-        String relativeURL = null;
-          
-        URI uri = URI.create(absoluteURL);
-        String query = uri.getRawQuery();
-        
-        if(query==null || query.trim().length()==0)
-        {
-            relativeURL = uri.getRawPath();
-        }
-        else
-        {
-            relativeURL = uri.getRawPath()+"?"+query;
-        }
-        
-        //make sure relativeURL value is not null, if null return an empty string
-        if(relativeURL==null)
-        {
-            relativeURL = "";
-        }        
-        return relativeURL;
-    }
-    
-    /**
-     * 
-     * @param request
-     * @param securePort
-     * @return
-     */
-    public static String getSecureURL(HttpServletRequest request,int securePort)
-    {
-       String secureURL = null;
-       
-       String serverName = request.getServerName();
-       
-       if(securePort!=443)
-       {
-           secureURL = "https://"+serverName+":"+securePort;
-       }
-       else
-       {
-           secureURL = "https://"+serverName;
-       }
-       
-       return secureURL;
-    }
-    
-    /**
-     * 
-     * @param request
-     * @return
-     */
-    public static String getSecureURL(HttpServletRequest request)
-    {
-        return HttpUtils.getSecureURL(request,443);
-    }
-    
-    /**
-     * 
-     * @param request
-     * @param port
-     * @return
-     */
-    public static String getPlainURL(HttpServletRequest request,int port)
-    {
-       String plainURL = null;
-       
-       String serverName = request.getServerName();
-       
-       if(port!=80)
-       {
-           plainURL = "http://"+serverName+":"+port;
-       }
-       else
-       {
-           plainURL = "http://"+serverName;
-       }
-       
-       return plainURL;
-    }
-    
-    /**
-     * 
-     * @param request
-     * @return
-     */
-    public static String getPlainURL(HttpServletRequest request)
-    {
-        return HttpUtils.getPlainURL(request,80);
-    }
-    
-    /**
-     * 
-     * @param response
-     */
-    public static void disableCaching(HttpServletResponse response)
-    {
-        response.setHeader("Cache-Control","no-cache");
-        response.setHeader("Pragma","no-cache");
-        response.setDateHeader ("Expires", 0);
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/HttpUtils.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,123 @@
+package org.jboss.website.utils;
+
+import java.net.URI;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class HttpUtils 
+{
+	/**
+     * TODO: eventually roll this method into a utility package accessible globally to all the application components
+     * 
+     * extracts a relativeURL from an absoluteURL.
+     * @param absoluteURL
+     * @return
+     */
+    public static String getRelativeURL(String absoluteURL)
+    {        
+        String relativeURL = null;
+          
+        URI uri = URI.create(absoluteURL);
+        String query = uri.getRawQuery();
+        
+        if(query==null || query.trim().length()==0)
+        {
+            relativeURL = uri.getRawPath();
+        }
+        else
+        {
+            relativeURL = uri.getRawPath()+"?"+query;
+        }
+        
+        //make sure relativeURL value is not null, if null return an empty string
+        if(relativeURL==null)
+        {
+            relativeURL = "";
+        }        
+        return relativeURL;
+    }
+    
+    /**
+     * 
+     * @param request
+     * @param securePort
+     * @return
+     */
+    public static String getSecureURL(HttpServletRequest request,int securePort)
+    {
+       String secureURL = null;
+       
+       String serverName = request.getServerName();
+       
+       if(securePort!=443)
+       {
+           secureURL = "https://"+serverName+":"+securePort;
+       }
+       else
+       {
+           secureURL = "https://"+serverName;
+       }
+       
+       return secureURL;
+    }
+    
+    /**
+     * 
+     * @param request
+     * @return
+     */
+    public static String getSecureURL(HttpServletRequest request)
+    {
+        return HttpUtils.getSecureURL(request,443);
+    }
+    
+    /**
+     * 
+     * @param request
+     * @param port
+     * @return
+     */
+    public static String getPlainURL(HttpServletRequest request,int port)
+    {
+       String plainURL = null;
+       
+       String serverName = request.getServerName();
+       
+       if(port!=80)
+       {
+           plainURL = "http://"+serverName+":"+port;
+       }
+       else
+       {
+           plainURL = "http://"+serverName;
+       }
+       
+       return plainURL;
+    }
+    
+    /**
+     * 
+     * @param request
+     * @return
+     */
+    public static String getPlainURL(HttpServletRequest request)
+    {
+        return HttpUtils.getPlainURL(request,80);
+    }
+    
+    /**
+     * 
+     * @param response
+     */
+    public static void disableCaching(HttpServletResponse response)
+    {
+        response.setHeader("Cache-Control","no-cache");
+        response.setHeader("Pragma","no-cache");
+        response.setDateHeader ("Expires", 0);
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,48 +0,0 @@
-package org.jboss.website.utils;
-
-//core java
-import java.util.Locale;
-
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class JBossPortalUtil 
-{    
-    /**
-     * 
-     */
-    private static ThreadLocal local = new ThreadLocal();
-    
-    /**
-     * 
-     * @param request
-     * @throws Exception
-     */
-    public static void setUserLocale(PortletRequest request)
-    {
-        Locale userLocale = request.getLocale();
-        
-        //set this up into userlocale
-        JBossPortalUtil.local.set(userLocale); 
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static Locale getUserLocale()
-    {
-        Locale userLocale = null;
-        
-        userLocale = (Locale)JBossPortalUtil.local.get();
-        
-        return userLocale;
-    }        
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JBossPortalUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,48 @@
+package org.jboss.website.utils;
+
+//core java
+import java.util.Locale;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class JBossPortalUtil 
+{    
+    /**
+     * 
+     */
+    private static ThreadLocal local = new ThreadLocal();
+    
+    /**
+     * 
+     * @param request
+     * @throws Exception
+     */
+    public static void setUserLocale(PortletRequest request)
+    {
+        Locale userLocale = request.getLocale();
+        
+        //set this up into userlocale
+        JBossPortalUtil.local.set(userLocale); 
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static Locale getUserLocale()
+    {
+        Locale userLocale = null;
+        
+        userLocale = (Locale)JBossPortalUtil.local.get();
+        
+        return userLocale;
+    }        
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,149 +0,0 @@
-/**
- * 
- */
-package org.jboss.website.utils;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.apache.log4j.Logger;
-
-/**
- * @author soshah
- *
- */
-public class JarResources implements Resources
-{
-	private static Logger log = Logger.getLogger(JarResources.class);
-	
-	private String resources = null;
-	
-	//resourceBundles...these are updated at runtime as their corresponding files are updated in the CMS
-	private Map<String,ResourceBundle> bundles = null;
-	
-	/**
-	 * 
-	 *
-	 */
-	public JarResources()
-	{
-		
-	}
-	
-	/**
-	 * 
-	 *
-	 */
-	public void start()
-	{
-		try
-		{			
-			//load the resource bundles
-			this.bundles = new HashMap<String,ResourceBundle>();
-			this.loadResources();
-			
-			log.info("------------------------");
-			log.info("JarResources successfully started....."+this.resources);
-			log.info("------------------------");
-		}
-		catch(Exception e)
-		{
-			this.stop();
-			throw new RuntimeException(e);
-		}
-	}
-	
-	/**
-	 * 
-	 *
-	 */
-	public void stop()
-	{
-		this.resources = null;
-		this.bundles = null;
-	}
-	
-	/**
-	 * 
-	 * @return
-	 */
-	public String getResources()
-	{
-		return this.resources;
-	}
-	
-	/**
-	 * 
-	 * @param resources
-	 */
-	public void setResources(String resources)
-	{
-		this.resources = resources;
-	}	
-	//----------Resources interface-------------------------------------------------------------------------------------------------------------------------------
-	/**
-     * 
-     * @param bundleName
-     * @param key
-     * @return
-	 */
-	public String getString(String bundleName,String key)
-	{
-		String value = null;
-		
-		ResourceBundle bundle = this.bundles.get(bundleName);
-		
-		value = bundle.getString(key);
-		
-		return value;
-	}
-	
-    /**
-     * 
-     * @param bundleName
-     * @param key
-     * @param input
-     * @return
-     */
-	public String getString(String bundleName,String key,Object[] input)
-	{
-		String value = null;
-		
-		ResourceBundle bundle = this.bundles.get(bundleName);
-		
-		value = bundle.getString(key);
-		
-		value = MessageFormat.format(value,input);
-		
-		return value;
-	}
-	//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-	/**
-     * 
-     *
-     */
-	private void loadResources() throws IOException
-	{				
-		StringTokenizer st = new StringTokenizer(this.resources,",");
-		while(st.hasMoreTokens())
-		{
-			String resource = st.nextToken();	
-            this.loadBundle(resource);
-		}
-	}
-    
-    /**
-     * 
-     * @param resource
-     */
-    private void loadBundle(String resource) throws IOException
-    {        
-    	//load the bundle into the factory
-        ResourceBundle bundle = ResourceBundle.getBundle(resource);
-        this.bundles.put(resource,bundle);
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/JarResources.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,149 @@
+/**
+ * 
+ */
+package org.jboss.website.utils;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author soshah
+ *
+ */
+public class JarResources implements Resources
+{
+	private static Logger log = Logger.getLogger(JarResources.class);
+	
+	private String resources = null;
+	
+	//resourceBundles...these are updated at runtime as their corresponding files are updated in the CMS
+	private Map<String,ResourceBundle> bundles = null;
+	
+	/**
+	 * 
+	 *
+	 */
+	public JarResources()
+	{
+		
+	}
+	
+	/**
+	 * 
+	 *
+	 */
+	public void start()
+	{
+		try
+		{			
+			//load the resource bundles
+			this.bundles = new HashMap<String,ResourceBundle>();
+			this.loadResources();
+			
+			log.info("------------------------");
+			log.info("JarResources successfully started....."+this.resources);
+			log.info("------------------------");
+		}
+		catch(Exception e)
+		{
+			this.stop();
+			throw new RuntimeException(e);
+		}
+	}
+	
+	/**
+	 * 
+	 *
+	 */
+	public void stop()
+	{
+		this.resources = null;
+		this.bundles = null;
+	}
+	
+	/**
+	 * 
+	 * @return
+	 */
+	public String getResources()
+	{
+		return this.resources;
+	}
+	
+	/**
+	 * 
+	 * @param resources
+	 */
+	public void setResources(String resources)
+	{
+		this.resources = resources;
+	}	
+	//----------Resources interface-------------------------------------------------------------------------------------------------------------------------------
+	/**
+     * 
+     * @param bundleName
+     * @param key
+     * @return
+	 */
+	public String getString(String bundleName,String key)
+	{
+		String value = null;
+		
+		ResourceBundle bundle = this.bundles.get(bundleName);
+		
+		value = bundle.getString(key);
+		
+		return value;
+	}
+	
+    /**
+     * 
+     * @param bundleName
+     * @param key
+     * @param input
+     * @return
+     */
+	public String getString(String bundleName,String key,Object[] input)
+	{
+		String value = null;
+		
+		ResourceBundle bundle = this.bundles.get(bundleName);
+		
+		value = bundle.getString(key);
+		
+		value = MessageFormat.format(value,input);
+		
+		return value;
+	}
+	//-------------------------------------------------------------------------------------------------------------------------------------------------------------
+	/**
+     * 
+     *
+     */
+	private void loadResources() throws IOException
+	{				
+		StringTokenizer st = new StringTokenizer(this.resources,",");
+		while(st.hasMoreTokens())
+		{
+			String resource = st.nextToken();	
+            this.loadBundle(resource);
+		}
+	}
+    
+    /**
+     * 
+     * @param resource
+     */
+    private void loadBundle(String resource) throws IOException
+    {        
+    	//load the bundle into the factory
+        ResourceBundle bundle = ResourceBundle.getBundle(resource);
+        this.bundles.put(resource,bundle);
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,20 +0,0 @@
-package org.jboss.website.utils;
-
-
-public class ResourceFactory
-{			
-    /**
-     * 
-     */
-    public static Resources getResources()
-    {
-    	try
-    	{
-    		return (Resources)ServiceUtil.getService("jbwebsite:service=Resources", Resources.class);
-    	}
-    	catch(Exception e)
-    	{
-    		throw new RuntimeException(e);
-    	}
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ResourceFactory.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,20 @@
+package org.jboss.website.utils;
+
+
+public class ResourceFactory
+{			
+    /**
+     * 
+     */
+    public static Resources getResources()
+    {
+    	try
+    	{
+    		return (Resources)ServiceUtil.getService("jbwebsite:service=Resources", Resources.class);
+    	}
+    	catch(Exception e)
+    	{
+    		throw new RuntimeException(e);
+    	}
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,28 +0,0 @@
-/**
- * 
- */
-package org.jboss.website.utils;
-
-/**
- * @author soshah
- *
- */
-public interface Resources 
-{
-	/**
-     * 
-     * @param bundleName
-     * @param key
-     * @return
-	 */
-	public String getString(String bundleName,String key);
-	
-	/**
-     * 
-     * @param bundleName
-     * @param key
-     * @param input
-     * @return
-     */
-	public String getString(String bundleName,String key,Object[] input);
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Resources.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,28 @@
+/**
+ * 
+ */
+package org.jboss.website.utils;
+
+/**
+ * @author soshah
+ *
+ */
+public interface Resources 
+{
+	/**
+     * 
+     * @param bundleName
+     * @param key
+     * @return
+	 */
+	public String getString(String bundleName,String key);
+	
+	/**
+     * 
+     * @param bundleName
+     * @param key
+     * @param input
+     * @return
+     */
+	public String getString(String bundleName,String key,Object[] input);
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,29 +0,0 @@
-package org.jboss.website.utils;
-
-//jmx related
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanServerLocator;
-
-
-public class ServiceUtil 
-{    
-    /**
-     * a generic method to lookup any registered JMX service
-     * 
-     * @param serviceId
-     * @param serviceClass
-     * @return
-     * @throws Exception
-     */
-    public static Object getService(String serviceId,Class serviceClass) throws Exception
-    {
-        Object service = null;
-        
-        MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
-        service = MBeanProxy.get(serviceClass,new ObjectName(serviceId),mbeanServer);
-        
-        return service;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/ServiceUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,29 @@
+package org.jboss.website.utils;
+
+//jmx related
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
+
+
+public class ServiceUtil 
+{    
+    /**
+     * a generic method to lookup any registered JMX service
+     * 
+     * @param serviceId
+     * @param serviceClass
+     * @return
+     * @throws Exception
+     */
+    public static Object getService(String serviceId,Class serviceClass) throws Exception
+    {
+        Object service = null;
+        
+        MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+        service = MBeanProxy.get(serviceClass,new ObjectName(serviceId),mbeanServer);
+        
+        return service;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,57 +0,0 @@
-package org.jboss.website.utils;
-
-import org.apache.log4j.Logger;
-
-import org.jboss.website.config.Configuration;
-import org.jboss.website.hibernate.Tools;
-
-/**
- * 
- * @author soshah
- * 
- */
-public class Startup
-{
-   private static final Logger log = Logger.getLogger(Startup.class);
-
-   /**
-    * 
-    * 
-    */
-   public void start()
-   {
-      // cannot be modified at runtime
-      log.info("Loading the General Component Configuration..........");
-      try
-      {
-         Configuration.init();
-      }
-      catch (Exception e)
-      {
-         log
-               .info("Exception occurred while initializing the General Component Configuration"
-                     + e.toString());
-      }
-
-      // cannot be modified at runtime
-      log.info("Loading the Hibernate System..........");
-      try
-      {
-         Tools.init();
-      }
-      catch (Exception e)
-      {
-         log.info("Exception occurred while initializing the Tools "
-               + e.toString());
-      }
-
-      log.info("System successfully Initialized..........");
-   }
-
-   /**
-    * 
-    */
-   public void stop()
-   {
-   }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Startup.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,57 @@
+package org.jboss.website.utils;
+
+import org.apache.log4j.Logger;
+
+import org.jboss.website.config.Configuration;
+import org.jboss.website.hibernate.Tools;
+
+/**
+ * 
+ * @author soshah
+ * 
+ */
+public class Startup
+{
+   private static final Logger log = Logger.getLogger(Startup.class);
+
+   /**
+    * 
+    * 
+    */
+   public void start()
+   {
+      // cannot be modified at runtime
+      log.info("Loading the General Component Configuration..........");
+      try
+      {
+         Configuration.init();
+      }
+      catch (Exception e)
+      {
+         log
+               .info("Exception occurred while initializing the General Component Configuration"
+                     + e.toString());
+      }
+
+      // cannot be modified at runtime
+      log.info("Loading the Hibernate System..........");
+      try
+      {
+         Tools.init();
+      }
+      catch (Exception e)
+      {
+         log.info("Exception occurred while initializing the Tools "
+               + e.toString());
+      }
+
+      log.info("System successfully Initialized..........");
+   }
+
+   /**
+    * 
+    */
+   public void stop()
+   {
+   }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,319 +0,0 @@
-package org.jboss.website.utils;
-
-//java core
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.text.DateFormat;
-import javax.activation.MimetypesFileTypeMap;
-
-
-//xml related
-import org.w3c.dom.Document;
-import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class Util 
-{
-    /**
-     * 
-     * @param is
-     * @return
-     * @throws Exception
-     */
-	public static byte[] getBytes(InputStream is)
-    throws Exception
-    {
-        byte[] data = null;
-        
-        Collection chunks = new ArrayList();
-        byte[] buffer = new byte[1024*1000];
-        int read = -1;
-        int size = 0;
-        
-        while((read=is.read(buffer))!=-1)
-        {
-            if(read>0)
-            {
-                byte[] chunk = new byte[read];
-                System.arraycopy(buffer,0,chunk,0,read);
-                chunks.add(chunk);
-                size += chunk.length;
-            }
-        }       
-        
-        if(size>0)
-        {
-            ByteArrayOutputStream bos = null;
-            try
-            {
-                bos = new ByteArrayOutputStream(size);
-	            for(Iterator itr=chunks.iterator();itr.hasNext();)
-	            {
-	                byte[] chunk = (byte[])itr.next();
-	                bos.write(chunk);
-	            }
-	            data = bos.toByteArray();
-            }
-            finally
-            {
-                if(bos!=null)
-                {
-                    bos.close();
-                }
-            }
-        }
-        return data;
-    }
-	
-	/**
-     * 
-     * @param cour
-     * @return
-	 */
-	public static boolean isEmpty(String cour)
-	{
-		boolean isEmpty = false;
-		if(cour==null || cour.trim().length()==0)
-		{
-			isEmpty = true;
-		}
-		return isEmpty;
-	}
-	
-    /**
-     * 
-     * @param cour
-     * @return
-     */
-	public static boolean isEmpty(Object[] cour)
-	{
-		boolean isEmpty = false;
-		if(cour==null || cour.length==0)
-		{
-			isEmpty = true;
-		}
-		return isEmpty;
-	}
-	
-    /**
-     * 
-     * @param cour
-     * @return
-     */
-	public static boolean isEmpty(Collection cour)
-	{
-		boolean isEmpty = false;
-		if(cour==null || cour.size()==0)
-		{
-			isEmpty = true;
-		}
-		return isEmpty;
-	}
-	
-    /**
-     * file system related utilities
-     * Deletes all files and subdirectories under dir.
-     * Returns true if all deletions were successful.
-     * If a deletion fails, the method stops attempting to delete and returns false.
-     * @param dir
-     * @return
-     */	
-    public static boolean deleteDir(File dir) 
-    {
-        if (dir.isDirectory()) 
-        {
-            String[] children = dir.list();
-            for (int i=0; i<children.length; i++) 
-            {
-                boolean success = deleteDir(new File(dir,children[i]));
-                if (!success) 
-                {
-                    return false;
-                }
-            }
-        }    
-        // The directory is now empty so delete it
-        return dir.delete();
-    }
-    
-    /**
-     * 
-     * @param srcDir
-     * @param destDir
-     * @throws IOException
-     */
-    public static void copyDir(File srcDir,File destDir) 
-    throws IOException
-    { 
-    	if(srcDir.isDirectory())
-    	{
-    		File newDir = new File(destDir,srcDir.getName());
-    		destDir.mkdirs();
-    		newDir.mkdir();
-    		String[] children = srcDir.list();
-    		for(int i=0;i<children.length;i++)
-    		{
-    			File child = new File(srcDir,children[i]);
-    			if(child.isFile())
-    			{
-    				//copy this file
-    				File newChild = new File(newDir,children[i]);
-    				newChild.createNewFile();
-    				Util.copyFile(child,newChild);
-    			}
-    			else
-    			{
-    				//copy this directory
-    				File childSrc = new File(srcDir,children[i]);
-    				File childDest = new File(destDir,srcDir.getName());
-    				Util.copyDir(childSrc,childDest);
-    			}
-    		}
-    	}
-    }
-    
-    /**
-     * 
-     * @param from
-     * @param to
-     * @throws IOException
-     */
-    public static void copyFile(File from,File to) 
-	throws IOException
-	{
-		InputStream 	srcStream = null;
-		OutputStream 	destStream = null;
-		try
-		{
-			srcStream = new FileInputStream(from);
-			destStream = new FileOutputStream(to);
-			
-			byte[] buffer = new byte[1024];
-			int read = -1;
-			while((read=srcStream.read(buffer))!=-1)
-			{
-				destStream.write(buffer,0,read);
-			}
-		}
-		finally
-		{
-			if(srcStream!=null)
-			{
-				srcStream.close();
-			}
-			if(destStream!=null)
-			{
-				destStream.close();
-			}
-		}
-	}
-    
-    /**
-     * 
-     * @param srcStream
-     * @param destStream
-     * @throws IOException
-     */
-    public static void transferBytes(InputStream srcStream,OutputStream destStream) 
-    throws IOException
-    { 
-        try
-        {            
-            byte[] buffer = new byte[1024];
-            int read = -1;
-            while((read=srcStream.read(buffer))!=-1)
-            {
-                destStream.write(buffer,0,read);
-            }
-        }
-        finally
-        {
-            if(srcStream!=null)
-            {
-                srcStream.close();
-            }
-            if(destStream!=null)
-            {
-                destStream.close();
-            }
-        }
-    }
-    
-    /**
-     * 
-     * @param fileName
-     * @return
-     */
-    public static String getContentType(String fileName)
-    {
-    	String contentType = null;
-    	
-    	if(!Util.isEmpty(fileName))
-    	{
-    		if(fileName.indexOf('.')==-1)
-    		{
-    			contentType = "text/html";
-    		}
-    		else if(
-    			fileName.substring(fileName.indexOf('.')+1).equals("tpt") //template files
-    		)
-    		{
-    			contentType = "text/html";
-    		}
-    		else
-    		{
-    			MimetypesFileTypeMap mime = new MimetypesFileTypeMap();
-    			contentType = mime.getContentType(fileName);
-    		}
-    	}
-    	
-    	return contentType;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public static String getTimestamp()
-    {
-    	DateFormat format = DateFormat.getDateTimeInstance();
-    	return format.format(new Date());
-    }
-    
-    /**
-     * 
-     * @param is
-     * @return
-     * @throws Exception
-     */
-    public static Document parseXml(InputStream is)
-    throws Exception
-    {
-    	Document document = null;
-    	
-    	DocumentBuilderFactory factory = DocumentBuilderFactoryImpl.newInstance();
-    	factory.setCoalescing(true);
-    	
-    	DocumentBuilder builder = factory.newDocumentBuilder();
-    	
-    	document = builder.parse(is);
-    	
-    	return document;
-    }    
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/utils/Util.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,319 @@
+package org.jboss.website.utils;
+
+//java core
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.text.DateFormat;
+import javax.activation.MimetypesFileTypeMap;
+
+
+//xml related
+import org.w3c.dom.Document;
+import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class Util 
+{
+    /**
+     * 
+     * @param is
+     * @return
+     * @throws Exception
+     */
+	public static byte[] getBytes(InputStream is)
+    throws Exception
+    {
+        byte[] data = null;
+        
+        Collection chunks = new ArrayList();
+        byte[] buffer = new byte[1024*1000];
+        int read = -1;
+        int size = 0;
+        
+        while((read=is.read(buffer))!=-1)
+        {
+            if(read>0)
+            {
+                byte[] chunk = new byte[read];
+                System.arraycopy(buffer,0,chunk,0,read);
+                chunks.add(chunk);
+                size += chunk.length;
+            }
+        }       
+        
+        if(size>0)
+        {
+            ByteArrayOutputStream bos = null;
+            try
+            {
+                bos = new ByteArrayOutputStream(size);
+	            for(Iterator itr=chunks.iterator();itr.hasNext();)
+	            {
+	                byte[] chunk = (byte[])itr.next();
+	                bos.write(chunk);
+	            }
+	            data = bos.toByteArray();
+            }
+            finally
+            {
+                if(bos!=null)
+                {
+                    bos.close();
+                }
+            }
+        }
+        return data;
+    }
+	
+	/**
+     * 
+     * @param cour
+     * @return
+	 */
+	public static boolean isEmpty(String cour)
+	{
+		boolean isEmpty = false;
+		if(cour==null || cour.trim().length()==0)
+		{
+			isEmpty = true;
+		}
+		return isEmpty;
+	}
+	
+    /**
+     * 
+     * @param cour
+     * @return
+     */
+	public static boolean isEmpty(Object[] cour)
+	{
+		boolean isEmpty = false;
+		if(cour==null || cour.length==0)
+		{
+			isEmpty = true;
+		}
+		return isEmpty;
+	}
+	
+    /**
+     * 
+     * @param cour
+     * @return
+     */
+	public static boolean isEmpty(Collection cour)
+	{
+		boolean isEmpty = false;
+		if(cour==null || cour.size()==0)
+		{
+			isEmpty = true;
+		}
+		return isEmpty;
+	}
+	
+    /**
+     * file system related utilities
+     * Deletes all files and subdirectories under dir.
+     * Returns true if all deletions were successful.
+     * If a deletion fails, the method stops attempting to delete and returns false.
+     * @param dir
+     * @return
+     */	
+    public static boolean deleteDir(File dir) 
+    {
+        if (dir.isDirectory()) 
+        {
+            String[] children = dir.list();
+            for (int i=0; i<children.length; i++) 
+            {
+                boolean success = deleteDir(new File(dir,children[i]));
+                if (!success) 
+                {
+                    return false;
+                }
+            }
+        }    
+        // The directory is now empty so delete it
+        return dir.delete();
+    }
+    
+    /**
+     * 
+     * @param srcDir
+     * @param destDir
+     * @throws IOException
+     */
+    public static void copyDir(File srcDir,File destDir) 
+    throws IOException
+    { 
+    	if(srcDir.isDirectory())
+    	{
+    		File newDir = new File(destDir,srcDir.getName());
+    		destDir.mkdirs();
+    		newDir.mkdir();
+    		String[] children = srcDir.list();
+    		for(int i=0;i<children.length;i++)
+    		{
+    			File child = new File(srcDir,children[i]);
+    			if(child.isFile())
+    			{
+    				//copy this file
+    				File newChild = new File(newDir,children[i]);
+    				newChild.createNewFile();
+    				Util.copyFile(child,newChild);
+    			}
+    			else
+    			{
+    				//copy this directory
+    				File childSrc = new File(srcDir,children[i]);
+    				File childDest = new File(destDir,srcDir.getName());
+    				Util.copyDir(childSrc,childDest);
+    			}
+    		}
+    	}
+    }
+    
+    /**
+     * 
+     * @param from
+     * @param to
+     * @throws IOException
+     */
+    public static void copyFile(File from,File to) 
+	throws IOException
+	{
+		InputStream 	srcStream = null;
+		OutputStream 	destStream = null;
+		try
+		{
+			srcStream = new FileInputStream(from);
+			destStream = new FileOutputStream(to);
+			
+			byte[] buffer = new byte[1024];
+			int read = -1;
+			while((read=srcStream.read(buffer))!=-1)
+			{
+				destStream.write(buffer,0,read);
+			}
+		}
+		finally
+		{
+			if(srcStream!=null)
+			{
+				srcStream.close();
+			}
+			if(destStream!=null)
+			{
+				destStream.close();
+			}
+		}
+	}
+    
+    /**
+     * 
+     * @param srcStream
+     * @param destStream
+     * @throws IOException
+     */
+    public static void transferBytes(InputStream srcStream,OutputStream destStream) 
+    throws IOException
+    { 
+        try
+        {            
+            byte[] buffer = new byte[1024];
+            int read = -1;
+            while((read=srcStream.read(buffer))!=-1)
+            {
+                destStream.write(buffer,0,read);
+            }
+        }
+        finally
+        {
+            if(srcStream!=null)
+            {
+                srcStream.close();
+            }
+            if(destStream!=null)
+            {
+                destStream.close();
+            }
+        }
+    }
+    
+    /**
+     * 
+     * @param fileName
+     * @return
+     */
+    public static String getContentType(String fileName)
+    {
+    	String contentType = null;
+    	
+    	if(!Util.isEmpty(fileName))
+    	{
+    		if(fileName.indexOf('.')==-1)
+    		{
+    			contentType = "text/html";
+    		}
+    		else if(
+    			fileName.substring(fileName.indexOf('.')+1).equals("tpt") //template files
+    		)
+    		{
+    			contentType = "text/html";
+    		}
+    		else
+    		{
+    			MimetypesFileTypeMap mime = new MimetypesFileTypeMap();
+    			contentType = mime.getContentType(fileName);
+    		}
+    	}
+    	
+    	return contentType;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public static String getTimestamp()
+    {
+    	DateFormat format = DateFormat.getDateTimeInstance();
+    	return format.format(new Date());
+    }
+    
+    /**
+     * 
+     * @param is
+     * @return
+     * @throws Exception
+     */
+    public static Document parseXml(InputStream is)
+    throws Exception
+    {
+    	Document document = null;
+    	
+    	DocumentBuilderFactory factory = DocumentBuilderFactoryImpl.newInstance();
+    	factory.setCoalescing(true);
+    	
+    	DocumentBuilder builder = factory.newDocumentBuilder();
+    	
+    	document = builder.parse(is);
+    	
+    	return document;
+    }    
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,19 +0,0 @@
-package org.jboss.website.validation;
-
-import java.io.InputStream;
-import org.apache.commons.validator.ValidatorResources;
-
-public class Tools 
-{
-	private static ValidatorResources jbossDotComDomain = null;
-	
-	public static ValidatorResources getJBossDotComDomain() throws Exception
-	{
-		if(jbossDotComDomain==null)
-		{
-			InputStream stream = Tools.class.getResourceAsStream("/org/jboss/website/validation/domain-validation.xml");
-	        jbossDotComDomain = new ValidatorResources(stream);
-		}
-		return jbossDotComDomain;
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,19 @@
+package org.jboss.website.validation;
+
+import java.io.InputStream;
+import org.apache.commons.validator.ValidatorResources;
+
+public class Tools 
+{
+	private static ValidatorResources jbossDotComDomain = null;
+	
+	public static ValidatorResources getJBossDotComDomain() throws Exception
+	{
+		if(jbossDotComDomain==null)
+		{
+			InputStream stream = Tools.class.getResourceAsStream("/org/jboss/website/validation/domain-validation.xml");
+	        jbossDotComDomain = new ValidatorResources(stream);
+		}
+		return jbossDotComDomain;
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,60 +0,0 @@
-package org.jboss.website.validation;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.validator.ValidatorResults;
-import org.apache.commons.validator.ValidatorResult;
-
-
-public class ValidationException extends Exception
-{
-	private ValidatorResults results = null;
-	
-	public ValidationException()
-	{
-		this("");
-	}
-	
-	public ValidationException(String ex)
-	{
-		super(ex);
-	}
-	
-	public ValidationException(Exception ex)
-	{
-		super(ex);
-	}
-	
-	public ValidationException(ValidatorResults results)
-	{
-		this("Validation of the object failed...");
-		this.results = results;		
-	}
-	
-	public String toString()
-	{		
-		StringBuffer buffer = new StringBuffer();
-		String superMessage = super.toString();
-		if(superMessage!=null)
-		{
-			buffer.append(superMessage+"\n");
-		}
-		if(this.results!=null)
-		{			
-			Set propertyNames = this.results.getPropertyNames();
-			for(Iterator itr=propertyNames.iterator();itr.hasNext();)
-			{
-				Object key = itr.next();
-				ValidatorResult value = this.results.getValidatorResult((String)key);
-				Map actionMap = value.getActionMap();
-				for(Iterator itr2=actionMap.keySet().iterator();itr2.hasNext();)
-				{
-					String validatorName = (String)itr2.next();
-					buffer.append(key+"("+validatorName+")[Validation Failure]\n");
-				}				
-			}			
-		}		
-		return buffer.toString();
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidationException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,60 @@
+package org.jboss.website.validation;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.validator.ValidatorResults;
+import org.apache.commons.validator.ValidatorResult;
+
+
+public class ValidationException extends Exception
+{
+	private ValidatorResults results = null;
+	
+	public ValidationException()
+	{
+		this("");
+	}
+	
+	public ValidationException(String ex)
+	{
+		super(ex);
+	}
+	
+	public ValidationException(Exception ex)
+	{
+		super(ex);
+	}
+	
+	public ValidationException(ValidatorResults results)
+	{
+		this("Validation of the object failed...");
+		this.results = results;		
+	}
+	
+	public String toString()
+	{		
+		StringBuffer buffer = new StringBuffer();
+		String superMessage = super.toString();
+		if(superMessage!=null)
+		{
+			buffer.append(superMessage+"\n");
+		}
+		if(this.results!=null)
+		{			
+			Set propertyNames = this.results.getPropertyNames();
+			for(Iterator itr=propertyNames.iterator();itr.hasNext();)
+			{
+				Object key = itr.next();
+				ValidatorResult value = this.results.getValidatorResult((String)key);
+				Map actionMap = value.getActionMap();
+				for(Iterator itr2=actionMap.keySet().iterator();itr2.hasNext();)
+				{
+					String validatorName = (String)itr2.next();
+					buffer.append(key+"("+validatorName+")[Validation Failure]\n");
+				}				
+			}			
+		}		
+		return buffer.toString();
+	}
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,92 +0,0 @@
-package org.jboss.website.validation;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.validator.util.ValidatorUtils;
-
-public class ValidatorUtil 
-{
-	public static boolean isPasswordValid(String value)
-	{
-		int firstMatch = 0;
-		int secondMatch = 0;		
-		
-		//check for whitespaces
-		Pattern whitespace = Pattern.compile("\\s+");
-   	    Matcher wMatcher = whitespace.matcher(value);
-   		if(wMatcher.find())
-   		{
-   			return false;
-   		}
-   		
-   		//check if atleast one uppercase character is found
-   		Pattern uppercase = Pattern.compile("[A-Z]+");
-   	    Matcher uMatcher = uppercase.matcher(value);
-   		if(uMatcher.find())
-   		{
-   			if(firstMatch==0)
-   			{
-   				firstMatch = 1;
-   			}
-   			else
-   			{
-   				secondMatch = 1;
-   			}
-   		}
-   		   		
-   		//check if atleast one lowercase character is found
-   		Pattern lowercase = Pattern.compile("[a-z]+");
-   	    Matcher lMatcher = lowercase.matcher(value);
-		if(lMatcher.find())
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-		
-   		//check if atleast one numeric character is found
-		Pattern digit = Pattern.compile("\\d+");
-   	    Matcher dMatcher = digit.matcher(value);
-		if(dMatcher.find())
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-		
-		
-   		//check if atleast one symbolic character is found
-		Pattern symbolic = Pattern.compile("\\W+");
-   	    Matcher sMatcher = symbolic.matcher(value);
-		if(sMatcher.find())
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-		
-		//final check 
-   		if(firstMatch==0 || secondMatch ==0)
-   		{   			
-   			return false;
-   		}
-						
-		return true;
-	}
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/src/java/org/jboss/website/validation/ValidatorUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,92 @@
+package org.jboss.website.validation;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.validator.util.ValidatorUtils;
+
+public class ValidatorUtil 
+{
+	public static boolean isPasswordValid(String value)
+	{
+		int firstMatch = 0;
+		int secondMatch = 0;		
+		
+		//check for whitespaces
+		Pattern whitespace = Pattern.compile("\\s+");
+   	    Matcher wMatcher = whitespace.matcher(value);
+   		if(wMatcher.find())
+   		{
+   			return false;
+   		}
+   		
+   		//check if atleast one uppercase character is found
+   		Pattern uppercase = Pattern.compile("[A-Z]+");
+   	    Matcher uMatcher = uppercase.matcher(value);
+   		if(uMatcher.find())
+   		{
+   			if(firstMatch==0)
+   			{
+   				firstMatch = 1;
+   			}
+   			else
+   			{
+   				secondMatch = 1;
+   			}
+   		}
+   		   		
+   		//check if atleast one lowercase character is found
+   		Pattern lowercase = Pattern.compile("[a-z]+");
+   	    Matcher lMatcher = lowercase.matcher(value);
+		if(lMatcher.find())
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+		
+   		//check if atleast one numeric character is found
+		Pattern digit = Pattern.compile("\\d+");
+   	    Matcher dMatcher = digit.matcher(value);
+		if(dMatcher.find())
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+		
+		
+   		//check if atleast one symbolic character is found
+		Pattern symbolic = Pattern.compile("\\W+");
+   	    Matcher sMatcher = symbolic.matcher(value);
+		if(sMatcher.find())
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+		
+		//final check 
+   		if(firstMatch==0 || secondMatch ==0)
+   		{   			
+   			return false;
+   		}
+						
+		return true;
+	}
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-	<namespace>http://www.jboss.com/jbossfacelets</namespace>
-	<!-- 
-		 function generates an outputLink that works seamlessly within portal and standalone environment 
-	     to be used for generating "GET" requests that can be bookmarked
-	     (java.lang.String = targetURL, boolean = "true" if this is an actionURL "false" if it is a renderURL)
-	-->
-	<function>
-  		<function-name>outputLink</function-name>
-  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
-  		<function-signature>java.lang.String outputLink(java.lang.String,boolean)</function-signature>
-	</function>
-	<!-- 
-		 function generates an goBackLink that works seamlessly within portal and standalone environment 
-	     this function tries to create a backLink based on the user's "Referer" header and "GET" status. If
-	     its a "Post" and/or no "Referer" is found, the standard browser based javascript history.back() is generated	     
-	-->
-	<function>
-  		<function-name>goBackLink</function-name>
-  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
-  		<function-signature>java.lang.String goBackLink()</function-signature>
-	</function>
-	<!-- 
-		 function generates the contextPath of the application
-	-->
-	<function>
-  		<function-name>contextPath</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>java.lang.String getContextPath()</function-signature>
-	</function>
-	<!-- 
-		 function retrieves a generic error message if one is found.
-		 return null if nothing is found
-	-->
-	<function>
-  		<function-name>errorMsg</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>java.lang.String getErrorMsg()</function-signature>
-	</function>
-	<!-- 
-		 function returns if access denied exception occurred
-	-->
-	<function>
-  		<function-name>isAccessDenied</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>boolean isAccessDenied()</function-signature>
-	</function>
-	<!-- 
-		 function to get constant declarations
-	-->
-	<!--function>
-  		<function-name>constantInt</function-name>
-  		<function-class>org.jboss.portlet.forums.ui.ConstantsHelper</function-class>
-  		<function-signature>int getConstantInt(java.lang.String)</function-signature>
-	</function-->	
-	
-	<!-- 
-		function that decides if this is running in a portal environment or not
-	 -->
-	 <function>
-  		<function-name>isRunningInPortal</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>boolean isRunningInPortal()</function-signature>
-	</function>
-	<!-- 
-		 function returns if access denied exception occurred
-	-->
-	<function>
-  		<function-name>isAnonymous</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>boolean isAnonymous()</function-signature>
-	</function>	
-</facelet-taglib>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossfacelets.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
+<facelet-taglib>
+	<namespace>http://www.jboss.com/jbossfacelets</namespace>
+	<!-- 
+		 function generates an outputLink that works seamlessly within portal and standalone environment 
+	     to be used for generating "GET" requests that can be bookmarked
+	     (java.lang.String = targetURL, boolean = "true" if this is an actionURL "false" if it is a renderURL)
+	-->
+	<function>
+  		<function-name>outputLink</function-name>
+  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
+  		<function-signature>java.lang.String outputLink(java.lang.String,boolean)</function-signature>
+	</function>
+	<!-- 
+		 function generates an goBackLink that works seamlessly within portal and standalone environment 
+	     this function tries to create a backLink based on the user's "Referer" header and "GET" status. If
+	     its a "Post" and/or no "Referer" is found, the standard browser based javascript history.back() is generated	     
+	-->
+	<function>
+  		<function-name>goBackLink</function-name>
+  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
+  		<function-signature>java.lang.String goBackLink()</function-signature>
+	</function>
+	<!-- 
+		 function generates the contextPath of the application
+	-->
+	<function>
+  		<function-name>contextPath</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>java.lang.String getContextPath()</function-signature>
+	</function>
+	<!-- 
+		 function retrieves a generic error message if one is found.
+		 return null if nothing is found
+	-->
+	<function>
+  		<function-name>errorMsg</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>java.lang.String getErrorMsg()</function-signature>
+	</function>
+	<!-- 
+		 function returns if access denied exception occurred
+	-->
+	<function>
+  		<function-name>isAccessDenied</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>boolean isAccessDenied()</function-signature>
+	</function>
+	<!-- 
+		 function to get constant declarations
+	-->
+	<!--function>
+  		<function-name>constantInt</function-name>
+  		<function-class>org.jboss.portlet.forums.ui.ConstantsHelper</function-class>
+  		<function-signature>int getConstantInt(java.lang.String)</function-signature>
+	</function-->	
+	
+	<!-- 
+		function that decides if this is running in a portal environment or not
+	 -->
+	 <function>
+  		<function-name>isRunningInPortal</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>boolean isRunningInPortal()</function-signature>
+	</function>
+	<!-- 
+		 function returns if access denied exception occurred
+	-->
+	<function>
+  		<function-name>isAnonymous</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>boolean isAnonymous()</function-signature>
+	</function>	
+</facelet-taglib>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,54 +0,0 @@
-<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"
-  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>jbossjsf</shortname>
-   <uri>http://www.jboss.com/jsf/website</uri>
-   <info>JBoss JSF tags</info>
-   
-   <tag>
-      <name>iterator</name>
-      <tag-class>org.jboss.website.jsf.tags.IteratorTag</tag-class>
-      <tei-class>org.jboss.website.jsf.tags.IteratorTEI</tei-class>
-      <body-content>JSP</body-content>
-      <attribute>
-         <name>items</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <required>true</required>
-         <rtexprvalue>false</rtexprvalue>
-      </attribute>            
-   </tag>
-   
-   <tag>
-      <name>setValue</name>
-      <tag-class>org.jboss.website.jsf.tags.SetValueTag</tag-class>      
-      <body-content>empty</body-content>
-      <attribute>
-         <name>target</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>property</name>
-         <required>true</required>
-         <rtexprvalue>false</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>            
-   </tag>
-      
-</taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/jbossjsf.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,54 @@
+<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"
+  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>jbossjsf</shortname>
+   <uri>http://www.jboss.com/jsf/website</uri>
+   <info>JBoss JSF tags</info>
+   
+   <tag>
+      <name>iterator</name>
+      <tag-class>org.jboss.website.jsf.tags.IteratorTag</tag-class>
+      <tei-class>org.jboss.website.jsf.tags.IteratorTEI</tei-class>
+      <body-content>JSP</body-content>
+      <attribute>
+         <name>items</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>var</name>
+         <required>true</required>
+         <rtexprvalue>false</rtexprvalue>
+      </attribute>            
+   </tag>
+   
+   <tag>
+      <name>setValue</name>
+      <tag-class>org.jboss.website.jsf.tags.SetValueTag</tag-class>      
+      <body-content>empty</body-content>
+      <attribute>
+         <name>target</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>property</name>
+         <required>true</required>
+         <rtexprvalue>false</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>            
+   </tag>
+      
+</taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/security.taglib.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-	<!-- 
-  	JBoss, the OpenSource J2EE webOS
-  	Distributable under LGPL license.
-  	See terms of license at gnu.org. 
- 	-->
-	<namespace>http://www.jboss.com/security/website</namespace>  
-	<tag>
-		<tag-name>isAllowed</tag-name>
-		<handler-class>org.jboss.website.security.impl.ACLTagHandler</handler-class>
-	</tag>   	      	        
-</facelet-taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/security.taglib.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
+<facelet-taglib>
+	<!-- 
+  	JBoss, the OpenSource J2EE webOS
+  	Distributable under LGPL license.
+  	See terms of license at gnu.org. 
+ 	-->
+	<namespace>http://www.jboss.com/security/website</namespace>  
+	<tag>
+		<tag-name>isAllowed</tag-name>
+		<handler-class>org.jboss.website.security.impl.ACLTagHandler</handler-class>
+	</tag>   	      	        
+</facelet-taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/security.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,35 +0,0 @@
-<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"
-  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>security</shortname>
-   <uri>http://www.jboss.com/security/website</uri>
-   <info>JBoss WebSite Security related tags</info>
-   
-   <tag>
-      <name>isAllowed</name>
-      <tag-class>org.jboss.website.security.impl.ACLTag</tag-class>      
-      <body-content>JSP</body-content>
-      <attribute>
-         <name>fragmentId</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <!-- this is a comma-separated list of runtime input information to be used to determine if access should be
-      granted to render the protected fragment -->
-      <attribute>
-         <name>runtimeInfo</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>                  
-   </tag>
-   
-      
-</taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/security.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/security.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,35 @@
+<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"
+  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>security</shortname>
+   <uri>http://www.jboss.com/security/website</uri>
+   <info>JBoss WebSite Security related tags</info>
+   
+   <tag>
+      <name>isAllowed</name>
+      <tag-class>org.jboss.website.security.impl.ACLTag</tag-class>      
+      <body-content>JSP</body-content>
+      <attribute>
+         <name>fragmentId</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <!-- this is a comma-separated list of runtime input information to be used to determine if access should be
+      granted to render the protected fragment -->
+      <attribute>
+         <name>runtimeInfo</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>                  
+   </tag>
+   
+      
+</taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
-  <tlibversion>1.0</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>i18n</shortname>
-  <uri>http://jakarta.apache.org/taglibs/i18n-1.0</uri>
-  <info>
-The i18n custom tag library contains tags that help manage the complexity of creating internationalized web applications. These tags provide similar (though not identical) functionality to the internationalization available in the struts framework, but do not require adopting the entire struts framework.
-
-"i18n" is a common abbreviation for internationalization, because there are 18
-letters between the first "i" and the last "n".
-
-For more information on internationalization with Java, the java.sun.com site
-contains a good 
-tutorial written by Dale Green.
-</info>
-  <tag>
-    <name>bundle</name>
-    <tagclass>org.apache.taglibs.i18n.BundleTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.BundleTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>baseName</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>changeResponseLocale</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>scope</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>localeAttribute</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>localeRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>debug</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>message</name>
-    <tagclass>org.apache.taglibs.i18n.MessageTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.MessageTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>key</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>args</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundleRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>debug</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>messageArg</name>
-    <tagclass>org.apache.taglibs.i18n.MessageArgumentTag</tagclass>
-    <bodycontent>empty</bodycontent>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>ifdef</name>
-    <tagclass>org.apache.taglibs.i18n.IfdefTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>key</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundleRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>ifndef</name>
-    <tagclass>org.apache.taglibs.i18n.IfndefTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>key</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundleRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>locale</name>
-    <tagclass>org.apache.taglibs.i18n.LocaleTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.LocaleTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>localeRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>language</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>country</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>variant</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatString</name>
-    <tagclass>org.apache.taglibs.i18n.FormatStringTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatStringTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatNumber</name>
-    <tagclass>org.apache.taglibs.i18n.FormatNumberTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatNumberTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>pattern</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatCurrency</name>
-    <tagclass>org.apache.taglibs.i18n.FormatCurrencyTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatCurrencyTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatPercent</name>
-    <tagclass>org.apache.taglibs.i18n.FormatPercentTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatPercentTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatDateTime</name>
-    <tagclass>org.apache.taglibs.i18n.FormatDateTimeTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatDateTimeTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>dateStyle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>timeStyle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatDate</name>
-    <tagclass>org.apache.taglibs.i18n.FormatDateTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatDateTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>pattern</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>style</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatTime</name>
-    <tagclass>org.apache.taglibs.i18n.FormatTimeTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatTimeTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>style</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-</taglib>
-
-
-
-
-
-
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-common/tlds/taglibs-i18n.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+  <tlibversion>1.0</tlibversion>
+  <jspversion>1.1</jspversion>
+  <shortname>i18n</shortname>
+  <uri>http://jakarta.apache.org/taglibs/i18n-1.0</uri>
+  <info>
+The i18n custom tag library contains tags that help manage the complexity of creating internationalized web applications. These tags provide similar (though not identical) functionality to the internationalization available in the struts framework, but do not require adopting the entire struts framework.
+
+"i18n" is a common abbreviation for internationalization, because there are 18
+letters between the first "i" and the last "n".
+
+For more information on internationalization with Java, the java.sun.com site
+contains a good 
+tutorial written by Dale Green.
+</info>
+  <tag>
+    <name>bundle</name>
+    <tagclass>org.apache.taglibs.i18n.BundleTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.BundleTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>baseName</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>changeResponseLocale</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>scope</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>localeAttribute</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>localeRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>debug</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>message</name>
+    <tagclass>org.apache.taglibs.i18n.MessageTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.MessageTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>key</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>args</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundleRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>debug</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>messageArg</name>
+    <tagclass>org.apache.taglibs.i18n.MessageArgumentTag</tagclass>
+    <bodycontent>empty</bodycontent>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>ifdef</name>
+    <tagclass>org.apache.taglibs.i18n.IfdefTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>key</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundleRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>ifndef</name>
+    <tagclass>org.apache.taglibs.i18n.IfndefTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>key</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundleRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>locale</name>
+    <tagclass>org.apache.taglibs.i18n.LocaleTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.LocaleTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>localeRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>language</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>country</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>variant</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatString</name>
+    <tagclass>org.apache.taglibs.i18n.FormatStringTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatStringTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatNumber</name>
+    <tagclass>org.apache.taglibs.i18n.FormatNumberTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatNumberTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>pattern</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatCurrency</name>
+    <tagclass>org.apache.taglibs.i18n.FormatCurrencyTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatCurrencyTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatPercent</name>
+    <tagclass>org.apache.taglibs.i18n.FormatPercentTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatPercentTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatDateTime</name>
+    <tagclass>org.apache.taglibs.i18n.FormatDateTimeTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatDateTimeTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>dateStyle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>timeStyle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatDate</name>
+    <tagclass>org.apache.taglibs.i18n.FormatDateTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatDateTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>pattern</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>style</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatTime</name>
+    <tagclass>org.apache.taglibs.i18n.FormatTimeTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatTimeTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>style</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+</taglib>
+
+
+
+
+
+
+

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security)


Property changes on: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security
___________________________________________________________________
Name: svn:ignore
   + target


Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/maven.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,23 +0,0 @@
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-    <goal name="all">
-    	<attainGoal name="clean" />
-    	<attainGoal name="build" />
-    	<attainGoal name="deploy" />
-    </goal>
-    
-    <goal name="clean">
-		<attainGoal name="prj-clean" />
-    </goal>
-
-    <goal name="build">
-		<attainGoal name="jar" />		
-    </goal> 
-    
-    <goal name="deploy">
-    </goal>        
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/maven.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,23 @@
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+    <goal name="all">
+    	<attainGoal name="clean" />
+    	<attainGoal name="build" />
+    	<attainGoal name="deploy" />
+    </goal>
+    
+    <goal name="clean">
+		<attainGoal name="prj-clean" />
+    </goal>
+
+    <goal name="build">
+		<attainGoal name="jar" />		
+    </goal> 
+    
+    <goal name="deploy">
+    </goal>        
+</project>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/project.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,3 +0,0 @@
-maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
-maven.junit.fork=yes
-maven.war.src=${basedir}/src/web

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/project.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,3 @@
+maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
+maven.junit.fork=yes
+maven.war.src=${basedir}/src/web

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/project.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
-    <id>jbwebsite-security</id>
-    <name>jboss website security related classes</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Sohil Shah</name>
-        <url>http://www.jboss.com</url>
-    </organization>
-    <description></description>
-    
-    <dependencies>     	    
-       <!--  jdbc-ldap bridge library -->	   
-	   <dependency>
-                <groupId>ldap</groupId>
-                <artifactId>jdbcLdapJldap</artifactId>
-                <version>1.0</version>
-                <jar>jdbcLdapJldap.jar</jar>
-    	</dependency>
-    	    	
-    	<!--  jboss sso framework libraries -->
-    	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-identity-management</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-identity-management.jar</jar>
-    	</dependency>
-    	    	    	
-    	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-sso-common</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-security-common.jar</jar>
-    	</dependency>
-    	
-    	<!--  jboss jaae authorization framework libraries -->
-    	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-acl</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-acl.jar</jar>
-    	</dependency>
-    	
-    	<!-- core jboss dependencies -->
-    	<dependency>
-                <groupId>jboss</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.0</version>
-                <jar>log4j.jar</jar>
-    	</dependency>	   	    
-    </dependencies>    
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/etc/</directory>
-                <include>**/*.properties</include>
-            </resource>
-        </resources>
-    </build>
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/project.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/project.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../common.xml</extend>
+    <id>jbwebsite-security</id>
+    <name>jboss website security related classes</name>
+    <currentVersion>1.0</currentVersion>
+    <organization>
+        <name>Sohil Shah</name>
+        <url>http://www.jboss.com</url>
+    </organization>
+    <description></description>
+    
+    <dependencies>     	    
+       <!--  jdbc-ldap bridge library -->	   
+	   <dependency>
+                <groupId>ldap</groupId>
+                <artifactId>jdbcLdapJldap</artifactId>
+                <version>1.0</version>
+                <jar>jdbcLdapJldap.jar</jar>
+    	</dependency>
+    	    	
+    	<!--  jboss sso framework libraries -->
+    	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-identity-management</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-identity-management.jar</jar>
+    	</dependency>
+    	    	    	
+    	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-sso-common</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-security-common.jar</jar>
+    	</dependency>
+    	
+    	<!--  jboss jaae authorization framework libraries -->
+    	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-acl</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-acl.jar</jar>
+    	</dependency>
+    	
+    	<!-- core jboss dependencies -->
+    	<dependency>
+                <groupId>jboss</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.0</version>
+                <jar>log4j.jar</jar>
+    	</dependency>	   	    
+    </dependencies>    
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/etc/</directory>
+                <include>**/*.properties</include>
+            </resource>
+        </resources>
+    </build>
+</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,66 +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.website.security;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Apr 4, 2006
- *
- */
-public class AccountInActiveException extends Exception
-{
-    /**
-     * 
-     *
-     */
-    public AccountInActiveException()
-    {
-        this("");
-    }
-    
-    /**
-     * 
-     * @param ex
-     */
-    public AccountInActiveException(String ex)
-    {
-        super(ex);
-    }
-    
-    /**
-     * 
-     * @param ex
-     */
-    public AccountInActiveException(Exception ex)
-    {
-        super(ex);
-    }
-    
-    
-    /**
-     * 
-     */
-    public String toString()
-    {
-        return "accountInActive";
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/AccountInActiveException.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,66 @@
+/*
+* 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.website.security;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Apr 4, 2006
+ *
+ */
+public class AccountInActiveException extends Exception
+{
+    /**
+     * 
+     *
+     */
+    public AccountInActiveException()
+    {
+        this("");
+    }
+    
+    /**
+     * 
+     * @param ex
+     */
+    public AccountInActiveException(String ex)
+    {
+        super(ex);
+    }
+    
+    /**
+     * 
+     * @param ex
+     */
+    public AccountInActiveException(Exception ex)
+    {
+        super(ex);
+    }
+    
+    
+    /**
+     * 
+     */
+    public String toString()
+    {
+        return "accountInActive";
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,780 +0,0 @@
-package org.jboss.website.security;
-
-import java.sql.*;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-import org.apache.log4j.Logger;
-import org.jboss.security.idm.Identity;
-import org.jboss.security.idm.IdentityException;
-import org.jboss.security.idm.ldap.LDAPIdentityProvider;
-
-import org.jboss.security.util.Tools;
-
-
-public class JBossCorpIdentityProvider extends LDAPIdentityProvider 
-{
-	private static final Logger log = Logger.getLogger(JBossCorpIdentityProvider.class);
-    
-    private static final String registrationDatePattern = "yyyy-MM-DD";
-   
-    private static final String readSQL = "select cn,sn,userPassword,givenName,displayName,o,employeeType,title,postalAddress,mail," +
-    "telephoneNumber,secretQuestion,secretAnswer,registrationDate from cn={0},ou={1}";
-    
-    private static final String insertSQL = "insert into cn,ou={0}"+
-    "(objectclass,cn,sn,userPassword,givenName,displayName,o,employeeType,title,{1},{3},{5},secretQuestion,secretAnswer,registrationDate" +             
-    ") " +
-    "VALUES " +
-    "(" +
-    "?,?,?,?,?,?,?,?,?,{2},{4},{6},?,?,?" +
-    ")";
-    
-    private static final String searchSQL = "select cn,sn,userPassword,givenName," +
-    "displayName," +
-    "o,employeeType,title," +
-    "postalAddress,mail,telephoneNumber," +
-    "secretQuestion,secretAnswer," +
-    "registrationDate";
-    
-    private Hashtable env = new Hashtable(11);
-    
-    private static final int RESULT_SIZE_LIMIT = 100;
- 
-    		
-    /**
-     *
-     */
-	public JBossCorpIdentityProvider()
-	{        
-	}
-   
-   public void setProperties(Properties properties) throws IdentityException
-   {
-      super.setProperties(properties);
-      env.put(Context.INITIAL_CONTEXT_FACTORY,"com.sun.jndi.ldap.LdapCtxFactory");
-      String ldapURL = properties.getProperty("connectionURL");
-      ldapURL = ldapURL.substring(ldapURL.indexOf(":")+1);      
-   }
-    
-    //identityProvider interface implementation--------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public Identity read(String username) throws IdentityException 
-    {
-        try
-        {
-            Identity identity = this.readIdentity(readSQL,username);                      
-            return identity;
-        }
-        catch(SQLException sqe)
-        {
-            throw new IdentityException(sqe);
-        }
-    }
-	    		    				                
-    //search interface-------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public Collection searchByUserName(String username) throws IdentityException
-    {
-        DirContext ctx = null;
-        try
-        {
-            Collection identities = new ArrayList();  
-                                        
-            //Create initial context
-            ctx = new InitialDirContext(env);
-            
-            //get the attributes of this object
-            //Create the default search controls
-            SearchControls ctls = new SearchControls();
-            ctls.setCountLimit(RESULT_SIZE_LIMIT);
-            ctls.setTimeLimit(0);
-    
-            //Specify the search filter to match
-            String filter = "(&(cn="+username+"*))";
-            
-            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
-            String[] attrIDs = {"cn","mail","o","sn"};  
-            try
-            {
-            while (answer.hasMore()) 
-            {
-                Identity identity = new JBossIdentity();
-                SearchResult sr = (SearchResult)answer.next();
-                String uname = (String)sr.getAttributes().get("cn").get();                
-                String mail = (String)sr.getAttributes().get("mail").get();
-                String company = (String)sr.getAttributes().get("o").get();
-                String status = (String)sr.getAttributes().get("sn").get();
-                boolean activeStatus = Boolean.parseBoolean(status);                    
-                identity.setUserName(uname);
-                identity.setEmail(mail.substring(mail.indexOf("=")+1));
-                identity.setCompanyName(company);
-                identity.setActive(activeStatus);
-                identities.add(identity);
-            }
-            }
-            catch(javax.naming.SizeLimitExceededException e)
-            {
-                //lets move on with whatever results are returned
-            }
-            
-            return identities;
-        }
-        catch(Exception e)
-        {
-            throw new IdentityException(e);
-        }
-        finally
-        {
-            if(ctx != null)
-            {
-                try{ctx.close();}catch(Exception e){}
-            }
-        }
-    }
-    
-    /**
-     * 
-     */
-    public Collection searchByEmail(String email) throws IdentityException
-    {
-        DirContext ctx = null;
-        try
-        {
-            Collection identities = new ArrayList();  
-                                        
-            //Create initial context
-            ctx = new InitialDirContext(env);
-            
-            //get the attributes of this object
-            //Create the default search controls
-            SearchControls ctls = new SearchControls();
-            ctls.setCountLimit(RESULT_SIZE_LIMIT);
-            ctls.setTimeLimit(0);
-    
-            //Specify the search filter to match
-            String filter = "(&(mail=primary="+email+"*))";
-            
-            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
-            String[] attrIDs = {"cn","mail","o","sn"};   
-            try
-            {
-            while (answer.hasMore()) 
-            {
-                Identity identity = new JBossIdentity();
-                SearchResult sr = (SearchResult)answer.next();
-                String uname = (String)sr.getAttributes().get("cn").get();                
-                String mail = (String)sr.getAttributes().get("mail").get();
-                String company = (String)sr.getAttributes().get("o").get();
-                String status = (String)sr.getAttributes().get("sn").get();
-                boolean activeStatus = Boolean.parseBoolean(status);                    
-                identity.setUserName(uname);
-                identity.setEmail(mail.substring(mail.indexOf("=")+1));
-                identity.setCompanyName(company);
-                identity.setActive(activeStatus);
-                identities.add(identity);
-            }   
-            }
-            catch(javax.naming.SizeLimitExceededException e)
-            {
-                //lets move on with whatever results are returned
-            }
-            
-            return identities;
-        }
-        catch(Exception e)
-        {
-            throw new IdentityException(e);
-        }
-        finally
-        {
-            if(ctx != null)
-            {
-                try{ctx.close();}catch(Exception e){}
-            }
-        }
-    }
-    
-    /**
-     * 
-     */
-    public Collection searchByFirstName(String firstName) throws IdentityException
-    {
-        DirContext ctx = null;
-        try
-        {
-            Collection identities = new ArrayList();  
-                                        
-            //Create initial context
-            ctx = new InitialDirContext(env);
-            
-            //get the attributes of this object
-            //Create the default search controls
-            SearchControls ctls = new SearchControls();
-            ctls.setCountLimit(RESULT_SIZE_LIMIT);
-            ctls.setTimeLimit(0);
-    
-            //Specify the search filter to match
-            String filter = "(&(givenName="+firstName+"*))";
-            
-            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
-            String[] attrIDs = {"cn","mail","o","sn"};   
-            try
-            {
-            while (answer.hasMore()) 
-            {
-                Identity identity = new JBossIdentity();
-                SearchResult sr = (SearchResult)answer.next();
-                String uname = (String)sr.getAttributes().get("cn").get();                
-                String mail = (String)sr.getAttributes().get("mail").get();
-                String company = (String)sr.getAttributes().get("o").get();
-                String status = (String)sr.getAttributes().get("sn").get();
-                boolean activeStatus = Boolean.parseBoolean(status);                    
-                identity.setUserName(uname);
-                identity.setEmail(mail.substring(mail.indexOf("=")+1));
-                identity.setCompanyName(company);
-                identity.setActive(activeStatus);
-                identities.add(identity);
-            }  
-            }
-            catch(javax.naming.SizeLimitExceededException e)
-            {
-                //lets move on with whatever results are returned
-            }
-
-            
-            return identities;
-        }
-        catch(Exception e)
-        {
-            throw new IdentityException(e);
-        }
-        finally
-        {
-            if(ctx != null)
-            {
-                try{ctx.close();}catch(Exception e){}
-            }
-        }
-    }
-    
-    /**
-     * 
-     */
-    public Collection searchByLastName(String lastName) throws IdentityException
-    {
-        DirContext ctx = null;
-        try
-        {
-            Collection identities = new ArrayList();  
-                                        
-            //Create initial context
-            ctx = new InitialDirContext(env);
-            
-            //get the attributes of this object
-            //Create the default search controls
-            SearchControls ctls = new SearchControls();
-            ctls.setCountLimit(RESULT_SIZE_LIMIT);
-            ctls.setTimeLimit(0);
-    
-            //Specify the search filter to match
-            String filter = "(&(cn=* "+lastName+"*))";
-            
-            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
-            String[] attrIDs = {"cn","mail","o","sn"}; 
-            try
-            {
-            while (answer.hasMore()) 
-            {
-                Identity identity = new JBossIdentity();
-                SearchResult sr = (SearchResult)answer.next();
-                String uname = (String)sr.getAttributes().get("cn").get();                
-                String mail = (String)sr.getAttributes().get("mail").get();
-                String company = (String)sr.getAttributes().get("o").get();
-                String status = (String)sr.getAttributes().get("sn").get();
-                boolean activeStatus = Boolean.parseBoolean(status);                    
-                identity.setUserName(uname);
-                identity.setEmail(mail.substring(mail.indexOf("=")+1));
-                identity.setCompanyName(company);
-                identity.setActive(activeStatus);
-                identities.add(identity);
-            } 
-            }
-            catch(javax.naming.SizeLimitExceededException e)
-            {
-                //lets move on with whatever results are returned
-            }
-
-            
-            return identities;
-        }
-        catch(Exception e)
-        {
-            throw new IdentityException(e);
-        }
-        finally
-        {
-            if(ctx != null)
-            {
-                try{ctx.close();}catch(Exception e){}
-            }
-        }
-    }
-    
-    /**
-     * 
-     */
-    public Collection searchByCompany(String companyName) throws IdentityException
-    {
-        DirContext ctx = null;
-        try
-        {
-            Collection identities = new ArrayList();  
-                                        
-            //Create initial context
-            ctx = new InitialDirContext(env);
-            
-            //get the attributes of this object
-            //Create the default search controls
-            SearchControls ctls = new SearchControls();
-            ctls.setCountLimit(RESULT_SIZE_LIMIT);
-            ctls.setTimeLimit(0);
-    
-            //Specify the search filter to match
-            String filter = "(&(o="+companyName+"*))";
-            
-            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
-            String[] attrIDs = {"cn","mail","o","sn"};   
-            try
-            {
-            while (answer.hasMore()) 
-            {
-                Identity identity = new JBossIdentity();
-                SearchResult sr = (SearchResult)answer.next();
-                String uname = (String)sr.getAttributes().get("cn").get();                
-                String mail = (String)sr.getAttributes().get("mail").get();
-                String company = (String)sr.getAttributes().get("o").get();
-                String status = (String)sr.getAttributes().get("sn").get();
-                boolean activeStatus = Boolean.parseBoolean(status);                    
-                identity.setUserName(uname);
-                identity.setEmail(mail.substring(mail.indexOf("=")+1));
-                identity.setCompanyName(company);
-                identity.setActive(activeStatus);
-                identities.add(identity);
-            }     
-            }
-            catch(javax.naming.SizeLimitExceededException e)
-            {
-                //lets move on with whatever results are returned
-            }
-
-            
-            return identities;
-        }
-        catch(Exception e)
-        {
-            throw new IdentityException(e);
-        }
-        finally
-        {
-            if(ctx != null)
-            {
-                try{ctx.close();}catch(Exception e){}
-            }
-        }
-    }        
-    //overriding methods-------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @param identity
-     * @throws Exception
-     */
-    protected void storeIdentity(Identity identity,boolean mustEncryptPassword) throws Exception
-    {
-        Connection connection = this.getConnection();
-        ParamIndex p = new ParamIndex();
-        JBossIdentity jbIdentity = (JBossIdentity)identity;
-        try
-        {
-            //get email multivalues
-            Collection emails = new ArrayList();
-            emails.add("primary="+identity.getEmail());
-            emails.addAll(identity.getOtherEmails());
-            if(Tools.isEmpty(emails))
-            {
-                emails.add(Identity.NULL);
-            }
-            String emailColumns = this.getMultiValueColumns(emails,"mail");
-            String emailValues = this.getMultiValueColumns(emails,"?");
-            
-            //get phone multivalues
-            Collection phones = new ArrayList();
-            phones.addAll(identity.getPhoneNumbers());
-            if(Tools.isEmpty(phones))
-            {
-                phones.add(Identity.NULL);
-            }
-            String phoneColumns = this.getMultiValueColumns(phones,"telephoneNumber");
-            String phoneValues = this.getMultiValueColumns(phones,"?");
-            
-            //get postalAddress multivalues
-            Collection postalAddress = new ArrayList();
-            if(!Tools.isEmpty(identity.getCompanyAddress().getStreet()))
-            {
-                postalAddress.add("street="+identity.getCompanyAddress().getStreet());
-            }
-            else
-            {
-                postalAddress.add("street="+Identity.NULL);
-            }
-            if(!Tools.isEmpty(identity.getCompanyAddress().getCity()))
-            {
-                postalAddress.add("city="+identity.getCompanyAddress().getCity());
-            }
-            else
-            {
-                postalAddress.add("city="+Identity.NULL);
-            }
-            if(!Tools.isEmpty(identity.getCompanyAddress().getState()))
-            {
-                postalAddress.add("state="+identity.getCompanyAddress().getState());
-            }
-            else
-            {
-                postalAddress.add("state="+Identity.NULL);
-            }
-            if(!Tools.isEmpty(identity.getCompanyAddress().getPostalCode()))
-            {
-                postalAddress.add("postalCode="+identity.getCompanyAddress().getPostalCode());
-            }
-            else
-            {
-                postalAddress.add("postalCode="+Identity.NULL);
-            }
-            if(!Tools.isEmpty(identity.getCompanyAddress().getCountry()))
-            {
-                postalAddress.add("country="+identity.getCompanyAddress().getCountry());
-            }
-            else
-            {
-                postalAddress.add("country="+Identity.NULL);
-            }
-            String postalAddressColumns = this.getMultiValueColumns(postalAddress,"postalAddress");
-            String postalAddressValues = this.getMultiValueColumns(postalAddress,"?");
-            
-            
-            String insert = MessageFormat.format(insertSQL,new Object[]{this.identityOu,emailColumns,emailValues,phoneColumns,phoneValues,
-            postalAddressColumns,postalAddressValues});
-                        
-            PreparedStatement st = connection.prepareStatement(insert);
-            
-            //generic identity data
-            String password = new String(identity.getPassword());
-            if(mustEncryptPassword)
-            {                
-                String encodedPassword = Tools.getEncodedPassword(password,"MD5");
-                password = encodedPassword;
-            }
-            
-            //these are the generic identity fields and are required from a JBoss Corp perspective
-            st.setString(p.getIndex(),"jbossIdentity");
-            st.setString(p.getIndex(),identity.getUserName());
-            st.setBoolean(p.getIndex(),identity.isActive());                
-            st.setString(p.getIndex(),password); 
-            
-            if(!Tools.isEmpty(jbIdentity.getFullName()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getFullName());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            
-            if(!Tools.isEmpty(jbIdentity.getFullName()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getFullName());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            
-            if(!Tools.isEmpty(jbIdentity.getCompanyName()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getCompanyName());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            
-            if(!Tools.isEmpty(jbIdentity.getCompanyRole()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getCompanyRole());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            
-            if(!Tools.isEmpty(jbIdentity.getCompanyTitle()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getCompanyTitle());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            
-            
-            //insert emails
-            for(Iterator itr=emails.iterator();itr.hasNext();)
-            {
-                String email = (String)itr.next();
-                st.setString(p.getIndex(),email);
-            }
-            //insert phones
-            for(Iterator itr=phones.iterator();itr.hasNext();)
-            {
-                String phone = (String)itr.next();
-                st.setString(p.getIndex(),phone);
-            }
-            //insert postal address
-            for(Iterator itr=postalAddress.iterator();itr.hasNext();)
-            {
-                String addressItem = (String)itr.next();
-                st.setString(p.getIndex(),addressItem);
-            }
-            
-            java.util.Date cour = new java.util.Date();                             
-            if(!Tools.isEmpty(jbIdentity.getSecretQuestion()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getSecretQuestion());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            if(!Tools.isEmpty(jbIdentity.getSecretAnswer()))
-            {
-                st.setString(p.getIndex(),jbIdentity.getSecretAnswer());
-            }
-            else
-            {
-                st.setString(p.getIndex(),"null");
-            }
-            
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(JBossCorpIdentityProvider.registrationDatePattern);
-            if(jbIdentity.getRegistrationDate()!=null)
-            {
-                st.setString(p.getIndex(),simpleDateFormat.format(jbIdentity.getRegistrationDate()));
-            }
-            else
-            {
-                st.setString(p.getIndex(),simpleDateFormat.format(new Date()));
-            }
-                                                            
-            try
-            {
-               st.executeUpdate();
-            }
-            finally
-            {                
-                if(st!=null)
-                {
-                    st.close();
-                }
-            }
-        }
-        finally
-        {
-            if(connection!=null)
-            {
-                connection.close();
-            }
-        }
-    }
-    
-    /**
-     * identity population method to be used by others...this is refactored code
-     * @param rs
-     * @return
-     */
-    protected Collection readIdentites(ResultSet rs) throws SQLException
-    {
-        Collection identities = new ArrayList();
-        while(rs.next())
-        {
-            JBossIdentity identity = new JBossIdentity();
-            
-            String cn = rs.getString("cn");
-            String cour = rs.getString("sn");
-            boolean active = Boolean.parseBoolean(cour);
-            String pass  = rs.getString("userPassword");                       
-            String givenName = rs.getString("givenName");
-            String companyName = rs.getString("o");
-            String companyRole = rs.getString("employeeType");
-            String companyTitle = rs.getString("title");
-            String postalAddress = rs.getString("postalAddress");
-            
-            //populate the identity
-            identity.setUserName(cn);
-            identity.setPassword(pass.getBytes());
-            identity.setActive(active);                       
-            
-            //optional fields                       
-            identity.setFullName(givenName);
-            
-            //company fields                       
-            identity.setCompanyName(companyName);
-            identity.setCompanyRole(companyRole);
-            identity.setCompanyTitle(companyTitle);
-            
-            //address fields                         
-            Collection addressValues = this.getMultiValues(postalAddress);
-            for(Iterator itr=addressValues.iterator();itr.hasNext();)
-            {
-                String addressItem = (String)itr.next();
-                int index = addressItem.indexOf('=');
-                String value = addressItem.substring(index+1).trim();
-                if(addressItem.startsWith("street"))
-                {
-                    identity.getCompanyAddress().setStreet(value);
-                }
-                else if(addressItem.startsWith("city"))
-                {
-                    identity.getCompanyAddress().setCity(value);
-                }
-                else if(addressItem.startsWith("state"))
-                {
-                    identity.getCompanyAddress().setState(value);
-                }
-                else if(addressItem.startsWith("postalCode"))
-                {
-                    identity.getCompanyAddress().setPostalCode(value);
-                }
-                else if(addressItem.startsWith("country"))
-                {
-                    identity.getCompanyAddress().setCountry(value);
-                }
-            }
-            
-            //grab the communication related information
-            String emails = rs.getString("mail");
-            String phoneNumbers = rs.getString("telephoneNumber");
-            Collection allEmails = this.getMultiValues(emails);
-            Collection allPhoneNumbers = this.getMultiValues(phoneNumbers);                       
-            identity.setPhoneNumbers(getMultiValues(phoneNumbers));
-            if(!Tools.isEmpty(allEmails))
-            {
-                Object[] emailArray = allEmails.toArray();
-                for(int i=0;i<emailArray.length;i++)
-                {
-                    String email = (String)emailArray[i];
-                    if(email.startsWith("primary"))
-                    {
-                        int index = email.indexOf('=');                        
-                        String value = email.substring(index+1).trim();
-                        identity.setEmail(value);
-                    }
-                    else
-                    {
-                        identity.addEmail(email);
-                    }
-                }
-            }
-            
-            //secret question,answer
-            String secretQuestion = rs.getString("secretQuestion");
-            String secretAnswer = rs.getString("secretAnswer");
-            ((JBossIdentity)identity).setSecretQuestion(secretQuestion);
-            ((JBossIdentity)identity).setSecretAnswer(secretAnswer);
-            
-            //registration Date
-            String registrationDate = rs.getString("registrationDate");
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(JBossCorpIdentityProvider.registrationDatePattern);
-            try
-            {
-                ((JBossIdentity)identity).setRegistrationDate(simpleDateFormat.parse(registrationDate));
-            }
-            catch(ParseException pe)
-            {
-                throw new IdentityException(pe);
-            }
-            
-            
-            identities.add(identity);
-        }
-        return identities;
-    }
-    
-    /**
-     * Checks if the specified username should be successfully authenticated using the specified password
-     * 
-     * @param username
-     * @param password
-     * @return
-     * @throws IdentityException
-     */
-    public boolean login(String username, byte[] password) throws IdentityException 
-    {
-       try
-       {
-           boolean loginSuccess = false;
-           
-           Identity identity = this.read(username);
-           
-           String storedPassword = new String(identity.getPassword());
-           String inputPassword = new String(Tools.getEncodedPassword(new String(password),"MD5"));
-           String nukesPassword = new String(org.jboss.website.security.Tools.md5AsHexString(new String(password)));
-           if(identity.isActive()
-                 &&
-              (storedPassword.equalsIgnoreCase(inputPassword) || storedPassword.equalsIgnoreCase(nukesPassword))
-           )
-           {
-               loginSuccess = true;
-           }
-           
-           return loginSuccess;
-       }
-       catch(Exception e)
-       {
-           throw new IdentityException(e);
-       }
-    }
-    //-----private internal implementation-------------------------------------------------------------------------------------------------------------        			        
-    /**
-     * 
-     * @author Sohil Shah - sohil.shah at jboss.com
-     *
-     */
-	private static class ParamIndex
-	{
-		private int index = 1;
-		private ParamIndex()
-		{			
-		}
-		int getIndex()
-		{
-			return index++;
-		}
-	}    
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossCorpIdentityProvider.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,780 @@
+package org.jboss.website.security;
+
+import java.sql.*;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+import org.apache.log4j.Logger;
+import org.jboss.security.idm.Identity;
+import org.jboss.security.idm.IdentityException;
+import org.jboss.security.idm.ldap.LDAPIdentityProvider;
+
+import org.jboss.security.util.Tools;
+
+
+public class JBossCorpIdentityProvider extends LDAPIdentityProvider 
+{
+	private static final Logger log = Logger.getLogger(JBossCorpIdentityProvider.class);
+    
+    private static final String registrationDatePattern = "yyyy-MM-DD";
+   
+    private static final String readSQL = "select cn,sn,userPassword,givenName,displayName,o,employeeType,title,postalAddress,mail," +
+    "telephoneNumber,secretQuestion,secretAnswer,registrationDate from cn={0},ou={1}";
+    
+    private static final String insertSQL = "insert into cn,ou={0}"+
+    "(objectclass,cn,sn,userPassword,givenName,displayName,o,employeeType,title,{1},{3},{5},secretQuestion,secretAnswer,registrationDate" +             
+    ") " +
+    "VALUES " +
+    "(" +
+    "?,?,?,?,?,?,?,?,?,{2},{4},{6},?,?,?" +
+    ")";
+    
+    private static final String searchSQL = "select cn,sn,userPassword,givenName," +
+    "displayName," +
+    "o,employeeType,title," +
+    "postalAddress,mail,telephoneNumber," +
+    "secretQuestion,secretAnswer," +
+    "registrationDate";
+    
+    private Hashtable env = new Hashtable(11);
+    
+    private static final int RESULT_SIZE_LIMIT = 100;
+ 
+    		
+    /**
+     *
+     */
+	public JBossCorpIdentityProvider()
+	{        
+	}
+   
+   public void setProperties(Properties properties) throws IdentityException
+   {
+      super.setProperties(properties);
+      env.put(Context.INITIAL_CONTEXT_FACTORY,"com.sun.jndi.ldap.LdapCtxFactory");
+      String ldapURL = properties.getProperty("connectionURL");
+      ldapURL = ldapURL.substring(ldapURL.indexOf(":")+1);      
+   }
+    
+    //identityProvider interface implementation--------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public Identity read(String username) throws IdentityException 
+    {
+        try
+        {
+            Identity identity = this.readIdentity(readSQL,username);                      
+            return identity;
+        }
+        catch(SQLException sqe)
+        {
+            throw new IdentityException(sqe);
+        }
+    }
+	    		    				                
+    //search interface-------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public Collection searchByUserName(String username) throws IdentityException
+    {
+        DirContext ctx = null;
+        try
+        {
+            Collection identities = new ArrayList();  
+                                        
+            //Create initial context
+            ctx = new InitialDirContext(env);
+            
+            //get the attributes of this object
+            //Create the default search controls
+            SearchControls ctls = new SearchControls();
+            ctls.setCountLimit(RESULT_SIZE_LIMIT);
+            ctls.setTimeLimit(0);
+    
+            //Specify the search filter to match
+            String filter = "(&(cn="+username+"*))";
+            
+            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
+            String[] attrIDs = {"cn","mail","o","sn"};  
+            try
+            {
+            while (answer.hasMore()) 
+            {
+                Identity identity = new JBossIdentity();
+                SearchResult sr = (SearchResult)answer.next();
+                String uname = (String)sr.getAttributes().get("cn").get();                
+                String mail = (String)sr.getAttributes().get("mail").get();
+                String company = (String)sr.getAttributes().get("o").get();
+                String status = (String)sr.getAttributes().get("sn").get();
+                boolean activeStatus = Boolean.parseBoolean(status);                    
+                identity.setUserName(uname);
+                identity.setEmail(mail.substring(mail.indexOf("=")+1));
+                identity.setCompanyName(company);
+                identity.setActive(activeStatus);
+                identities.add(identity);
+            }
+            }
+            catch(javax.naming.SizeLimitExceededException e)
+            {
+                //lets move on with whatever results are returned
+            }
+            
+            return identities;
+        }
+        catch(Exception e)
+        {
+            throw new IdentityException(e);
+        }
+        finally
+        {
+            if(ctx != null)
+            {
+                try{ctx.close();}catch(Exception e){}
+            }
+        }
+    }
+    
+    /**
+     * 
+     */
+    public Collection searchByEmail(String email) throws IdentityException
+    {
+        DirContext ctx = null;
+        try
+        {
+            Collection identities = new ArrayList();  
+                                        
+            //Create initial context
+            ctx = new InitialDirContext(env);
+            
+            //get the attributes of this object
+            //Create the default search controls
+            SearchControls ctls = new SearchControls();
+            ctls.setCountLimit(RESULT_SIZE_LIMIT);
+            ctls.setTimeLimit(0);
+    
+            //Specify the search filter to match
+            String filter = "(&(mail=primary="+email+"*))";
+            
+            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
+            String[] attrIDs = {"cn","mail","o","sn"};   
+            try
+            {
+            while (answer.hasMore()) 
+            {
+                Identity identity = new JBossIdentity();
+                SearchResult sr = (SearchResult)answer.next();
+                String uname = (String)sr.getAttributes().get("cn").get();                
+                String mail = (String)sr.getAttributes().get("mail").get();
+                String company = (String)sr.getAttributes().get("o").get();
+                String status = (String)sr.getAttributes().get("sn").get();
+                boolean activeStatus = Boolean.parseBoolean(status);                    
+                identity.setUserName(uname);
+                identity.setEmail(mail.substring(mail.indexOf("=")+1));
+                identity.setCompanyName(company);
+                identity.setActive(activeStatus);
+                identities.add(identity);
+            }   
+            }
+            catch(javax.naming.SizeLimitExceededException e)
+            {
+                //lets move on with whatever results are returned
+            }
+            
+            return identities;
+        }
+        catch(Exception e)
+        {
+            throw new IdentityException(e);
+        }
+        finally
+        {
+            if(ctx != null)
+            {
+                try{ctx.close();}catch(Exception e){}
+            }
+        }
+    }
+    
+    /**
+     * 
+     */
+    public Collection searchByFirstName(String firstName) throws IdentityException
+    {
+        DirContext ctx = null;
+        try
+        {
+            Collection identities = new ArrayList();  
+                                        
+            //Create initial context
+            ctx = new InitialDirContext(env);
+            
+            //get the attributes of this object
+            //Create the default search controls
+            SearchControls ctls = new SearchControls();
+            ctls.setCountLimit(RESULT_SIZE_LIMIT);
+            ctls.setTimeLimit(0);
+    
+            //Specify the search filter to match
+            String filter = "(&(givenName="+firstName+"*))";
+            
+            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
+            String[] attrIDs = {"cn","mail","o","sn"};   
+            try
+            {
+            while (answer.hasMore()) 
+            {
+                Identity identity = new JBossIdentity();
+                SearchResult sr = (SearchResult)answer.next();
+                String uname = (String)sr.getAttributes().get("cn").get();                
+                String mail = (String)sr.getAttributes().get("mail").get();
+                String company = (String)sr.getAttributes().get("o").get();
+                String status = (String)sr.getAttributes().get("sn").get();
+                boolean activeStatus = Boolean.parseBoolean(status);                    
+                identity.setUserName(uname);
+                identity.setEmail(mail.substring(mail.indexOf("=")+1));
+                identity.setCompanyName(company);
+                identity.setActive(activeStatus);
+                identities.add(identity);
+            }  
+            }
+            catch(javax.naming.SizeLimitExceededException e)
+            {
+                //lets move on with whatever results are returned
+            }
+
+            
+            return identities;
+        }
+        catch(Exception e)
+        {
+            throw new IdentityException(e);
+        }
+        finally
+        {
+            if(ctx != null)
+            {
+                try{ctx.close();}catch(Exception e){}
+            }
+        }
+    }
+    
+    /**
+     * 
+     */
+    public Collection searchByLastName(String lastName) throws IdentityException
+    {
+        DirContext ctx = null;
+        try
+        {
+            Collection identities = new ArrayList();  
+                                        
+            //Create initial context
+            ctx = new InitialDirContext(env);
+            
+            //get the attributes of this object
+            //Create the default search controls
+            SearchControls ctls = new SearchControls();
+            ctls.setCountLimit(RESULT_SIZE_LIMIT);
+            ctls.setTimeLimit(0);
+    
+            //Specify the search filter to match
+            String filter = "(&(cn=* "+lastName+"*))";
+            
+            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
+            String[] attrIDs = {"cn","mail","o","sn"}; 
+            try
+            {
+            while (answer.hasMore()) 
+            {
+                Identity identity = new JBossIdentity();
+                SearchResult sr = (SearchResult)answer.next();
+                String uname = (String)sr.getAttributes().get("cn").get();                
+                String mail = (String)sr.getAttributes().get("mail").get();
+                String company = (String)sr.getAttributes().get("o").get();
+                String status = (String)sr.getAttributes().get("sn").get();
+                boolean activeStatus = Boolean.parseBoolean(status);                    
+                identity.setUserName(uname);
+                identity.setEmail(mail.substring(mail.indexOf("=")+1));
+                identity.setCompanyName(company);
+                identity.setActive(activeStatus);
+                identities.add(identity);
+            } 
+            }
+            catch(javax.naming.SizeLimitExceededException e)
+            {
+                //lets move on with whatever results are returned
+            }
+
+            
+            return identities;
+        }
+        catch(Exception e)
+        {
+            throw new IdentityException(e);
+        }
+        finally
+        {
+            if(ctx != null)
+            {
+                try{ctx.close();}catch(Exception e){}
+            }
+        }
+    }
+    
+    /**
+     * 
+     */
+    public Collection searchByCompany(String companyName) throws IdentityException
+    {
+        DirContext ctx = null;
+        try
+        {
+            Collection identities = new ArrayList();  
+                                        
+            //Create initial context
+            ctx = new InitialDirContext(env);
+            
+            //get the attributes of this object
+            //Create the default search controls
+            SearchControls ctls = new SearchControls();
+            ctls.setCountLimit(RESULT_SIZE_LIMIT);
+            ctls.setTimeLimit(0);
+    
+            //Specify the search filter to match
+            String filter = "(&(o="+companyName+"*))";
+            
+            NamingEnumeration answer = ctx.search("ou=jbosssso",filter,ctls);
+            String[] attrIDs = {"cn","mail","o","sn"};   
+            try
+            {
+            while (answer.hasMore()) 
+            {
+                Identity identity = new JBossIdentity();
+                SearchResult sr = (SearchResult)answer.next();
+                String uname = (String)sr.getAttributes().get("cn").get();                
+                String mail = (String)sr.getAttributes().get("mail").get();
+                String company = (String)sr.getAttributes().get("o").get();
+                String status = (String)sr.getAttributes().get("sn").get();
+                boolean activeStatus = Boolean.parseBoolean(status);                    
+                identity.setUserName(uname);
+                identity.setEmail(mail.substring(mail.indexOf("=")+1));
+                identity.setCompanyName(company);
+                identity.setActive(activeStatus);
+                identities.add(identity);
+            }     
+            }
+            catch(javax.naming.SizeLimitExceededException e)
+            {
+                //lets move on with whatever results are returned
+            }
+
+            
+            return identities;
+        }
+        catch(Exception e)
+        {
+            throw new IdentityException(e);
+        }
+        finally
+        {
+            if(ctx != null)
+            {
+                try{ctx.close();}catch(Exception e){}
+            }
+        }
+    }        
+    //overriding methods-------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @param identity
+     * @throws Exception
+     */
+    protected void storeIdentity(Identity identity,boolean mustEncryptPassword) throws Exception
+    {
+        Connection connection = this.getConnection();
+        ParamIndex p = new ParamIndex();
+        JBossIdentity jbIdentity = (JBossIdentity)identity;
+        try
+        {
+            //get email multivalues
+            Collection emails = new ArrayList();
+            emails.add("primary="+identity.getEmail());
+            emails.addAll(identity.getOtherEmails());
+            if(Tools.isEmpty(emails))
+            {
+                emails.add(Identity.NULL);
+            }
+            String emailColumns = this.getMultiValueColumns(emails,"mail");
+            String emailValues = this.getMultiValueColumns(emails,"?");
+            
+            //get phone multivalues
+            Collection phones = new ArrayList();
+            phones.addAll(identity.getPhoneNumbers());
+            if(Tools.isEmpty(phones))
+            {
+                phones.add(Identity.NULL);
+            }
+            String phoneColumns = this.getMultiValueColumns(phones,"telephoneNumber");
+            String phoneValues = this.getMultiValueColumns(phones,"?");
+            
+            //get postalAddress multivalues
+            Collection postalAddress = new ArrayList();
+            if(!Tools.isEmpty(identity.getCompanyAddress().getStreet()))
+            {
+                postalAddress.add("street="+identity.getCompanyAddress().getStreet());
+            }
+            else
+            {
+                postalAddress.add("street="+Identity.NULL);
+            }
+            if(!Tools.isEmpty(identity.getCompanyAddress().getCity()))
+            {
+                postalAddress.add("city="+identity.getCompanyAddress().getCity());
+            }
+            else
+            {
+                postalAddress.add("city="+Identity.NULL);
+            }
+            if(!Tools.isEmpty(identity.getCompanyAddress().getState()))
+            {
+                postalAddress.add("state="+identity.getCompanyAddress().getState());
+            }
+            else
+            {
+                postalAddress.add("state="+Identity.NULL);
+            }
+            if(!Tools.isEmpty(identity.getCompanyAddress().getPostalCode()))
+            {
+                postalAddress.add("postalCode="+identity.getCompanyAddress().getPostalCode());
+            }
+            else
+            {
+                postalAddress.add("postalCode="+Identity.NULL);
+            }
+            if(!Tools.isEmpty(identity.getCompanyAddress().getCountry()))
+            {
+                postalAddress.add("country="+identity.getCompanyAddress().getCountry());
+            }
+            else
+            {
+                postalAddress.add("country="+Identity.NULL);
+            }
+            String postalAddressColumns = this.getMultiValueColumns(postalAddress,"postalAddress");
+            String postalAddressValues = this.getMultiValueColumns(postalAddress,"?");
+            
+            
+            String insert = MessageFormat.format(insertSQL,new Object[]{this.identityOu,emailColumns,emailValues,phoneColumns,phoneValues,
+            postalAddressColumns,postalAddressValues});
+                        
+            PreparedStatement st = connection.prepareStatement(insert);
+            
+            //generic identity data
+            String password = new String(identity.getPassword());
+            if(mustEncryptPassword)
+            {                
+                String encodedPassword = Tools.getEncodedPassword(password,"MD5");
+                password = encodedPassword;
+            }
+            
+            //these are the generic identity fields and are required from a JBoss Corp perspective
+            st.setString(p.getIndex(),"jbossIdentity");
+            st.setString(p.getIndex(),identity.getUserName());
+            st.setBoolean(p.getIndex(),identity.isActive());                
+            st.setString(p.getIndex(),password); 
+            
+            if(!Tools.isEmpty(jbIdentity.getFullName()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getFullName());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            
+            if(!Tools.isEmpty(jbIdentity.getFullName()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getFullName());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            
+            if(!Tools.isEmpty(jbIdentity.getCompanyName()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getCompanyName());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            
+            if(!Tools.isEmpty(jbIdentity.getCompanyRole()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getCompanyRole());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            
+            if(!Tools.isEmpty(jbIdentity.getCompanyTitle()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getCompanyTitle());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            
+            
+            //insert emails
+            for(Iterator itr=emails.iterator();itr.hasNext();)
+            {
+                String email = (String)itr.next();
+                st.setString(p.getIndex(),email);
+            }
+            //insert phones
+            for(Iterator itr=phones.iterator();itr.hasNext();)
+            {
+                String phone = (String)itr.next();
+                st.setString(p.getIndex(),phone);
+            }
+            //insert postal address
+            for(Iterator itr=postalAddress.iterator();itr.hasNext();)
+            {
+                String addressItem = (String)itr.next();
+                st.setString(p.getIndex(),addressItem);
+            }
+            
+            java.util.Date cour = new java.util.Date();                             
+            if(!Tools.isEmpty(jbIdentity.getSecretQuestion()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getSecretQuestion());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            if(!Tools.isEmpty(jbIdentity.getSecretAnswer()))
+            {
+                st.setString(p.getIndex(),jbIdentity.getSecretAnswer());
+            }
+            else
+            {
+                st.setString(p.getIndex(),"null");
+            }
+            
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(JBossCorpIdentityProvider.registrationDatePattern);
+            if(jbIdentity.getRegistrationDate()!=null)
+            {
+                st.setString(p.getIndex(),simpleDateFormat.format(jbIdentity.getRegistrationDate()));
+            }
+            else
+            {
+                st.setString(p.getIndex(),simpleDateFormat.format(new Date()));
+            }
+                                                            
+            try
+            {
+               st.executeUpdate();
+            }
+            finally
+            {                
+                if(st!=null)
+                {
+                    st.close();
+                }
+            }
+        }
+        finally
+        {
+            if(connection!=null)
+            {
+                connection.close();
+            }
+        }
+    }
+    
+    /**
+     * identity population method to be used by others...this is refactored code
+     * @param rs
+     * @return
+     */
+    protected Collection readIdentites(ResultSet rs) throws SQLException
+    {
+        Collection identities = new ArrayList();
+        while(rs.next())
+        {
+            JBossIdentity identity = new JBossIdentity();
+            
+            String cn = rs.getString("cn");
+            String cour = rs.getString("sn");
+            boolean active = Boolean.parseBoolean(cour);
+            String pass  = rs.getString("userPassword");                       
+            String givenName = rs.getString("givenName");
+            String companyName = rs.getString("o");
+            String companyRole = rs.getString("employeeType");
+            String companyTitle = rs.getString("title");
+            String postalAddress = rs.getString("postalAddress");
+            
+            //populate the identity
+            identity.setUserName(cn);
+            identity.setPassword(pass.getBytes());
+            identity.setActive(active);                       
+            
+            //optional fields                       
+            identity.setFullName(givenName);
+            
+            //company fields                       
+            identity.setCompanyName(companyName);
+            identity.setCompanyRole(companyRole);
+            identity.setCompanyTitle(companyTitle);
+            
+            //address fields                         
+            Collection addressValues = this.getMultiValues(postalAddress);
+            for(Iterator itr=addressValues.iterator();itr.hasNext();)
+            {
+                String addressItem = (String)itr.next();
+                int index = addressItem.indexOf('=');
+                String value = addressItem.substring(index+1).trim();
+                if(addressItem.startsWith("street"))
+                {
+                    identity.getCompanyAddress().setStreet(value);
+                }
+                else if(addressItem.startsWith("city"))
+                {
+                    identity.getCompanyAddress().setCity(value);
+                }
+                else if(addressItem.startsWith("state"))
+                {
+                    identity.getCompanyAddress().setState(value);
+                }
+                else if(addressItem.startsWith("postalCode"))
+                {
+                    identity.getCompanyAddress().setPostalCode(value);
+                }
+                else if(addressItem.startsWith("country"))
+                {
+                    identity.getCompanyAddress().setCountry(value);
+                }
+            }
+            
+            //grab the communication related information
+            String emails = rs.getString("mail");
+            String phoneNumbers = rs.getString("telephoneNumber");
+            Collection allEmails = this.getMultiValues(emails);
+            Collection allPhoneNumbers = this.getMultiValues(phoneNumbers);                       
+            identity.setPhoneNumbers(getMultiValues(phoneNumbers));
+            if(!Tools.isEmpty(allEmails))
+            {
+                Object[] emailArray = allEmails.toArray();
+                for(int i=0;i<emailArray.length;i++)
+                {
+                    String email = (String)emailArray[i];
+                    if(email.startsWith("primary"))
+                    {
+                        int index = email.indexOf('=');                        
+                        String value = email.substring(index+1).trim();
+                        identity.setEmail(value);
+                    }
+                    else
+                    {
+                        identity.addEmail(email);
+                    }
+                }
+            }
+            
+            //secret question,answer
+            String secretQuestion = rs.getString("secretQuestion");
+            String secretAnswer = rs.getString("secretAnswer");
+            ((JBossIdentity)identity).setSecretQuestion(secretQuestion);
+            ((JBossIdentity)identity).setSecretAnswer(secretAnswer);
+            
+            //registration Date
+            String registrationDate = rs.getString("registrationDate");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(JBossCorpIdentityProvider.registrationDatePattern);
+            try
+            {
+                ((JBossIdentity)identity).setRegistrationDate(simpleDateFormat.parse(registrationDate));
+            }
+            catch(ParseException pe)
+            {
+                throw new IdentityException(pe);
+            }
+            
+            
+            identities.add(identity);
+        }
+        return identities;
+    }
+    
+    /**
+     * Checks if the specified username should be successfully authenticated using the specified password
+     * 
+     * @param username
+     * @param password
+     * @return
+     * @throws IdentityException
+     */
+    public boolean login(String username, byte[] password) throws IdentityException 
+    {
+       try
+       {
+           boolean loginSuccess = false;
+           
+           Identity identity = this.read(username);
+           
+           String storedPassword = new String(identity.getPassword());
+           String inputPassword = new String(Tools.getEncodedPassword(new String(password),"MD5"));
+           String nukesPassword = new String(org.jboss.website.security.Tools.md5AsHexString(new String(password)));
+           if(identity.isActive()
+                 &&
+              (storedPassword.equalsIgnoreCase(inputPassword) || storedPassword.equalsIgnoreCase(nukesPassword))
+           )
+           {
+               loginSuccess = true;
+           }
+           
+           return loginSuccess;
+       }
+       catch(Exception e)
+       {
+           throw new IdentityException(e);
+       }
+    }
+    //-----private internal implementation-------------------------------------------------------------------------------------------------------------        			        
+    /**
+     * 
+     * @author Sohil Shah - sohil.shah at jboss.com
+     *
+     */
+	private static class ParamIndex
+	{
+		private int index = 1;
+		private ParamIndex()
+		{			
+		}
+		int getIndex()
+		{
+			return index++;
+		}
+	}    
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,93 +0,0 @@
-package org.jboss.website.security;
-
-import org.jboss.security.idm.Identity;
-
-import java.util.Date;
-
-
-public class JBossIdentity extends Identity
-{
-    /**
-     * 
-     */
-	public static final String NULL = "null";
-		
-    /**
-     * 
-     */
-	private String secretQuestion = null;
-	private String secretAnswer = null;
-	private Date registrationDate = null;
-	
-	/**
-     * 
-     *
-	 */
-	public JBossIdentity()
-	{
-		super();
-	}
-	
-	
-    /**
-     * 
-     * @return
-     */
-	public String getSecretQuestion()
-	{
-		return this.secretQuestion;
-	}
-	
-    /**
-     * 
-     * @param secretQuestion
-     */
-	public void setSecretQuestion(String secretQuestion)
-	{
-		if(secretQuestion!=null && secretQuestion.trim().equalsIgnoreCase(NULL))
-		{
-			secretQuestion = null;
-		}
-		this.secretQuestion = secretQuestion;
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	public String getSecretAnswer()
-	{		
-		return this.secretAnswer;
-	}
-	
-    /**
-     * 
-     * @param secretAnswer
-     */
-	public void setSecretAnswer(String secretAnswer)
-	{
-		if(secretAnswer!=null && secretAnswer.trim().equalsIgnoreCase(NULL))
-		{
-			secretAnswer = null;
-		}
-		this.secretAnswer = secretAnswer;
-	}
-	
-    /**
-     * 
-     * @param registrationDate
-     */
-	public void setRegistrationDate(Date registrationDate)
-    {
-      this.registrationDate = registrationDate;
-    }
-	
-    /**
-     * 
-     * @return
-     */
-	public Date getRegistrationDate()
-    {
-		return this.registrationDate;
-	}	
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/JBossIdentity.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,93 @@
+package org.jboss.website.security;
+
+import org.jboss.security.idm.Identity;
+
+import java.util.Date;
+
+
+public class JBossIdentity extends Identity
+{
+    /**
+     * 
+     */
+	public static final String NULL = "null";
+		
+    /**
+     * 
+     */
+	private String secretQuestion = null;
+	private String secretAnswer = null;
+	private Date registrationDate = null;
+	
+	/**
+     * 
+     *
+	 */
+	public JBossIdentity()
+	{
+		super();
+	}
+	
+	
+    /**
+     * 
+     * @return
+     */
+	public String getSecretQuestion()
+	{
+		return this.secretQuestion;
+	}
+	
+    /**
+     * 
+     * @param secretQuestion
+     */
+	public void setSecretQuestion(String secretQuestion)
+	{
+		if(secretQuestion!=null && secretQuestion.trim().equalsIgnoreCase(NULL))
+		{
+			secretQuestion = null;
+		}
+		this.secretQuestion = secretQuestion;
+	}
+	
+    /**
+     * 
+     * @return
+     */
+	public String getSecretAnswer()
+	{		
+		return this.secretAnswer;
+	}
+	
+    /**
+     * 
+     * @param secretAnswer
+     */
+	public void setSecretAnswer(String secretAnswer)
+	{
+		if(secretAnswer!=null && secretAnswer.trim().equalsIgnoreCase(NULL))
+		{
+			secretAnswer = null;
+		}
+		this.secretAnswer = secretAnswer;
+	}
+	
+    /**
+     * 
+     * @param registrationDate
+     */
+	public void setRegistrationDate(Date registrationDate)
+    {
+      this.registrationDate = registrationDate;
+    }
+	
+    /**
+     * 
+     * @return
+     */
+	public Date getRegistrationDate()
+    {
+		return this.registrationDate;
+	}	
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,177 +0,0 @@
-/*
- * Created on Nov 9, 2005
- *
- * @author sshah
- */
-package org.jboss.website.security;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.apache.log4j.Logger;
-
-//jboss-identity-management framework
-import org.jboss.security.idm.LoginProvider;
-import org.jboss.security.idm.IdentityManager;
-import org.jboss.security.idm.Identity;
-
-//jboss-acl framework
-import org.jboss.security.acl.Role;
-import org.jboss.security.acl.User;
-
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Jul 18, 2006
- *
- */
-public class Tools 
-{
-   /**
-    * 
-    */
-   private static Logger log = Logger.getLogger(Tools.class);
-   
-    public static String getEncodedPassword(String clearPassword) throws Exception
-    {
-        byte[] md5Hash = null;
-        
-        MessageDigest md = MessageDigest.getInstance("MD5");
-        md.update(clearPassword.getBytes());
-        md5Hash = md.digest();
-        
-        String hashPassword = Tools.encodeHex(md5Hash);
-        
-        return hashPassword;
-    }
-    
-    /**
-     * 
-     */
-    public static String encodeHex(byte[] bytes)
-    {
-        String encodedStr = null;
-        
-        //perform hex encoding of bytes
-        if(bytes!=null)
-        { 
-            byte ch = 0x00;
-            int i = 0;             
-            String pseudo[] = {"0", "1", "2","3", "4", "5", "6", "7", "8","9", "A", "B", "C", "D", "E","F"};
-
-            StringBuffer out = new StringBuffer(bytes.length * 2);
-            
-            while(i < bytes.length) 
-            {
-                ch = (byte) (bytes[i] & 0xF0); // Strip off high nibble
-
-                ch = (byte) (ch >>> 4); // shift the bits down
-
-                ch = (byte) (ch & 0x0F); //must do this is high order bit is on!
-
-                out.append(pseudo[(int) ch]); // convert the nibble to a String Character
-
-                ch = (byte) (bytes[i] & 0x0F); // Strip off low nibble 
-
-                out.append(pseudo[ (int) ch]); // convert the nibble to a String Character
-
-                i++;
-            }
-
-            encodedStr = out.toString().toLowerCase();
-        }
-        
-        return encodedStr;
-    }
-    
-    /**
-     *
-     * @param user
-     */
-    public static void populateRoles(User user)
-    {        
-        if(user!=null && user.getIdentity()!=null)
-        {
-            LoginProvider provider = IdentityManager.findLoginProvider();
-            Identity identity = provider.read(user.getIdentity().getUserName());
-            Collection roles = identity.getRoles(provider);
-            boolean isAuthenticatedAdded = false;
-            if(roles!=null)
-            {
-                for(Iterator itr=roles.iterator();itr.hasNext();)
-                {
-                    String roleName = (String)itr.next();                    
-                    Role role = new Role(roleName,roleName);
-                    user.getRoles().add(role);
-                    
-                    if(roleName.equals("User"))
-                    {
-                        isAuthenticatedAdded = true;
-                    }
-                }
-            }
-            
-            if(!isAuthenticatedAdded)
-            {
-                Role authenticated = new Role("User","User");
-                user.getRoles().add(authenticated);
-            }
-        }
-    }
-    
-    /**
-     * Computes an md5 hash of a string.
-     * @param text the hashed string
-     * @return the string hash
-     * @exception NullPointerException if text is null
-     */
-    public static byte[] md5(String text)
-    {
-       // arguments check
-       if (text == null)
-       {
-          throw new NullPointerException("null text");
-       }
-
-       try
-       {
-          MessageDigest md = MessageDigest.getInstance("MD5");
-          md.update(text.getBytes());
-          return md.digest();
-       }
-       catch (NoSuchAlgorithmException e)
-       {
-          log.error("Cannot find MD5 algorithm", e);
-          throw new RuntimeException("Cannot find MD5 algorithm");
-       }
-    }
-
-    /**
-     * Computes an md5 hash and returns the result as a string in hexadecimal format.
-     * @param text the hashed string
-     * @return the string hash
-     * @exception NullPointerException if text is null
-     */
-    public static String md5AsHexString(String text)
-    {
-       return toHexString(md5(text));
-    }
-
-    /**
-     * Returns a string in the hexadecimal format.
-     * @param bytes the converted bytes
-     * @return the hexadecimal string representing the bytes data
-     */
-    public static String toHexString(byte[] bytes)
-    {
-       StringBuffer hex = new StringBuffer();
-       for (int i = 0;i < bytes.length;i++)
-       {
-          hex.append(Character.forDigit((bytes[i] & 0XF0) >> 4, 16));
-          hex.append(Character.forDigit((bytes[i] & 0X0F), 16));
-       }
-       return hex.toString();
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-security/src/java/org/jboss/website/security/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,177 @@
+/*
+ * Created on Nov 9, 2005
+ *
+ * @author sshah
+ */
+package org.jboss.website.security;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.log4j.Logger;
+
+//jboss-identity-management framework
+import org.jboss.security.idm.LoginProvider;
+import org.jboss.security.idm.IdentityManager;
+import org.jboss.security.idm.Identity;
+
+//jboss-acl framework
+import org.jboss.security.acl.Role;
+import org.jboss.security.acl.User;
+
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Jul 18, 2006
+ *
+ */
+public class Tools 
+{
+   /**
+    * 
+    */
+   private static Logger log = Logger.getLogger(Tools.class);
+   
+    public static String getEncodedPassword(String clearPassword) throws Exception
+    {
+        byte[] md5Hash = null;
+        
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        md.update(clearPassword.getBytes());
+        md5Hash = md.digest();
+        
+        String hashPassword = Tools.encodeHex(md5Hash);
+        
+        return hashPassword;
+    }
+    
+    /**
+     * 
+     */
+    public static String encodeHex(byte[] bytes)
+    {
+        String encodedStr = null;
+        
+        //perform hex encoding of bytes
+        if(bytes!=null)
+        { 
+            byte ch = 0x00;
+            int i = 0;             
+            String pseudo[] = {"0", "1", "2","3", "4", "5", "6", "7", "8","9", "A", "B", "C", "D", "E","F"};
+
+            StringBuffer out = new StringBuffer(bytes.length * 2);
+            
+            while(i < bytes.length) 
+            {
+                ch = (byte) (bytes[i] & 0xF0); // Strip off high nibble
+
+                ch = (byte) (ch >>> 4); // shift the bits down
+
+                ch = (byte) (ch & 0x0F); //must do this is high order bit is on!
+
+                out.append(pseudo[(int) ch]); // convert the nibble to a String Character
+
+                ch = (byte) (bytes[i] & 0x0F); // Strip off low nibble 
+
+                out.append(pseudo[ (int) ch]); // convert the nibble to a String Character
+
+                i++;
+            }
+
+            encodedStr = out.toString().toLowerCase();
+        }
+        
+        return encodedStr;
+    }
+    
+    /**
+     *
+     * @param user
+     */
+    public static void populateRoles(User user)
+    {        
+        if(user!=null && user.getIdentity()!=null)
+        {
+            LoginProvider provider = IdentityManager.findLoginProvider();
+            Identity identity = provider.read(user.getIdentity().getUserName());
+            Collection roles = identity.getRoles(provider);
+            boolean isAuthenticatedAdded = false;
+            if(roles!=null)
+            {
+                for(Iterator itr=roles.iterator();itr.hasNext();)
+                {
+                    String roleName = (String)itr.next();                    
+                    Role role = new Role(roleName,roleName);
+                    user.getRoles().add(role);
+                    
+                    if(roleName.equals("User"))
+                    {
+                        isAuthenticatedAdded = true;
+                    }
+                }
+            }
+            
+            if(!isAuthenticatedAdded)
+            {
+                Role authenticated = new Role("User","User");
+                user.getRoles().add(authenticated);
+            }
+        }
+    }
+    
+    /**
+     * Computes an md5 hash of a string.
+     * @param text the hashed string
+     * @return the string hash
+     * @exception NullPointerException if text is null
+     */
+    public static byte[] md5(String text)
+    {
+       // arguments check
+       if (text == null)
+       {
+          throw new NullPointerException("null text");
+       }
+
+       try
+       {
+          MessageDigest md = MessageDigest.getInstance("MD5");
+          md.update(text.getBytes());
+          return md.digest();
+       }
+       catch (NoSuchAlgorithmException e)
+       {
+          log.error("Cannot find MD5 algorithm", e);
+          throw new RuntimeException("Cannot find MD5 algorithm");
+       }
+    }
+
+    /**
+     * Computes an md5 hash and returns the result as a string in hexadecimal format.
+     * @param text the hashed string
+     * @return the string hash
+     * @exception NullPointerException if text is null
+     */
+    public static String md5AsHexString(String text)
+    {
+       return toHexString(md5(text));
+    }
+
+    /**
+     * Returns a string in the hexadecimal format.
+     * @param bytes the converted bytes
+     * @return the hexadecimal string representing the bytes data
+     */
+    public static String toHexString(byte[] bytes)
+    {
+       StringBuffer hex = new StringBuffer();
+       for (int i = 0;i < bytes.length;i++)
+       {
+          hex.append(Character.forDigit((bytes[i] & 0XF0) >> 4, 16));
+          hex.append(Character.forDigit((bytes[i] & 0X0F), 16));
+       }
+       return hex.toString();
+    }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin)


Property changes on: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin
___________________________________________________________________
Name: svn:ignore
   + target


Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/maven.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,144 +0,0 @@
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">	
-	<!-- Default war-project goals -->
-
-	<goal name="all">		
-		<attainGoal name="prj-all"/>
-		<attainGoal name="clean"/>
-    	<attainGoal name="build"/>
-    	<attainGoal name="deploy"/>
-	</goal>
-	
-	<goal name="clean">
-		<ant:delete dir="${maven.build.dir}"/>
-		<ant:delete dir="${maven.build.dest}"/>
-	</goal>
-
-	<goal name="build">	
-		<attainGoal name="prj-war-build"/>
-		<attainGoal name="ejb"/>
-		<!--  generate a common jar file for this module -->
-   	 	<ant:jar destfile="target/jbwebsite-user-admin-common.jar"
-   	 		 basedir="target/classes"
-   	 		 excludes="**/ejb/*,**/bo/*"
-   	 	/>
-	</goal>
-	
-	<goal name="deploy">
-		<ant:delete dir="${local.deploy.dir}/user-admin.sar"/>		
-		<ant:copy 
-		tofile="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.ejb3"
-		file="target/jbwebsite-user-admin-1.0.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="target/jbwebsite-user-admin-common.jar"
-		/>		
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="target/jbwebsite-user-admin.war"
-		/>
-				
-		<!--  copy the dependencies as well -->		
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar/META-INF"
-		file="src/standalone/security/acl-mapping.xml"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar/META-INF"
-		file="src/standalone/security/acl-permissions.xml"
-		/>	
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../jbwebsite-common/target/jbosswebsite-common-1.0.jar"
-		/>		
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../jbwebsite-security/target/jbwebsite-security-1.0.jar"
-		/>				
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/validator/jars/oro.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/email/jars/commons-email-1.0.jar"
-		/>		
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/myfaces/jars/jsf-facelets.jar"
-		/>		
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/el/jars/el-api.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../binaries/maven-repo-addons/el/jars/el-ri.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../jboss-forums/binaries/portal-forums-ui.jar"
-		/>
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar"
-		file="../jboss-forums/binaries/forums-authz-plugin.jar"
-		/>				
-		
-		<!--  copy the main jboss-service.xml -->
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar/META-INF"
-		file="src/standalone/jboss-service.xml" overwrite="true"
-		/>
-		
-		<!-- copy the login-config.xml file -->
-		<ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar/conf"
-		file="src/standalone/conf/login-config.xml" overwrite="true"
-		/>
-		
-		<!--  update the deployed war file's web.xml and user-config.xml -->
-		<!--
-		<ant:unzip src="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.war" 
-		dest="${local.deploy.dir}/user-admin.sar/temp" overwrite="true"/>   	     	  
-   	    <ant:delete file="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.war"/>   	    
-  	    <ant:copy 
-		todir="${local.deploy.dir}/user-admin.sar/temp/WEB-INF"
-		overwrite="true"
-		>
-			<ant:fileset dir="src/standalone/WEB-INF"/>
-		</ant:copy>	    
-		<ant:zip basedir="${local.deploy.dir}/user-admin.sar/temp" 
-		destfile="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.war"/>
-		<ant:delete dir="${local.deploy.dir}/user-admin.sar/temp"/>
-		-->
-    </goal>
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/maven.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,144 @@
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">	
+	<!-- Default war-project goals -->
+
+	<goal name="all">		
+		<attainGoal name="prj-all"/>
+		<attainGoal name="clean"/>
+    	<attainGoal name="build"/>
+    	<attainGoal name="deploy"/>
+	</goal>
+	
+	<goal name="clean">
+		<ant:delete dir="${maven.build.dir}"/>
+		<ant:delete dir="${maven.build.dest}"/>
+	</goal>
+
+	<goal name="build">	
+		<attainGoal name="prj-war-build"/>
+		<attainGoal name="ejb"/>
+		<!--  generate a common jar file for this module -->
+   	 	<ant:jar destfile="target/jbwebsite-user-admin-common.jar"
+   	 		 basedir="target/classes"
+   	 		 excludes="**/ejb/*,**/bo/*"
+   	 	/>
+	</goal>
+	
+	<goal name="deploy">
+		<ant:delete dir="${local.deploy.dir}/user-admin.sar"/>		
+		<ant:copy 
+		tofile="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.ejb3"
+		file="target/jbwebsite-user-admin-1.0.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="target/jbwebsite-user-admin-common.jar"
+		/>		
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="target/jbwebsite-user-admin.war"
+		/>
+				
+		<!--  copy the dependencies as well -->		
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar/META-INF"
+		file="src/standalone/security/acl-mapping.xml"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar/META-INF"
+		file="src/standalone/security/acl-permissions.xml"
+		/>	
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../jbwebsite-common/target/jbosswebsite-common-1.0.jar"
+		/>		
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../jbwebsite-security/target/jbwebsite-security-1.0.jar"
+		/>				
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/jboss-sso/jars/jboss-identity-management.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/jboss-sso/jars/jboss-security-common.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/jboss-sso/jars/jboss-acl.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/jboss-sso/jars/commons-jexl-1.0.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/ldap/jars/jdbcLdapJldap.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/validator/jars/commons-validator-1.2.0.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/validator/jars/oro.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/email/jars/commons-email-1.0.jar"
+		/>		
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/myfaces/jars/jsf-facelets.jar"
+		/>		
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/el/jars/el-api.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../binaries/maven-repo-addons/el/jars/el-ri.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../jboss-forums/binaries/portal-forums-ui.jar"
+		/>
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar"
+		file="../jboss-forums/binaries/forums-authz-plugin.jar"
+		/>				
+		
+		<!--  copy the main jboss-service.xml -->
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar/META-INF"
+		file="src/standalone/jboss-service.xml" overwrite="true"
+		/>
+		
+		<!-- copy the login-config.xml file -->
+		<ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar/conf"
+		file="src/standalone/conf/login-config.xml" overwrite="true"
+		/>
+		
+		<!--  update the deployed war file's web.xml and user-config.xml -->
+		<!--
+		<ant:unzip src="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.war" 
+		dest="${local.deploy.dir}/user-admin.sar/temp" overwrite="true"/>   	     	  
+   	    <ant:delete file="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.war"/>   	    
+  	    <ant:copy 
+		todir="${local.deploy.dir}/user-admin.sar/temp/WEB-INF"
+		overwrite="true"
+		>
+			<ant:fileset dir="src/standalone/WEB-INF"/>
+		</ant:copy>	    
+		<ant:zip basedir="${local.deploy.dir}/user-admin.sar/temp" 
+		destfile="${local.deploy.dir}/user-admin.sar/jbwebsite-user-admin.war"/>
+		<ant:delete dir="${local.deploy.dir}/user-admin.sar/temp"/>
+		-->
+    </goal>
+</project>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/project.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,4 +0,0 @@
-maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
-maven.war.src=${basedir}/src/web
-maven.war.classes.excludes=**/ui/*,**/ejb/*,**/bo/*
-maven.ejb.includes=**/ejb/*,**/bo/*

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/project.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,4 @@
+maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
+maven.war.src=${basedir}/src/web
+maven.war.classes.excludes=**/ui/*,**/ejb/*,**/bo/*
+maven.ejb.includes=**/ejb/*,**/bo/*

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/project.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,154 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
-    <id>jbwebsite-user-admin</id>
-    <name>user-admin</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Sohil Shah</name>
-        <url>http://www.jboss.org</url>
-    </organization>
-    <description></description>
-    
-    <dependencies>
-    
-    <!--  application level dependencies -->        
-    <dependency>
-	    <groupId>jbosswebsite</groupId>
-	    <artifactId>jbosswebsite-common</artifactId>
-	    <version>1.0</version>
-	</dependency>
-	<dependency>
-	    <groupId>jbosswebsite</groupId>
-	    <artifactId>jbwebsite-security</artifactId>
-	    <version>1.0</version>
-	</dependency>
-	
-	<!--  jboss-sso framework dependency -->
-	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-identity-management</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-identity-management.jar</jar>
-    </dependency>
-    <dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-acl</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-acl.jar</jar>
-    </dependency>
-    <dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-security-common</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-security-common.jar</jar>
-    </dependency>
-    
-    <!-- myfaces -->
-    <dependency>
-    		<groupId>myfaces</groupId>
-            <artifactId>myfaces-all</artifactId>
-            <version>1.1.1</version>
-            <jar>myfaces-all-1.1.1.jar</jar>
-    </dependency>
-	
-	<!--  commons-httpclient -->
-	<dependency>
-	    <groupId>commons</groupId>
-	    <artifactId>commons-httpclient</artifactId>
-	    <version>2.0.2</version>
-	    <jar>commons-httpclient-2.0.2.jar</jar>
-	</dependency>
-	
-	<dependency>
-            <groupId>validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.2.0</version>
-            <jar>commons-validator-1.2.0.jar</jar>
-    </dependency>
-	
-	<!--dependency>
-	    <groupId>seam</groupId>
-	    <artifactId>seam</artifactId>
-	    <version>1.0</version>
-	    <jar>jboss-seam.jar</jar>
-	</dependency-->
-	
-	<!-- core jboss dependencies -->
-	<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>hibernate3</artifactId>
-            <version>1.0</version>
-            <jar>hibernate3.jar</jar>
-    	</dependency>
-    	    	
-    	<dependency>
-                <groupId>jboss</groupId>
-                <artifactId>jboss-j2ee</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-j2ee.jar</jar>
-    	</dependency>    	    	
-    	    		   
-	   <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.0</version>
-            <jar>activation.jar</jar>
-        </dependency>
-            	
-    	<dependency>
-		    <groupId>jboss</groupId>
-		    <artifactId>jsp</artifactId>
-		    <version>1.0</version>
-		    <jar>javax.servlet.jsp.jar</jar>
-    	</dependency>
-		
-		<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-ejb3</artifactId>
-            <version>1.0</version>
-            <jar>jboss-ejb3.jar</jar>
-        </dependency>
-        
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-ejb3x</artifactId>
-            <version>1.0</version>
-            <jar>jboss-ejb3x.jar</jar>
-        </dependency>
-                
-        <dependency>
-                <groupId>jboss</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.0</version>
-                <jar>log4j.jar</jar>
-    	</dependency>
-    		   
-	   <dependency>
-                <groupId>jboss</groupId>
-                <artifactId>javax.servlet</artifactId>
-                <version>1.0</version>
-                <jar>javax.servlet.jar</jar>
-       </dependency>
-                  	
-    	<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-system</artifactId>
-            <version>1.0</version>
-            <jar>jboss-system.jar</jar>
-    	</dependency>
-    	
-    	<dependency>
-    		<groupId>jboss</groupId>
-    		<artifactId>jbosssx</artifactId>
-    		<version>3.2.3</version>
-    		<jar>jbosssx.jar</jar>
-		</dependency>
-   </dependencies>
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/project.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/project.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../common.xml</extend>
+    <id>jbwebsite-user-admin</id>
+    <name>user-admin</name>
+    <currentVersion>1.0</currentVersion>
+    <organization>
+        <name>Sohil Shah</name>
+        <url>http://www.jboss.org</url>
+    </organization>
+    <description></description>
+    
+    <dependencies>
+    
+    <!--  application level dependencies -->        
+    <dependency>
+	    <groupId>jbosswebsite</groupId>
+	    <artifactId>jbosswebsite-common</artifactId>
+	    <version>1.0</version>
+	</dependency>
+	<dependency>
+	    <groupId>jbosswebsite</groupId>
+	    <artifactId>jbwebsite-security</artifactId>
+	    <version>1.0</version>
+	</dependency>
+	
+	<!--  jboss-sso framework dependency -->
+	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-identity-management</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-identity-management.jar</jar>
+    </dependency>
+    <dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-acl</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-acl.jar</jar>
+    </dependency>
+    <dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-security-common</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-security-common.jar</jar>
+    </dependency>
+    
+    <!-- myfaces -->
+    <dependency>
+    		<groupId>myfaces</groupId>
+            <artifactId>myfaces-all</artifactId>
+            <version>1.1.1</version>
+            <jar>myfaces-all-1.1.1.jar</jar>
+    </dependency>
+	
+	<!--  commons-httpclient -->
+	<dependency>
+	    <groupId>commons</groupId>
+	    <artifactId>commons-httpclient</artifactId>
+	    <version>2.0.2</version>
+	    <jar>commons-httpclient-2.0.2.jar</jar>
+	</dependency>
+	
+	<dependency>
+            <groupId>validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.2.0</version>
+            <jar>commons-validator-1.2.0.jar</jar>
+    </dependency>
+	
+	<!--dependency>
+	    <groupId>seam</groupId>
+	    <artifactId>seam</artifactId>
+	    <version>1.0</version>
+	    <jar>jboss-seam.jar</jar>
+	</dependency-->
+	
+	<!-- core jboss dependencies -->
+	<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>hibernate3</artifactId>
+            <version>1.0</version>
+            <jar>hibernate3.jar</jar>
+    	</dependency>
+    	    	
+    	<dependency>
+                <groupId>jboss</groupId>
+                <artifactId>jboss-j2ee</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-j2ee.jar</jar>
+    	</dependency>    	    	
+    	    		   
+	   <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.0</version>
+            <jar>activation.jar</jar>
+        </dependency>
+            	
+    	<dependency>
+		    <groupId>jboss</groupId>
+		    <artifactId>jsp</artifactId>
+		    <version>1.0</version>
+		    <jar>javax.servlet.jsp.jar</jar>
+    	</dependency>
+		
+		<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-ejb3</artifactId>
+            <version>1.0</version>
+            <jar>jboss-ejb3.jar</jar>
+        </dependency>
+        
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-ejb3x</artifactId>
+            <version>1.0</version>
+            <jar>jboss-ejb3x.jar</jar>
+        </dependency>
+                
+        <dependency>
+                <groupId>jboss</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.0</version>
+                <jar>log4j.jar</jar>
+    	</dependency>
+    		   
+	   <dependency>
+                <groupId>jboss</groupId>
+                <artifactId>javax.servlet</artifactId>
+                <version>1.0</version>
+                <jar>javax.servlet.jar</jar>
+       </dependency>
+                  	
+    	<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-system</artifactId>
+            <version>1.0</version>
+            <jar>jboss-system.jar</jar>
+    	</dependency>
+    	
+    	<dependency>
+    		<groupId>jboss</groupId>
+    		<artifactId>jbosssx</artifactId>
+    		<version>3.2.3</version>
+    		<jar>jbosssx.jar</jar>
+		</dependency>
+   </dependencies>
+</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,140 +0,0 @@
-package org.jboss.website.user.bo;
-
-
-import org.apache.log4j.Logger;
-
-
-
-import org.jboss.website.bo.AbstractBean;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 27, 2006
- *
- */
-public class ProfileBean extends AbstractBean
-{
-	private static final Logger log = Logger.getLogger(ProfileBean.class);
-	
-	//foreign key association with the user (one-to-one mapping)
-	private UserBean user = null;
-	
-	//more information about the company that this user belongs to
-	private String companyType=null;
-	private String companySize = null;
-	private String interestType = null;
-	private String industry = null;
-	
-	//type of communication
-	private boolean newsLetter = false;
-	private boolean salesContact = false;
-	private boolean supportContact = false;
-	
-	/**
-     * 
-     *
-	 */	
-	public ProfileBean()
-	{
-		super();
-	}
-    
-    /**
-     * 
-     * @param object
-     */
-    public void sync(Object object)
-    {
-          if(!(object instanceof ProfileBean))
-          {
-              return;
-          }
-          
-          ProfileBean input = (ProfileBean)object;      
-          this.companyType = input.companyType;
-          this.companySize = input.companySize;
-          this.interestType = input.interestType;
-          this.industry = input.industry;
-          this.newsLetter = input.newsLetter;
-          this.salesContact = input.salesContact;
-          this.supportContact = input.supportContact;
-    }
-    
-    	
-	public UserBean getUser()
-	{
-		return this.user;
-	}
-	
-	public void setUser(UserBean user)
-	{
-		this.user = user;
-	}
-	
-   public void setCompanyType(String companyType)
-   {
-      this.companyType = companyType;
-   }
-   public String getCompanyType()
-   {
-      return this.companyType;
-   }
-   
-   public void setCompanySize(String companySize)
-   {
-      this.companySize = companySize;
-   }
-   public String getCompanySize()
-   {
-      return this.companySize;
-   }
-   
-   public void setInterestType(String interestType)
-   {
-      this.interestType = interestType;
-   }
-   public String getInterestType()
-   {
-      return this.interestType;
-   }
-   
-   public void setIndustry(String industry)
-   {
-      this.industry = industry;
-   }
-   
-   public String getIndustry()
-   {
-      return this.industry;
-   }
-   
-   public void setNewsLetter(boolean newsLetter)
-   {
-      this.newsLetter = newsLetter;
-   }
-   
-   public boolean getNewsLetter()
-   {
-      return this.newsLetter;
-   }
-   
-   public boolean getSalesContact()
-   {
-      return this.salesContact;
-   }
-   
-   public void setSalesContact(boolean salesContact)
-   {
-      this.salesContact = salesContact;
-   }
-   
-   public boolean getSupportContact()
-   {
-      return this.supportContact;
-   }
-   
-   public void setSupportContact(boolean supportContact)
-   {
-      this.supportContact = supportContact;
-   }   
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/ProfileBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,140 @@
+package org.jboss.website.user.bo;
+
+
+import org.apache.log4j.Logger;
+
+
+
+import org.jboss.website.bo.AbstractBean;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 27, 2006
+ *
+ */
+public class ProfileBean extends AbstractBean
+{
+	private static final Logger log = Logger.getLogger(ProfileBean.class);
+	
+	//foreign key association with the user (one-to-one mapping)
+	private UserBean user = null;
+	
+	//more information about the company that this user belongs to
+	private String companyType=null;
+	private String companySize = null;
+	private String interestType = null;
+	private String industry = null;
+	
+	//type of communication
+	private boolean newsLetter = false;
+	private boolean salesContact = false;
+	private boolean supportContact = false;
+	
+	/**
+     * 
+     *
+	 */	
+	public ProfileBean()
+	{
+		super();
+	}
+    
+    /**
+     * 
+     * @param object
+     */
+    public void sync(Object object)
+    {
+          if(!(object instanceof ProfileBean))
+          {
+              return;
+          }
+          
+          ProfileBean input = (ProfileBean)object;      
+          this.companyType = input.companyType;
+          this.companySize = input.companySize;
+          this.interestType = input.interestType;
+          this.industry = input.industry;
+          this.newsLetter = input.newsLetter;
+          this.salesContact = input.salesContact;
+          this.supportContact = input.supportContact;
+    }
+    
+    	
+	public UserBean getUser()
+	{
+		return this.user;
+	}
+	
+	public void setUser(UserBean user)
+	{
+		this.user = user;
+	}
+	
+   public void setCompanyType(String companyType)
+   {
+      this.companyType = companyType;
+   }
+   public String getCompanyType()
+   {
+      return this.companyType;
+   }
+   
+   public void setCompanySize(String companySize)
+   {
+      this.companySize = companySize;
+   }
+   public String getCompanySize()
+   {
+      return this.companySize;
+   }
+   
+   public void setInterestType(String interestType)
+   {
+      this.interestType = interestType;
+   }
+   public String getInterestType()
+   {
+      return this.interestType;
+   }
+   
+   public void setIndustry(String industry)
+   {
+      this.industry = industry;
+   }
+   
+   public String getIndustry()
+   {
+      return this.industry;
+   }
+   
+   public void setNewsLetter(boolean newsLetter)
+   {
+      this.newsLetter = newsLetter;
+   }
+   
+   public boolean getNewsLetter()
+   {
+      return this.newsLetter;
+   }
+   
+   public boolean getSalesContact()
+   {
+      return this.salesContact;
+   }
+   
+   public void setSalesContact(boolean salesContact)
+   {
+      this.salesContact = salesContact;
+   }
+   
+   public boolean getSupportContact()
+   {
+      return this.supportContact;
+   }
+   
+   public void setSupportContact(boolean supportContact)
+   {
+      this.supportContact = supportContact;
+   }   
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,289 +0,0 @@
-package org.jboss.website.user.bo;
-
-import java.util.Iterator;
-import org.apache.log4j.Logger;
-import org.hibernate.*;
-
-import org.jboss.website.hibernate.Tools;
-import org.jboss.website.bo.AbstractBean;
-import org.jboss.website.bo.DomainException;
-
-import org.jboss.website.security.JBossIdentity;
-import org.jboss.website.validation.ValidationException;
-
-
-import org.jboss.security.idm.IdentityManager;
-import org.jboss.security.idm.LoginProvider;
-
-
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class UserBean extends AbstractBean
-{
-	private static final Logger log = Logger.getLogger(UserBean.class);
-	
-	private String userName=null; //this user's unique identifier
-    private boolean forceResetEnabled = false; //this is used to force a password reset on a user's account
-    private String oldNukesPass = null;
-	
-	private JBossIdentity identity = null; //represents the SSO Identity of this user on JBoss.com
-	private ProfileBean profile = null; //represents marketing information about this user
-	
-    /**
-     * 
-     *
-     */
-	public UserBean()
-	{
-		super();		        
-	}
-    
-   /**
-    * 
-    * @param userName
-    */  	
-   public void setUserName(String userName)
-   {
-      this.userName = userName;
-   }
-   /**
-    * 
-    * @return
-    */
-   public String getUserName()
-   {
-      return this.userName;
-   }
-   
-   /**
-    * 
-    * @return
-    */   
-   public boolean isForceResetEnabled() 
-   {
-       return forceResetEnabled;
-   }
-
-   /**
-    * 
-    * @param forceResetEnabled
-    */
-   public void setForceResetEnabled(boolean forceResetEnabled) 
-   {
-       this.forceResetEnabled = forceResetEnabled;
-   }
-      
-   /**
-    * 
-    * @return
-    */
-   public String getOldNukesPass() 
-   {
-       return oldNukesPass;
-   }
-
-   /**
-    * 
-    * @param oldNukesPass
-    */
-   public void setOldNukesPass(String oldNukesPass) 
-   {
-       this.oldNukesPass = oldNukesPass;
-   }
-
-   /**
-    * 
-    * @return
-    */
-   public JBossIdentity getIdentity()
-   {
-	   return this.identity;
-   }
-   /**
-    * 
-    * @param identity
-    */
-   public void setIdentity(JBossIdentity identity)
-   {
-	   this.identity = identity;
-   }
-   /**
-    * 
-    * @return
-    */
-   public ProfileBean getProfile()
-   {
-	   return this.profile;
-   }
-   /**
-    * 
-    * @param profile
-    */
-   public void setProfile(ProfileBean profile)
-   {
-	   this.profile = profile;
-	   this.profile.setUser(this);
-   }
-   
-   /**
-    * 
-    */
-   public void save() throws DomainException
-   {
-       super.save();
-   }
-   
-   /**
-    * 
-    */
-   public void remove() throws DomainException
-   {
-       super.remove();
-   }
-   
-   /**
-    * 
-    * @param object
-    */
-   public void sync(Object object)
-   {
-      if(!(object instanceof UserBean))
-      {
-          return;
-      }
-      
-      UserBean input = (UserBean)object;
-      this.setUserName(input.getUserName()); 
-      this.profile.sync(input.getProfile());
-      
-      //TODO: remove this code...this is only for cluster testing
-      this.setForceResetEnabled(input.isForceResetEnabled());
-   }
-   
-   /**
-    * 
-    */
-   public void validate() throws ValidationException
-   {
-	   if(!this.isValidated())
-	   {
-		   if(UserBean.doesUserExist(this.userName))
-		   {
-			   throw new ValidationException(this.userName+" already exists.");
-		   }
-	   }	   
-	   //validate the object in general
-	   super.validate();
-   }
-   
-   /**
-    * 
-    * @return
-    */
-   public String getPassword()
-   {
-	   String password = null;
-	   
-	   if(this.identity!=null && this.identity.getPassword()!=null)
-	   {
-		   password = new String(this.identity.getPassword());
-	   }
-	   
-	   return password;
-   }
-             
-   //queries for loading instances of users from the database------------------------------------------------------------------------------------------
-   /**
-    * 
-    */
-   public static boolean doesUserExist(String userName)
-   {
-	   	//check for the existence of the username already
-	    //make sure this username is not already used
-	    LoginProvider provider = IdentityManager.findLoginProvider();			
-		return provider.exists(userName); 
-   }
-   
-   /**
-    * 
-    * @param userName
-    * @return
-    * @throws DomainException
-    */
-   public static UserBean readByUserName(String userName) throws DomainException
-   {
-	   UserBean user = null;
-	   Session session = null;
-	   Transaction tx = null;
-	   try
-	   {
-		  session = Tools.getCurrentSession();
-		  tx = session.beginTransaction();
-		  
-		  //setup the query
-		  Query query = session.createQuery("from UserBean as u where u.userName=:userName");
-          query.setString("userName", userName);
-          
-          user = (UserBean)query.uniqueResult();
-		  
-		  tx.commit();
-	   }
-	   catch(Exception e)
-	   {		  
-		  UserBean.log.error(user,e);
-		  if(tx!=null)
-		  {
-			  tx.rollback();
-		  }
-		  throw new DomainException(e);
-	   }
-	   finally
-	   {
-		  Tools.closeSession(session);
-	   }
-	   return user;
-   }
-   
-   /**
-    * 
-    * @param userName
-    * @return
-    * @throws DomainException
-    */
-   public static Iterator readAll() throws DomainException
-   {
-       Iterator users = null;
-       Session session = null;
-       Transaction tx = null;
-       try
-       {
-          session = Tools.getCurrentSession();
-          tx = session.beginTransaction();
-          
-          //setup the query
-          Query query = session.createQuery("from UserBean as u");
-          
-          users = query.iterate();
-          
-          tx.commit();
-       }
-       catch(Exception e)
-       {          
-          UserBean.log.error("UserBean",e);
-          if(tx!=null)
-          {
-              tx.rollback();
-          }
-          throw new DomainException(e);
-       }
-       finally
-       {
-          Tools.closeSession(session);
-       }
-       return users;
-   }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/bo/UserBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,289 @@
+package org.jboss.website.user.bo;
+
+import java.util.Iterator;
+import org.apache.log4j.Logger;
+import org.hibernate.*;
+
+import org.jboss.website.hibernate.Tools;
+import org.jboss.website.bo.AbstractBean;
+import org.jboss.website.bo.DomainException;
+
+import org.jboss.website.security.JBossIdentity;
+import org.jboss.website.validation.ValidationException;
+
+
+import org.jboss.security.idm.IdentityManager;
+import org.jboss.security.idm.LoginProvider;
+
+
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class UserBean extends AbstractBean
+{
+	private static final Logger log = Logger.getLogger(UserBean.class);
+	
+	private String userName=null; //this user's unique identifier
+    private boolean forceResetEnabled = false; //this is used to force a password reset on a user's account
+    private String oldNukesPass = null;
+	
+	private JBossIdentity identity = null; //represents the SSO Identity of this user on JBoss.com
+	private ProfileBean profile = null; //represents marketing information about this user
+	
+    /**
+     * 
+     *
+     */
+	public UserBean()
+	{
+		super();		        
+	}
+    
+   /**
+    * 
+    * @param userName
+    */  	
+   public void setUserName(String userName)
+   {
+      this.userName = userName;
+   }
+   /**
+    * 
+    * @return
+    */
+   public String getUserName()
+   {
+      return this.userName;
+   }
+   
+   /**
+    * 
+    * @return
+    */   
+   public boolean isForceResetEnabled() 
+   {
+       return forceResetEnabled;
+   }
+
+   /**
+    * 
+    * @param forceResetEnabled
+    */
+   public void setForceResetEnabled(boolean forceResetEnabled) 
+   {
+       this.forceResetEnabled = forceResetEnabled;
+   }
+      
+   /**
+    * 
+    * @return
+    */
+   public String getOldNukesPass() 
+   {
+       return oldNukesPass;
+   }
+
+   /**
+    * 
+    * @param oldNukesPass
+    */
+   public void setOldNukesPass(String oldNukesPass) 
+   {
+       this.oldNukesPass = oldNukesPass;
+   }
+
+   /**
+    * 
+    * @return
+    */
+   public JBossIdentity getIdentity()
+   {
+	   return this.identity;
+   }
+   /**
+    * 
+    * @param identity
+    */
+   public void setIdentity(JBossIdentity identity)
+   {
+	   this.identity = identity;
+   }
+   /**
+    * 
+    * @return
+    */
+   public ProfileBean getProfile()
+   {
+	   return this.profile;
+   }
+   /**
+    * 
+    * @param profile
+    */
+   public void setProfile(ProfileBean profile)
+   {
+	   this.profile = profile;
+	   this.profile.setUser(this);
+   }
+   
+   /**
+    * 
+    */
+   public void save() throws DomainException
+   {
+       super.save();
+   }
+   
+   /**
+    * 
+    */
+   public void remove() throws DomainException
+   {
+       super.remove();
+   }
+   
+   /**
+    * 
+    * @param object
+    */
+   public void sync(Object object)
+   {
+      if(!(object instanceof UserBean))
+      {
+          return;
+      }
+      
+      UserBean input = (UserBean)object;
+      this.setUserName(input.getUserName()); 
+      this.profile.sync(input.getProfile());
+      
+      //TODO: remove this code...this is only for cluster testing
+      this.setForceResetEnabled(input.isForceResetEnabled());
+   }
+   
+   /**
+    * 
+    */
+   public void validate() throws ValidationException
+   {
+	   if(!this.isValidated())
+	   {
+		   if(UserBean.doesUserExist(this.userName))
+		   {
+			   throw new ValidationException(this.userName+" already exists.");
+		   }
+	   }	   
+	   //validate the object in general
+	   super.validate();
+   }
+   
+   /**
+    * 
+    * @return
+    */
+   public String getPassword()
+   {
+	   String password = null;
+	   
+	   if(this.identity!=null && this.identity.getPassword()!=null)
+	   {
+		   password = new String(this.identity.getPassword());
+	   }
+	   
+	   return password;
+   }
+             
+   //queries for loading instances of users from the database------------------------------------------------------------------------------------------
+   /**
+    * 
+    */
+   public static boolean doesUserExist(String userName)
+   {
+	   	//check for the existence of the username already
+	    //make sure this username is not already used
+	    LoginProvider provider = IdentityManager.findLoginProvider();			
+		return provider.exists(userName); 
+   }
+   
+   /**
+    * 
+    * @param userName
+    * @return
+    * @throws DomainException
+    */
+   public static UserBean readByUserName(String userName) throws DomainException
+   {
+	   UserBean user = null;
+	   Session session = null;
+	   Transaction tx = null;
+	   try
+	   {
+		  session = Tools.getCurrentSession();
+		  tx = session.beginTransaction();
+		  
+		  //setup the query
+		  Query query = session.createQuery("from UserBean as u where u.userName=:userName");
+          query.setString("userName", userName);
+          
+          user = (UserBean)query.uniqueResult();
+		  
+		  tx.commit();
+	   }
+	   catch(Exception e)
+	   {		  
+		  UserBean.log.error(user,e);
+		  if(tx!=null)
+		  {
+			  tx.rollback();
+		  }
+		  throw new DomainException(e);
+	   }
+	   finally
+	   {
+		  Tools.closeSession(session);
+	   }
+	   return user;
+   }
+   
+   /**
+    * 
+    * @param userName
+    * @return
+    * @throws DomainException
+    */
+   public static Iterator readAll() throws DomainException
+   {
+       Iterator users = null;
+       Session session = null;
+       Transaction tx = null;
+       try
+       {
+          session = Tools.getCurrentSession();
+          tx = session.beginTransaction();
+          
+          //setup the query
+          Query query = session.createQuery("from UserBean as u");
+          
+          users = query.iterate();
+          
+          tx.commit();
+       }
+       catch(Exception e)
+       {          
+          UserBean.log.error("UserBean",e);
+          if(tx!=null)
+          {
+              tx.rollback();
+          }
+          throw new DomainException(e);
+       }
+       finally
+       {
+          Tools.closeSession(session);
+       }
+       return users;
+   }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,192 +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.website.user.ejb;
-
-import java.util.Collection;
-
-import org.jboss.website.service.ServiceException;
-import org.jboss.website.service.Service;
-import org.jboss.website.user.bo.UserBean;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 30, 2006
- *
- */
-public interface UserManager extends Service
-{
-    /**
-     * 
-     */
-	//types of registration modes supported
-	public static final String REGISTRATION_MODE = "registrationMode";
-	public static final String EMAIL_ACTIVATION = "EMAIL_ACTIVATION";
-	public static final String DIRECT_ACTIVATION = "DIRECT_ACTIVATION";
-    
-    //search types supported
-    public static final int SEARCH_BY_USERNAME = 0;
-    public static final int SEARCH_BY_EMAIL = 1;
-    public static final int SEARCH_BY_FIRST = 2;
-    public static final int SEARCH_BY_LAST = 3;
-    public static final int SEARCH_BY_COMPANY = 4;
-    
-    //role constants
-    public static final String DEFAULT_USER_ROLE = "User";
-    
-	//-----user management CRUD operations--------------------------------------------------------------------------------------------
-	/**
-     * This method performs registration for brand new user in the system
-     * 
-     * @param user
-     * @throws ServiceException
-	 */
-	public void register(UserBean user) throws ServiceException;
-    
-        
-    /**
-     * This method is used to retrieve a registered user's profile 
-     * 
-     * @param userName
-     * @return
-     * @throws ServiceException
-     */
-    public UserBean readProfile(String userName) throws ServiceException;
-    
-    /**
-     * This method is used to save the specified user's profile/information in the system
-     * 
-     * @param user
-     * @throws ServiceException
-     */
-    public void saveProfile(UserBean user) throws ServiceException;
-            
-    /**
-     * This method is used to completely delete all traces of the user from the system...
-     * Note: this is not for mere activation/deactivation of the user...this will remove this user along with
-     * any data associated with this user
-     * 
-     * @param userName
-     * @throws ServiceException
-     */
-    public void deleteUser(String userName) throws ServiceException;
-        
-    //account activation/deactivation operations-------------------------------------------------------------------------------------------------
-    /**
-     * This method is used to change the active/inactive status of the user
-     * Note: when a user is inactive, all their data remains intact. They just can't login to the system
-     * 
-     * @param user - User being activated or deactivated
-     * @throws ServiceException
-     */
-    public void changeActiveStatus(UserBean user) throws ServiceException;
-    
-    /**
-     * this method is called when the user activates his/her account from the activation email that is sent to them
-     * upon registration
-     * 
-     * @param username
-     * @param activationToken
-     * @return boolean - true if its a valid link, false otherwise and account remains inactive
-     * @throws ServiceException
-     */
-    public boolean activateAccount(String username,String activationToken) throws ServiceException;
-    
-    //user management search operations----------------------------------------------------------------------------------------------------------
-    /**
-     * This method is used to search through the database of registered users
-     * 
-     * @param searchStr - search input by the user
-     * @param searchType - type of user search to perform like search by username, search by last name, etc
-     * @throws ServiceException
-     */
-    public Collection searchUsers(String searchStr,int searchType) throws ServiceException;
-    
-    //password related operations----------------------------------------------------------------------------------------------------------------
-    /**
-     * This method is used to reset a user's password to a new password
-     * 
-     * @param username
-     * @param newPassword
-     * @throws ServiceException
-     */
-    public void resetPassword(String username,byte[] newPassword) throws ServiceException;
-    
-    //account maintenace related such as activations, issues with activation etc-----------------------------------------------------------------
-    /**
-     * This method is used to send/resend a user's activation email to the user so that they can receive the secure activation link
-     * needed to activate their account
-     * 
-     * @param email - this is the email address that the activation email should be sent to
-     * @param user - this is the user that must receive this email
-     * @throws ServiceException
-     */
-    public void sendActivationEmail(String email,UserBean user) throws ServiceException;
-    
-    /**
-     * This method sends an email to the site admin team reporting that there is an issue with activating a user's account
-     * The site admins can then handle the situation and activate the account manually for the user
-     * 
-     * @param user
-     * @param preferredEmail
-     * @param userIP
-     * @param wasPasswordVerified
-     * @throws ServiceException
-     */
-    public void sendActivationIssueEmail(UserBean user,String preferredEmail,String userIP,
-    boolean wasPasswordVerified) throws ServiceException;
-    
-    
-    /**
-     * This method sends the "Password Reset" email to the registered user. This mechanism is used by the site admins to
-     * securely reset a user's password
-     * 
-     * @param user
-     * @throws ServiceException
-     */
-    public void sendResetPasswordEmail(UserBean user) throws ServiceException;  
-    
-    /**
-     * 
-     * @param user
-     * @return
-     * @throws ServiceException
-     */
-    public String getResetPasswordLink(UserBean user) throws ServiceException;
-    
-    //-----utility methods for this module-----------------------------------------------------------------------------------------------------
-    /**
-     * This method is used to retrieve a registered user from the system 
-     * 
-     * @param userName
-     * @return
-     * @throws ServiceException
-     */
-    public UserBean getUser(String userName) throws ServiceException;
-    
-    /**
-     * This method is used to save the specified user's information in the system
-     * 
-     * @param user
-     * @throws ServiceException
-     */
-    public void saveUser(UserBean user) throws ServiceException;
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManager.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,192 @@
+/*
+* 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.website.user.ejb;
+
+import java.util.Collection;
+
+import org.jboss.website.service.ServiceException;
+import org.jboss.website.service.Service;
+import org.jboss.website.user.bo.UserBean;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 30, 2006
+ *
+ */
+public interface UserManager extends Service
+{
+    /**
+     * 
+     */
+	//types of registration modes supported
+	public static final String REGISTRATION_MODE = "registrationMode";
+	public static final String EMAIL_ACTIVATION = "EMAIL_ACTIVATION";
+	public static final String DIRECT_ACTIVATION = "DIRECT_ACTIVATION";
+    
+    //search types supported
+    public static final int SEARCH_BY_USERNAME = 0;
+    public static final int SEARCH_BY_EMAIL = 1;
+    public static final int SEARCH_BY_FIRST = 2;
+    public static final int SEARCH_BY_LAST = 3;
+    public static final int SEARCH_BY_COMPANY = 4;
+    
+    //role constants
+    public static final String DEFAULT_USER_ROLE = "User";
+    
+	//-----user management CRUD operations--------------------------------------------------------------------------------------------
+	/**
+     * This method performs registration for brand new user in the system
+     * 
+     * @param user
+     * @throws ServiceException
+	 */
+	public void register(UserBean user) throws ServiceException;
+    
+        
+    /**
+     * This method is used to retrieve a registered user's profile 
+     * 
+     * @param userName
+     * @return
+     * @throws ServiceException
+     */
+    public UserBean readProfile(String userName) throws ServiceException;
+    
+    /**
+     * This method is used to save the specified user's profile/information in the system
+     * 
+     * @param user
+     * @throws ServiceException
+     */
+    public void saveProfile(UserBean user) throws ServiceException;
+            
+    /**
+     * This method is used to completely delete all traces of the user from the system...
+     * Note: this is not for mere activation/deactivation of the user...this will remove this user along with
+     * any data associated with this user
+     * 
+     * @param userName
+     * @throws ServiceException
+     */
+    public void deleteUser(String userName) throws ServiceException;
+        
+    //account activation/deactivation operations-------------------------------------------------------------------------------------------------
+    /**
+     * This method is used to change the active/inactive status of the user
+     * Note: when a user is inactive, all their data remains intact. They just can't login to the system
+     * 
+     * @param user - User being activated or deactivated
+     * @throws ServiceException
+     */
+    public void changeActiveStatus(UserBean user) throws ServiceException;
+    
+    /**
+     * this method is called when the user activates his/her account from the activation email that is sent to them
+     * upon registration
+     * 
+     * @param username
+     * @param activationToken
+     * @return boolean - true if its a valid link, false otherwise and account remains inactive
+     * @throws ServiceException
+     */
+    public boolean activateAccount(String username,String activationToken) throws ServiceException;
+    
+    //user management search operations----------------------------------------------------------------------------------------------------------
+    /**
+     * This method is used to search through the database of registered users
+     * 
+     * @param searchStr - search input by the user
+     * @param searchType - type of user search to perform like search by username, search by last name, etc
+     * @throws ServiceException
+     */
+    public Collection searchUsers(String searchStr,int searchType) throws ServiceException;
+    
+    //password related operations----------------------------------------------------------------------------------------------------------------
+    /**
+     * This method is used to reset a user's password to a new password
+     * 
+     * @param username
+     * @param newPassword
+     * @throws ServiceException
+     */
+    public void resetPassword(String username,byte[] newPassword) throws ServiceException;
+    
+    //account maintenace related such as activations, issues with activation etc-----------------------------------------------------------------
+    /**
+     * This method is used to send/resend a user's activation email to the user so that they can receive the secure activation link
+     * needed to activate their account
+     * 
+     * @param email - this is the email address that the activation email should be sent to
+     * @param user - this is the user that must receive this email
+     * @throws ServiceException
+     */
+    public void sendActivationEmail(String email,UserBean user) throws ServiceException;
+    
+    /**
+     * This method sends an email to the site admin team reporting that there is an issue with activating a user's account
+     * The site admins can then handle the situation and activate the account manually for the user
+     * 
+     * @param user
+     * @param preferredEmail
+     * @param userIP
+     * @param wasPasswordVerified
+     * @throws ServiceException
+     */
+    public void sendActivationIssueEmail(UserBean user,String preferredEmail,String userIP,
+    boolean wasPasswordVerified) throws ServiceException;
+    
+    
+    /**
+     * This method sends the "Password Reset" email to the registered user. This mechanism is used by the site admins to
+     * securely reset a user's password
+     * 
+     * @param user
+     * @throws ServiceException
+     */
+    public void sendResetPasswordEmail(UserBean user) throws ServiceException;  
+    
+    /**
+     * 
+     * @param user
+     * @return
+     * @throws ServiceException
+     */
+    public String getResetPasswordLink(UserBean user) throws ServiceException;
+    
+    //-----utility methods for this module-----------------------------------------------------------------------------------------------------
+    /**
+     * This method is used to retrieve a registered user from the system 
+     * 
+     * @param userName
+     * @return
+     * @throws ServiceException
+     */
+    public UserBean getUser(String userName) throws ServiceException;
+    
+    /**
+     * This method is used to save the specified user's information in the system
+     * 
+     * @param user
+     * @throws ServiceException
+     */
+    public void saveUser(UserBean user) throws ServiceException;
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,869 +0,0 @@
-package org.jboss.website.user.ejb;
-
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.net.URLEncoder;
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import org.apache.log4j.Logger;
-
-//commons
-import org.jboss.website.config.Configuration;
-import org.jboss.website.config.Component;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.service.mail.MailManagerImpl;
-import org.jboss.website.service.mail.MailException;
-import org.jboss.website.service.ServiceException;
-import org.jboss.website.bo.DomainException;
-import org.jboss.website.validation.ValidationException;
-import org.jboss.website.utils.Util;
-import org.jboss.website.jsf.utils.JSFUtil;
-
-
-//sso-identity connector integration
-import org.jboss.security.idm.IdentityException;
-import org.jboss.security.idm.IdentityManager;
-import org.jboss.security.idm.ProvisioningProvider;
-import org.jboss.security.idm.Identity;
-import org.jboss.security.idm.Role;
-
-
-import org.jboss.website.security.JBossIdentity;
-import org.jboss.website.security.Tools;
-
-
-import org.jboss.website.user.bo.UserBean;
-
-
- at Stateless
-public class UserManagerImpl extends DomainService implements UserManagerLocal,UserManagerRemote
-{
-	private static final Logger log = Logger.getLogger(UserManagerImpl.class);
-	
-    //component configuration related data
-	private Component myConfig = null;
-	private Component siteConfig = null;
-	
-	//account activation related data
-	private String activationSender = null;
-	private String activationSubject = null;
-	private String activationEmail = null;
-    private String issueSender = null;
-    private String activationIssueReceiver = null;
-    private String activationIssueSubject = null;
-    private String activationIssueEmail = null;
-    private String profileLink = null;
-    private String activationLink = null;
-    private String resetSender = null;
-    private String resetSubject = null;
-    private String resetEmail = null;
-    private String resetPasswordLink = null;
-	
-    /**
-     * 
-     *
-     */
-	public UserManagerImpl()
-	{
-		super();
-		
-		//load the configuration for this component
-		this.myConfig = Configuration.getComponent(this);
-		this.siteConfig = Configuration.getComponent(Configuration.class.getName());
-		
-		//initialize the account activation related data
-		this.activationSender = this.myConfig.getProperty("activationSender");
-		this.activationSubject = this.myConfig.getProperty("activationSubject");
-		this.activationEmail = this.myConfig.getProperty("activationEmail");
-        this.issueSender = this.myConfig.getProperty("issueSender");
-        this.activationIssueReceiver = this.myConfig.getProperty("activationIssueReceiver");
-        this.activationIssueSubject = this.myConfig.getProperty("activationIssueSubject");
-        this.activationIssueEmail = this.myConfig.getProperty("activationIssueEmail");
-        this.profileLink = this.myConfig.getProperty("profileLink");
-        this.activationLink = this.myConfig.getProperty("activationLink");
-        
-        //initialize password reset related configuration
-        this.resetSender = this.myConfig.getProperty("resetSender");
-        this.resetSubject = this.myConfig.getProperty("resetSubject");
-        this.resetEmail = this.myConfig.getProperty("resetEmail");
-        this.resetPasswordLink = this.myConfig.getProperty("resetPasswordLink");
-	}
-	
-	//account registration---------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-	@TransactionAttribute(TransactionAttributeType.REQUIRED)
-	public void register(UserBean user) throws ServiceException
-	{	
-		ProvisioningProvider provider = null;
-		boolean success = false;
-		try
-		{
-			//perform domain validation on the object
-			user.validate();
-								
-			//set the proper activation status of this account, based on the subscriptionMode of this system
-			String registrationMode = this.myConfig.getProperty(REGISTRATION_MODE);			
-			if(registrationMode.equals(EMAIL_ACTIVATION))
-			{
-				user.getIdentity().setActive(false);
-			}
-			else
-			{
-				user.getIdentity().setActive(true);
-			}
-            
-						
-			//save the user to the database, this saves the user to the portal database,
-			user.save();
-            
-            //add this user to the core portal data....without this the portal will break
-            //UserModule userModule = JBossPortalUtil.getUserModule();
-            //userModule.createUser(user.getUserName(),null,null);
-                                   						
-			//if the account is inactive, send an activation email to the registered user
-			if(!user.getIdentity().isActive())
-			{
-				//the user account is not activated...send this user and email with activation information
-				try
-                {
-                    this.sendActivationEmailViaRegistration(user.getIdentity().getEmail(),user);
-                }catch(Exception e){throw e;}
-			}
-									
-			//tag success, so that the profile can be created in the JBoss Corp Identity system
-			success = true;						
-		}
-		catch(DomainException de)
-		{
-			log.error(this,de);
-			throw new EJBException(de);
-		}
-		catch(ValidationException vex)
-		{
-			log.error(this,vex);
-			throw new EJBException(vex);
-		}		
-		catch(MailException me)
-		{
-			log.error(this,me);
-			throw new EJBException(me);
-		}		
-		catch(IdentityException ide)
-		{
-			log.error(this,ide);
-			throw new EJBException(ide);
-		}
-		catch(Exception e)
-		{
-			log.error(this,e);
-			throw new EJBException(e);
-		}
-		finally
-		{
-			if(success)
-			{
-				try
-				{	
-                    provider = IdentityManager.findProvisioningProvider();
-                    Role defaultRole = this.getDefaultRole(user.getIdentity().getUserName());
-					provider.register(user.getIdentity());
-                    provider.updateRole(defaultRole);
-				}
-				catch(IdentityException ide)
-				{
-					log.error(this,ide);					
-                    //cleanup from identity store
-                    provider.remove(user.getIdentity().getUserName());
-                    throw new EJBException(ide);
-				}
-                catch(Exception e)
-                {
-                    log.error(this,e);
-                    //cleanup from identity store
-                    provider.remove(user.getIdentity().getUserName());
-                    throw new EJBException(e);                    
-                }
-			}
-		}		
-	}
-        
-    /**
-     * 
-     * @return
-     * @throws Exception
-     */
-    private Role getDefaultRole(String roleMember) throws Exception
-    {
-        Role defaultRole = null;
-        
-        ProvisioningProvider provider = IdentityManager.findProvisioningProvider();
-        defaultRole = provider.readRole(UserManager.DEFAULT_USER_ROLE);
-        defaultRole.getIdentities().add(roleMember);
-        
-        return defaultRole;
-    }	
-	//account deletion----------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    @TransactionAttribute(TransactionAttributeType.REQUIRED)
-    public void deleteUser(String userName) throws ServiceException
-    {
-        ProvisioningProvider provider = null;
-        boolean success = false;
-        try
-        {
-            //delete this user's information from the local application database
-            UserBean user = UserBean.readByUserName(userName);
-            if(user!=null)
-            {
-                user.remove();
-            
-                //now also remove its presence in the core portal data...this reference is an orphan row
-                //but portal does not work without it...this seems to be fixed in portal-2.4
-                //this.removeUser(userName);
-            }
-            
-            success = true;
-        }
-        catch(DomainException de)
-        {
-            log.error(this,de);
-            throw new EJBException(de);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new EJBException(e);
-        }
-        finally
-        {
-            if(success)
-            {
-                try
-                {   
-                    provider = IdentityManager.findProvisioningProvider();
-                    provider.remove(userName);
-                }
-                catch(IdentityException ide)
-                {
-                    log.error(this,ide);                    
-                    throw new EJBException(ide);
-                }
-                catch(Exception e)
-                {
-                    log.error(this,e);
-                    throw new EJBException(e);                    
-                }
-            }
-        }
-    }
-    /**
-     * 
-     * @param username
-     * @throws Exception
-     */
-    /*private void removeUser(String username) throws Exception
-    {
-        UserModule userModule = JBossPortalUtil.getUserModule();
-        User user = userModule.findUserByUserName(username);
-        userModule.removeUser(user.getId());
-    }*/    
-	//account read----------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     * @param userName
-     * @return
-     * @throws ServiceException
-     */
-    public UserBean getUser(String userName) throws ServiceException
-    {
-        ProvisioningProvider provider = null;
-        UserBean user = null;
-        try
-        {
-            user = UserBean.readByUserName(userName);
-            return user;
-        }
-        catch(DomainException de)
-        {
-            log.error(this,de);
-            throw new EJBException(de);
-        }
-        finally
-        {
-            if(user!=null)
-            {
-                provider = IdentityManager.findProvisioningProvider();
-                Identity identity = provider.read(user.getUserName());
-                user.setIdentity((JBossIdentity)identity);
-            }
-        }
-    }
-    
-    /**
-     * This method is used to retrieve a registered user's profile 
-     * 
-     * @param userName
-     * @return
-     * @throws ServiceException
-     */
-    public UserBean readProfile(String userName) throws ServiceException
-    {
-        return this.getUser(userName);
-    }
-    
-    //saving user information------------------------------------------------------------------------------------------------------------------------
-    /**
-     * This method is used to save the specified user's profile/information in the system
-     * @param user
-     * @throws ServiceException
-     */
-    @TransactionAttribute(TransactionAttributeType.REQUIRED)
-    public void saveUser(UserBean user) throws ServiceException
-    {
-        ProvisioningProvider provider = null;
-        UserBean current = null; //this is the current user information before the edit is going to happen
-        boolean success = false;
-        try
-        {
-            //perform domain validation on the object
-            user.validate();
-                                                                    
-            //save the user to the database, this saves the user to the portal database,
-            current = this.getUser(user.getUserName());
-            current.sync(user);
-            current.save();
-                                                
-            //tag success, so that the profile can be created in the JBoss Corp Identity system
-            success = true;                     
-        }
-        catch(DomainException de)
-        {
-            log.error(this,de);
-            throw new EJBException(de);
-        }
-        catch(ValidationException vex)
-        {
-            log.error(this,vex);
-            throw new EJBException(vex);
-        }                      
-        catch(IdentityException ide)
-        {
-            log.error(this,ide);
-            throw new EJBException(ide);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new EJBException(e);
-        }
-        finally
-        {
-            if(success)
-            {
-                try
-                {   
-                    provider = IdentityManager.findProvisioningProvider();
-                    //restore the original information that cannot be modified in the modify user profile
-                    user.getIdentity().setPassword(current.getIdentity().getPassword());
-                    user.getIdentity().setRegistrationDate(current.getIdentity().getRegistrationDate());
-                    user.getIdentity().setActive(current.getIdentity().isActive());
-                    provider.update(user.getIdentity());
-                }
-                catch(IdentityException ide)
-                {
-                    log.error(this,ide);
-                    throw new EJBException(ide);
-                }
-            }
-        }
-    }
-    
-    /**
-     * This method is used to save the specified user's profile/information in the system
-     * @param user
-     * @throws ServiceException
-     */
-    @TransactionAttribute(TransactionAttributeType.REQUIRED)
-    public void saveProfile(UserBean user) throws ServiceException
-    {
-        this.saveUser(user);
-    }
-    
-    //-----search related -----------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public Collection searchUsers(String searchStr,int searchType) throws ServiceException
-    {
-        Collection results = new ArrayList();
-        Collection identities = new ArrayList();
-        org.jboss.website.security.JBossCorpIdentityProvider provider = (org.jboss.website.security.JBossCorpIdentityProvider)
-        IdentityManager.findProvisioningProvider();
-        switch(searchType)
-        {
-            case SEARCH_BY_USERNAME:
-                identities = provider.searchByUserName(searchStr);                
-            break;
-            
-            case SEARCH_BY_EMAIL:
-                identities = provider.searchByEmail(searchStr);                
-            break;
-            
-            case SEARCH_BY_FIRST:
-                identities = provider.searchByFirstName(searchStr);                
-            break;
-            
-            case SEARCH_BY_LAST:
-                identities = provider.searchByLastName(searchStr);                
-            break;
-            
-            case SEARCH_BY_COMPANY:
-                identities = provider.searchByCompany(searchStr);                
-            break;
-            
-            default:
-            break;
-        }
-        
-        //setup the search result
-        if(!Util.isEmpty(identities))
-        {
-            for(Iterator itr=identities.iterator();itr.hasNext();)
-            {
-                Identity cour = (Identity)itr.next();
-                UserBean user = new UserBean();
-                user.setUserName(cour.getUserName());
-                user.setIdentity((JBossIdentity)cour);
-                results.add(user);
-            }
-        }
-                
-        return results;
-    }
-    
-    //account activation/deactivation operations-------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public void changeActiveStatus(UserBean user) throws ServiceException
-    {
-        this.switchStatus(user);
-    }
-    /**
-     * this method is called when the user activates his/her account from the activation email that is sent to them
-     * upon registration
-     * 
-     * @param username
-     * @param activationToken
-     * @return boolean - true if its a valid link, false otherwise and account remains inactive
-     * @throws ServiceException
-     */
-    public boolean activateAccount(String username,String activationToken) throws ServiceException
-    {                
-        try
-        {
-            boolean activated = false;
-            
-            UserBean user = this.getUser(username);
-            if(!user.getIdentity().isActive())
-            {
-                //now match the token
-                String token = org.jboss.website.user.util.Tools.
-                generateToken(
-                        new String[]{user.getUserName(),user.getPassword()}
-                );
-                
-                if(token.equals(activationToken))
-                {
-                    this.switchStatus(user);
-                    activated = true;
-                }
-            }
-            
-            return activated;
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new ServiceException(e);
-        }
-    }
-    /**
-     * 
-     */
-    private void switchStatus(UserBean user) throws ServiceException
-    {
-        try
-        {   
-            ProvisioningProvider provider = IdentityManager.findProvisioningProvider();
-            if(user.getIdentity().isActive())
-            {
-                provider.deactivate(user.getUserName());
-            }
-            else
-            {
-                provider.activate(user.getUserName());
-            }
-        }
-        catch(IdentityException ide)
-        {
-            log.error(this,ide);
-            throw new EJBException(ide);
-        }
-    }
-    //password related operations----------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    @TransactionAttribute(TransactionAttributeType.REQUIRED)
-    public void resetPassword(String username,byte[] newPassword) throws ServiceException
-    {
-        ProvisioningProvider provider = null;
-        UserBean current = null; //this is the current user information before the edit is going to happen
-        try
-        {   
-            current = this.getUser(username);
-            
-            //also remove a forcedReset if necessary
-            if(current.isForceResetEnabled())
-            {
-                current.setForceResetEnabled(false);
-                current.save();
-            }
-            
-            //now go ahead and change the password in the Identity Store
-            provider = IdentityManager.findProvisioningProvider();
-            String encryptedPassword = Tools.getEncodedPassword(new String(newPassword));
-            current.getIdentity().setPassword(encryptedPassword.getBytes());
-            
-            provider.update(current.getIdentity());                                                                                                                                                                 
-        }                              
-        catch(IdentityException ide)
-        {
-            log.error(this,ide);
-            throw new EJBException(ide);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new EJBException(e);
-        }        
-    }
-    
-    //account maintenace related such as activations, issues with activation etc-----------------------------------------------------------------
-    /**
-     * @param email - this is the email address that the activation email should be sent to
-     * @param user - this is the user that must receive this email
-     * @throws ServiceException
-     */
-    public void sendActivationEmail(String email,UserBean user) throws ServiceException
-    {
-        try
-        {
-            //the user account is not activated...send this user an email with activation information
-            String from = this.activationSender;
-            String to = user.getIdentity().getEmail();
-            String subject = this.activationSubject;
-            String body = this.getActivationEmail(this.activationEmail,user,true);
-                        
-            MailManagerImpl.getInstance().send(from,to,subject,body);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new ServiceException(e);
-        }
-    }
-    
-    /**
-     * @param email - this is the email address that the activation email should be sent to
-     * @param user - this is the user that must receive this email
-     * @throws ServiceException
-     */
-    private void sendActivationEmailViaRegistration(String email,UserBean user) throws ServiceException
-    {
-        try
-        {
-            //the user account is not activated...send this user an email with activation information
-            String from = this.activationSender;
-            String to = user.getIdentity().getEmail();
-            String subject = this.activationSubject;
-            String body = this.getActivationEmail(this.activationEmail,user,false);
-                        
-            MailManagerImpl.getInstance().send(from,to,subject,body);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new ServiceException(e);
-        }
-    }
-    
-    /**
-     * 
-     * @param user
-     * @param preferredEmail
-     * @param userIP
-     * @param wasPasswordVerified
-     * @throws ServiceException
-     */
-    public void sendActivationIssueEmail(UserBean user,
-            String preferredEmail,
-            String userIP,
-            boolean wasPasswordVerified) 
-    throws ServiceException
-    {
-        try
-        {
-            //the user account is not activated...send this user and email with activation information
-            String from = this.issueSender;
-            String to = this.activationIssueReceiver;
-            String subject = MessageFormat.format(this.activationIssueSubject,new Object[]{user.getUserName()});
-            String body = this.getActivationIssueEmail(this.activationIssueEmail,user,preferredEmail,userIP,wasPasswordVerified);
-            MailManagerImpl.getInstance().send(from,to,subject,body);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new ServiceException(e);
-        }
-    }
-    
-    /**
-     * 
-     * @param user
-     * @throws ServiceException
-     */
-    public void sendResetPasswordEmail(UserBean user) throws ServiceException
-    {
-        try
-        {
-            //the user or an admin requested that the password on this account be reset...
-            //send them the email that will take them through this process
-            String from = this.resetSender;
-            String to = user.getIdentity().getEmail();
-            String subject = MessageFormat.format(
-            this.resetSubject,new Object[]{user.getUserName()});
-            String body = this.getResetPasswordEmail(this.resetEmail,user);
-            MailManagerImpl.getInstance().send(from,to,subject,body);
-        }
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new ServiceException(e);
-        }
-    }
-    
-    /**
-     * 
-     * @param activationTemplate
-     * @param user
-     * @return
-     * @throws Exception
-     */
-    private String getResetPasswordEmail(String emailTemplate,UserBean user) throws Exception
-    {
-        String email = null;
-        
-        String template = emailTemplate;        
-        
-        
-        //process the template 
-        if(!Util.isEmpty(template))
-        {
-            String resetPasswordLink = this.getResetPasswordLink(user);
-            Object[] values = new Object[]{
-                    user.getUserName(), //username
-                    resetPasswordLink,
-                    this.siteConfig.getProperty("siteName")
-            };
-            //replace the place holders with real values in the template
-            email = MessageFormat.format(template,values);
-        }
-        
-        return email;
-    }
-    
-    /**
-     * 
-     * @param activationTemplate
-     * @param user
-     * @return
-     * @throws Exception
-     */
-    private String getActivationEmail(String activationTemplate,UserBean user,boolean isPasswordEncrypted) throws Exception
-    {
-        String email = null;
-        
-        String template = activationTemplate;        
-        
-        
-        //process the template 
-        if(!Util.isEmpty(template))
-        {
-            String activationLink = this.getActivationLink(user,isPasswordEncrypted);
-            Object[] values = new Object[]{
-                    this.siteConfig.getProperty("siteURL"), //siteURL
-                    user.getUserName(),
-                    activationLink,
-                    this.siteConfig.getProperty("siteName")
-            };
-            //replace the place holders with real values in the template
-            email = MessageFormat.format(template,values);
-        }
-        
-        return email;
-    }
-    
-    /**
-     * 
-     * @param activationIssueTemplate
-     * @param user
-     * @param preferredEmail
-     * @param userIP
-     * @param wasPasswordVerified
-     * @return
-     * @throws Exception
-     */
-    private String getActivationIssueEmail(String activationIssueTemplate,UserBean user,
-            String preferredEmail,
-            String userIP,
-            boolean wasPasswordVerified
-    ) throws Exception
-    {
-        String email = null;
-        
-        String template = activationIssueTemplate;        
-        
-        
-        //process the template 
-        if(!Util.isEmpty(template))
-        {
-            String activationLink = this.getActivationLink(user,true);            
-            String profileLink = this.getProfileLink(user);
-            
-            //setup the values to be inserted into the template
-            Object[] values = new Object[]{
-                    user.getIdentity().getUserName(), //login
-                    user.getIdentity().getEmail(), //registered email address
-                    preferredEmail, //this is the email the user said needs to be contacted at with a resolution to this issue
-                    userIP, //IP address of the user issuing the request
-                    new Boolean(wasPasswordVerified), //tells the admin whether the user's password was verified or not
-                    activationLink,
-                    profileLink
-            };
-            
-            
-            //replace the place holders with real values in the template
-            email = MessageFormat.format(template,values);
-        }
-        
-        return email;
-    }
-    
-    /**
-     * 
-     * @param user
-     * @return
-     * @throws Exception
-     */
-    private String getActivationLink(UserBean user,boolean isPasswordEncrypted) throws Exception
-    {
-        String activationLink = null;
-        
-        String password = user.getPassword();
-        if(!isPasswordEncrypted)
-        {
-            password = org.jboss.security.util.Tools.getEncodedPassword(user.getPassword(),"MD5");
-        }
-        
-        
-        String id = org.jboss.website.user.util.Tools.
-        generateToken(
-            new String[]{user.getUserName(),password}
-        );
-        
-        //this remains a plain jsf link regardless or portal or no portal
-        String link = MessageFormat.format(this.activationLink,
-        new Object[]{
-                URLEncoder.encode(user.getUserName(),"UTF-8"),
-                id
-        });
-        
-        //construct the activation link
-        activationLink = this.siteConfig.getProperty("siteSSLURL") + 
-        JSFUtil.getContextPath() +
-        link;
-        
-        return activationLink;
-    }
-    
-    /**
-     * 
-     * @param user
-     * @return
-     * @throws Exception
-     */
-    private String getProfileLink(UserBean user) throws Exception
-    {
-        String profileLink = null;
-        
-        //for now this is a hardcoded portal link to this user's profile...
-        //this will be more flexible once IPC from portal2.2 is integrated
-        String link = MessageFormat.format(this.profileLink,new Object[]{URLEncoder.encode(user.getUserName(),"UTF-8")});
-                
-        //construct the activation link
-        profileLink = this.siteConfig.getProperty("siteURL") + 
-        link
-        ;
-        
-        
-        return profileLink;
-    }
-    
-    /**
-     * 
-     * @param user
-     * @return
-     * @throws Exception
-     */
-    public String getResetPasswordLink(UserBean user) throws ServiceException
-    {
-        try
-        {
-            String resetPasswordLink = null;
-            
-            
-            String token = org.jboss.website.user.util.Tools.
-            generateToken(
-                new String[]{user.getUserName()}
-            );
-            
-            //this remains a plain jsf link regardless or portal or no portal
-            String link = MessageFormat.format(this.resetPasswordLink,
-            new Object[]{
-                    URLEncoder.encode(user.getUserName(),"UTF-8"),
-                    token
-            });
-            
-            //construct the resetPasswordLink
-            resetPasswordLink = this.siteConfig.getProperty("siteSSLURL") + 
-            link;
-            
-            return resetPasswordLink;
-        }
-        catch(Exception e)
-        {
-            throw new ServiceException(e);
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerImpl.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,869 @@
+package org.jboss.website.user.ejb;
+
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.net.URLEncoder;
+import javax.ejb.Stateless;
+import javax.ejb.EJBException;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+import org.apache.log4j.Logger;
+
+//commons
+import org.jboss.website.config.Configuration;
+import org.jboss.website.config.Component;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.service.mail.MailManagerImpl;
+import org.jboss.website.service.mail.MailException;
+import org.jboss.website.service.ServiceException;
+import org.jboss.website.bo.DomainException;
+import org.jboss.website.validation.ValidationException;
+import org.jboss.website.utils.Util;
+import org.jboss.website.jsf.utils.JSFUtil;
+
+
+//sso-identity connector integration
+import org.jboss.security.idm.IdentityException;
+import org.jboss.security.idm.IdentityManager;
+import org.jboss.security.idm.ProvisioningProvider;
+import org.jboss.security.idm.Identity;
+import org.jboss.security.idm.Role;
+
+
+import org.jboss.website.security.JBossIdentity;
+import org.jboss.website.security.Tools;
+
+
+import org.jboss.website.user.bo.UserBean;
+
+
+ at Stateless
+public class UserManagerImpl extends DomainService implements UserManagerLocal,UserManagerRemote
+{
+	private static final Logger log = Logger.getLogger(UserManagerImpl.class);
+	
+    //component configuration related data
+	private Component myConfig = null;
+	private Component siteConfig = null;
+	
+	//account activation related data
+	private String activationSender = null;
+	private String activationSubject = null;
+	private String activationEmail = null;
+    private String issueSender = null;
+    private String activationIssueReceiver = null;
+    private String activationIssueSubject = null;
+    private String activationIssueEmail = null;
+    private String profileLink = null;
+    private String activationLink = null;
+    private String resetSender = null;
+    private String resetSubject = null;
+    private String resetEmail = null;
+    private String resetPasswordLink = null;
+	
+    /**
+     * 
+     *
+     */
+	public UserManagerImpl()
+	{
+		super();
+		
+		//load the configuration for this component
+		this.myConfig = Configuration.getComponent(this);
+		this.siteConfig = Configuration.getComponent(Configuration.class.getName());
+		
+		//initialize the account activation related data
+		this.activationSender = this.myConfig.getProperty("activationSender");
+		this.activationSubject = this.myConfig.getProperty("activationSubject");
+		this.activationEmail = this.myConfig.getProperty("activationEmail");
+        this.issueSender = this.myConfig.getProperty("issueSender");
+        this.activationIssueReceiver = this.myConfig.getProperty("activationIssueReceiver");
+        this.activationIssueSubject = this.myConfig.getProperty("activationIssueSubject");
+        this.activationIssueEmail = this.myConfig.getProperty("activationIssueEmail");
+        this.profileLink = this.myConfig.getProperty("profileLink");
+        this.activationLink = this.myConfig.getProperty("activationLink");
+        
+        //initialize password reset related configuration
+        this.resetSender = this.myConfig.getProperty("resetSender");
+        this.resetSubject = this.myConfig.getProperty("resetSubject");
+        this.resetEmail = this.myConfig.getProperty("resetEmail");
+        this.resetPasswordLink = this.myConfig.getProperty("resetPasswordLink");
+	}
+	
+	//account registration---------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+	@TransactionAttribute(TransactionAttributeType.REQUIRED)
+	public void register(UserBean user) throws ServiceException
+	{	
+		ProvisioningProvider provider = null;
+		boolean success = false;
+		try
+		{
+			//perform domain validation on the object
+			user.validate();
+								
+			//set the proper activation status of this account, based on the subscriptionMode of this system
+			String registrationMode = this.myConfig.getProperty(REGISTRATION_MODE);			
+			if(registrationMode.equals(EMAIL_ACTIVATION))
+			{
+				user.getIdentity().setActive(false);
+			}
+			else
+			{
+				user.getIdentity().setActive(true);
+			}
+            
+						
+			//save the user to the database, this saves the user to the portal database,
+			user.save();
+            
+            //add this user to the core portal data....without this the portal will break
+            //UserModule userModule = JBossPortalUtil.getUserModule();
+            //userModule.createUser(user.getUserName(),null,null);
+                                   						
+			//if the account is inactive, send an activation email to the registered user
+			if(!user.getIdentity().isActive())
+			{
+				//the user account is not activated...send this user and email with activation information
+				try
+                {
+                    this.sendActivationEmailViaRegistration(user.getIdentity().getEmail(),user);
+                }catch(Exception e){throw e;}
+			}
+									
+			//tag success, so that the profile can be created in the JBoss Corp Identity system
+			success = true;						
+		}
+		catch(DomainException de)
+		{
+			log.error(this,de);
+			throw new EJBException(de);
+		}
+		catch(ValidationException vex)
+		{
+			log.error(this,vex);
+			throw new EJBException(vex);
+		}		
+		catch(MailException me)
+		{
+			log.error(this,me);
+			throw new EJBException(me);
+		}		
+		catch(IdentityException ide)
+		{
+			log.error(this,ide);
+			throw new EJBException(ide);
+		}
+		catch(Exception e)
+		{
+			log.error(this,e);
+			throw new EJBException(e);
+		}
+		finally
+		{
+			if(success)
+			{
+				try
+				{	
+                    provider = IdentityManager.findProvisioningProvider();
+                    Role defaultRole = this.getDefaultRole(user.getIdentity().getUserName());
+					provider.register(user.getIdentity());
+                    provider.updateRole(defaultRole);
+				}
+				catch(IdentityException ide)
+				{
+					log.error(this,ide);					
+                    //cleanup from identity store
+                    provider.remove(user.getIdentity().getUserName());
+                    throw new EJBException(ide);
+				}
+                catch(Exception e)
+                {
+                    log.error(this,e);
+                    //cleanup from identity store
+                    provider.remove(user.getIdentity().getUserName());
+                    throw new EJBException(e);                    
+                }
+			}
+		}		
+	}
+        
+    /**
+     * 
+     * @return
+     * @throws Exception
+     */
+    private Role getDefaultRole(String roleMember) throws Exception
+    {
+        Role defaultRole = null;
+        
+        ProvisioningProvider provider = IdentityManager.findProvisioningProvider();
+        defaultRole = provider.readRole(UserManager.DEFAULT_USER_ROLE);
+        defaultRole.getIdentities().add(roleMember);
+        
+        return defaultRole;
+    }	
+	//account deletion----------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    public void deleteUser(String userName) throws ServiceException
+    {
+        ProvisioningProvider provider = null;
+        boolean success = false;
+        try
+        {
+            //delete this user's information from the local application database
+            UserBean user = UserBean.readByUserName(userName);
+            if(user!=null)
+            {
+                user.remove();
+            
+                //now also remove its presence in the core portal data...this reference is an orphan row
+                //but portal does not work without it...this seems to be fixed in portal-2.4
+                //this.removeUser(userName);
+            }
+            
+            success = true;
+        }
+        catch(DomainException de)
+        {
+            log.error(this,de);
+            throw new EJBException(de);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new EJBException(e);
+        }
+        finally
+        {
+            if(success)
+            {
+                try
+                {   
+                    provider = IdentityManager.findProvisioningProvider();
+                    provider.remove(userName);
+                }
+                catch(IdentityException ide)
+                {
+                    log.error(this,ide);                    
+                    throw new EJBException(ide);
+                }
+                catch(Exception e)
+                {
+                    log.error(this,e);
+                    throw new EJBException(e);                    
+                }
+            }
+        }
+    }
+    /**
+     * 
+     * @param username
+     * @throws Exception
+     */
+    /*private void removeUser(String username) throws Exception
+    {
+        UserModule userModule = JBossPortalUtil.getUserModule();
+        User user = userModule.findUserByUserName(username);
+        userModule.removeUser(user.getId());
+    }*/    
+	//account read----------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     * @param userName
+     * @return
+     * @throws ServiceException
+     */
+    public UserBean getUser(String userName) throws ServiceException
+    {
+        ProvisioningProvider provider = null;
+        UserBean user = null;
+        try
+        {
+            user = UserBean.readByUserName(userName);
+            return user;
+        }
+        catch(DomainException de)
+        {
+            log.error(this,de);
+            throw new EJBException(de);
+        }
+        finally
+        {
+            if(user!=null)
+            {
+                provider = IdentityManager.findProvisioningProvider();
+                Identity identity = provider.read(user.getUserName());
+                user.setIdentity((JBossIdentity)identity);
+            }
+        }
+    }
+    
+    /**
+     * This method is used to retrieve a registered user's profile 
+     * 
+     * @param userName
+     * @return
+     * @throws ServiceException
+     */
+    public UserBean readProfile(String userName) throws ServiceException
+    {
+        return this.getUser(userName);
+    }
+    
+    //saving user information------------------------------------------------------------------------------------------------------------------------
+    /**
+     * This method is used to save the specified user's profile/information in the system
+     * @param user
+     * @throws ServiceException
+     */
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    public void saveUser(UserBean user) throws ServiceException
+    {
+        ProvisioningProvider provider = null;
+        UserBean current = null; //this is the current user information before the edit is going to happen
+        boolean success = false;
+        try
+        {
+            //perform domain validation on the object
+            user.validate();
+                                                                    
+            //save the user to the database, this saves the user to the portal database,
+            current = this.getUser(user.getUserName());
+            current.sync(user);
+            current.save();
+                                                
+            //tag success, so that the profile can be created in the JBoss Corp Identity system
+            success = true;                     
+        }
+        catch(DomainException de)
+        {
+            log.error(this,de);
+            throw new EJBException(de);
+        }
+        catch(ValidationException vex)
+        {
+            log.error(this,vex);
+            throw new EJBException(vex);
+        }                      
+        catch(IdentityException ide)
+        {
+            log.error(this,ide);
+            throw new EJBException(ide);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new EJBException(e);
+        }
+        finally
+        {
+            if(success)
+            {
+                try
+                {   
+                    provider = IdentityManager.findProvisioningProvider();
+                    //restore the original information that cannot be modified in the modify user profile
+                    user.getIdentity().setPassword(current.getIdentity().getPassword());
+                    user.getIdentity().setRegistrationDate(current.getIdentity().getRegistrationDate());
+                    user.getIdentity().setActive(current.getIdentity().isActive());
+                    provider.update(user.getIdentity());
+                }
+                catch(IdentityException ide)
+                {
+                    log.error(this,ide);
+                    throw new EJBException(ide);
+                }
+            }
+        }
+    }
+    
+    /**
+     * This method is used to save the specified user's profile/information in the system
+     * @param user
+     * @throws ServiceException
+     */
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    public void saveProfile(UserBean user) throws ServiceException
+    {
+        this.saveUser(user);
+    }
+    
+    //-----search related -----------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public Collection searchUsers(String searchStr,int searchType) throws ServiceException
+    {
+        Collection results = new ArrayList();
+        Collection identities = new ArrayList();
+        org.jboss.website.security.JBossCorpIdentityProvider provider = (org.jboss.website.security.JBossCorpIdentityProvider)
+        IdentityManager.findProvisioningProvider();
+        switch(searchType)
+        {
+            case SEARCH_BY_USERNAME:
+                identities = provider.searchByUserName(searchStr);                
+            break;
+            
+            case SEARCH_BY_EMAIL:
+                identities = provider.searchByEmail(searchStr);                
+            break;
+            
+            case SEARCH_BY_FIRST:
+                identities = provider.searchByFirstName(searchStr);                
+            break;
+            
+            case SEARCH_BY_LAST:
+                identities = provider.searchByLastName(searchStr);                
+            break;
+            
+            case SEARCH_BY_COMPANY:
+                identities = provider.searchByCompany(searchStr);                
+            break;
+            
+            default:
+            break;
+        }
+        
+        //setup the search result
+        if(!Util.isEmpty(identities))
+        {
+            for(Iterator itr=identities.iterator();itr.hasNext();)
+            {
+                Identity cour = (Identity)itr.next();
+                UserBean user = new UserBean();
+                user.setUserName(cour.getUserName());
+                user.setIdentity((JBossIdentity)cour);
+                results.add(user);
+            }
+        }
+                
+        return results;
+    }
+    
+    //account activation/deactivation operations-------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public void changeActiveStatus(UserBean user) throws ServiceException
+    {
+        this.switchStatus(user);
+    }
+    /**
+     * this method is called when the user activates his/her account from the activation email that is sent to them
+     * upon registration
+     * 
+     * @param username
+     * @param activationToken
+     * @return boolean - true if its a valid link, false otherwise and account remains inactive
+     * @throws ServiceException
+     */
+    public boolean activateAccount(String username,String activationToken) throws ServiceException
+    {                
+        try
+        {
+            boolean activated = false;
+            
+            UserBean user = this.getUser(username);
+            if(!user.getIdentity().isActive())
+            {
+                //now match the token
+                String token = org.jboss.website.user.util.Tools.
+                generateToken(
+                        new String[]{user.getUserName(),user.getPassword()}
+                );
+                
+                if(token.equals(activationToken))
+                {
+                    this.switchStatus(user);
+                    activated = true;
+                }
+            }
+            
+            return activated;
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new ServiceException(e);
+        }
+    }
+    /**
+     * 
+     */
+    private void switchStatus(UserBean user) throws ServiceException
+    {
+        try
+        {   
+            ProvisioningProvider provider = IdentityManager.findProvisioningProvider();
+            if(user.getIdentity().isActive())
+            {
+                provider.deactivate(user.getUserName());
+            }
+            else
+            {
+                provider.activate(user.getUserName());
+            }
+        }
+        catch(IdentityException ide)
+        {
+            log.error(this,ide);
+            throw new EJBException(ide);
+        }
+    }
+    //password related operations----------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    public void resetPassword(String username,byte[] newPassword) throws ServiceException
+    {
+        ProvisioningProvider provider = null;
+        UserBean current = null; //this is the current user information before the edit is going to happen
+        try
+        {   
+            current = this.getUser(username);
+            
+            //also remove a forcedReset if necessary
+            if(current.isForceResetEnabled())
+            {
+                current.setForceResetEnabled(false);
+                current.save();
+            }
+            
+            //now go ahead and change the password in the Identity Store
+            provider = IdentityManager.findProvisioningProvider();
+            String encryptedPassword = Tools.getEncodedPassword(new String(newPassword));
+            current.getIdentity().setPassword(encryptedPassword.getBytes());
+            
+            provider.update(current.getIdentity());                                                                                                                                                                 
+        }                              
+        catch(IdentityException ide)
+        {
+            log.error(this,ide);
+            throw new EJBException(ide);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new EJBException(e);
+        }        
+    }
+    
+    //account maintenace related such as activations, issues with activation etc-----------------------------------------------------------------
+    /**
+     * @param email - this is the email address that the activation email should be sent to
+     * @param user - this is the user that must receive this email
+     * @throws ServiceException
+     */
+    public void sendActivationEmail(String email,UserBean user) throws ServiceException
+    {
+        try
+        {
+            //the user account is not activated...send this user an email with activation information
+            String from = this.activationSender;
+            String to = user.getIdentity().getEmail();
+            String subject = this.activationSubject;
+            String body = this.getActivationEmail(this.activationEmail,user,true);
+                        
+            MailManagerImpl.getInstance().send(from,to,subject,body);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new ServiceException(e);
+        }
+    }
+    
+    /**
+     * @param email - this is the email address that the activation email should be sent to
+     * @param user - this is the user that must receive this email
+     * @throws ServiceException
+     */
+    private void sendActivationEmailViaRegistration(String email,UserBean user) throws ServiceException
+    {
+        try
+        {
+            //the user account is not activated...send this user an email with activation information
+            String from = this.activationSender;
+            String to = user.getIdentity().getEmail();
+            String subject = this.activationSubject;
+            String body = this.getActivationEmail(this.activationEmail,user,false);
+                        
+            MailManagerImpl.getInstance().send(from,to,subject,body);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new ServiceException(e);
+        }
+    }
+    
+    /**
+     * 
+     * @param user
+     * @param preferredEmail
+     * @param userIP
+     * @param wasPasswordVerified
+     * @throws ServiceException
+     */
+    public void sendActivationIssueEmail(UserBean user,
+            String preferredEmail,
+            String userIP,
+            boolean wasPasswordVerified) 
+    throws ServiceException
+    {
+        try
+        {
+            //the user account is not activated...send this user and email with activation information
+            String from = this.issueSender;
+            String to = this.activationIssueReceiver;
+            String subject = MessageFormat.format(this.activationIssueSubject,new Object[]{user.getUserName()});
+            String body = this.getActivationIssueEmail(this.activationIssueEmail,user,preferredEmail,userIP,wasPasswordVerified);
+            MailManagerImpl.getInstance().send(from,to,subject,body);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new ServiceException(e);
+        }
+    }
+    
+    /**
+     * 
+     * @param user
+     * @throws ServiceException
+     */
+    public void sendResetPasswordEmail(UserBean user) throws ServiceException
+    {
+        try
+        {
+            //the user or an admin requested that the password on this account be reset...
+            //send them the email that will take them through this process
+            String from = this.resetSender;
+            String to = user.getIdentity().getEmail();
+            String subject = MessageFormat.format(
+            this.resetSubject,new Object[]{user.getUserName()});
+            String body = this.getResetPasswordEmail(this.resetEmail,user);
+            MailManagerImpl.getInstance().send(from,to,subject,body);
+        }
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new ServiceException(e);
+        }
+    }
+    
+    /**
+     * 
+     * @param activationTemplate
+     * @param user
+     * @return
+     * @throws Exception
+     */
+    private String getResetPasswordEmail(String emailTemplate,UserBean user) throws Exception
+    {
+        String email = null;
+        
+        String template = emailTemplate;        
+        
+        
+        //process the template 
+        if(!Util.isEmpty(template))
+        {
+            String resetPasswordLink = this.getResetPasswordLink(user);
+            Object[] values = new Object[]{
+                    user.getUserName(), //username
+                    resetPasswordLink,
+                    this.siteConfig.getProperty("siteName")
+            };
+            //replace the place holders with real values in the template
+            email = MessageFormat.format(template,values);
+        }
+        
+        return email;
+    }
+    
+    /**
+     * 
+     * @param activationTemplate
+     * @param user
+     * @return
+     * @throws Exception
+     */
+    private String getActivationEmail(String activationTemplate,UserBean user,boolean isPasswordEncrypted) throws Exception
+    {
+        String email = null;
+        
+        String template = activationTemplate;        
+        
+        
+        //process the template 
+        if(!Util.isEmpty(template))
+        {
+            String activationLink = this.getActivationLink(user,isPasswordEncrypted);
+            Object[] values = new Object[]{
+                    this.siteConfig.getProperty("siteURL"), //siteURL
+                    user.getUserName(),
+                    activationLink,
+                    this.siteConfig.getProperty("siteName")
+            };
+            //replace the place holders with real values in the template
+            email = MessageFormat.format(template,values);
+        }
+        
+        return email;
+    }
+    
+    /**
+     * 
+     * @param activationIssueTemplate
+     * @param user
+     * @param preferredEmail
+     * @param userIP
+     * @param wasPasswordVerified
+     * @return
+     * @throws Exception
+     */
+    private String getActivationIssueEmail(String activationIssueTemplate,UserBean user,
+            String preferredEmail,
+            String userIP,
+            boolean wasPasswordVerified
+    ) throws Exception
+    {
+        String email = null;
+        
+        String template = activationIssueTemplate;        
+        
+        
+        //process the template 
+        if(!Util.isEmpty(template))
+        {
+            String activationLink = this.getActivationLink(user,true);            
+            String profileLink = this.getProfileLink(user);
+            
+            //setup the values to be inserted into the template
+            Object[] values = new Object[]{
+                    user.getIdentity().getUserName(), //login
+                    user.getIdentity().getEmail(), //registered email address
+                    preferredEmail, //this is the email the user said needs to be contacted at with a resolution to this issue
+                    userIP, //IP address of the user issuing the request
+                    new Boolean(wasPasswordVerified), //tells the admin whether the user's password was verified or not
+                    activationLink,
+                    profileLink
+            };
+            
+            
+            //replace the place holders with real values in the template
+            email = MessageFormat.format(template,values);
+        }
+        
+        return email;
+    }
+    
+    /**
+     * 
+     * @param user
+     * @return
+     * @throws Exception
+     */
+    private String getActivationLink(UserBean user,boolean isPasswordEncrypted) throws Exception
+    {
+        String activationLink = null;
+        
+        String password = user.getPassword();
+        if(!isPasswordEncrypted)
+        {
+            password = org.jboss.security.util.Tools.getEncodedPassword(user.getPassword(),"MD5");
+        }
+        
+        
+        String id = org.jboss.website.user.util.Tools.
+        generateToken(
+            new String[]{user.getUserName(),password}
+        );
+        
+        //this remains a plain jsf link regardless or portal or no portal
+        String link = MessageFormat.format(this.activationLink,
+        new Object[]{
+                URLEncoder.encode(user.getUserName(),"UTF-8"),
+                id
+        });
+        
+        //construct the activation link
+        activationLink = this.siteConfig.getProperty("siteSSLURL") + 
+        JSFUtil.getContextPath() +
+        link;
+        
+        return activationLink;
+    }
+    
+    /**
+     * 
+     * @param user
+     * @return
+     * @throws Exception
+     */
+    private String getProfileLink(UserBean user) throws Exception
+    {
+        String profileLink = null;
+        
+        //for now this is a hardcoded portal link to this user's profile...
+        //this will be more flexible once IPC from portal2.2 is integrated
+        String link = MessageFormat.format(this.profileLink,new Object[]{URLEncoder.encode(user.getUserName(),"UTF-8")});
+                
+        //construct the activation link
+        profileLink = this.siteConfig.getProperty("siteURL") + 
+        link
+        ;
+        
+        
+        return profileLink;
+    }
+    
+    /**
+     * 
+     * @param user
+     * @return
+     * @throws Exception
+     */
+    public String getResetPasswordLink(UserBean user) throws ServiceException
+    {
+        try
+        {
+            String resetPasswordLink = null;
+            
+            
+            String token = org.jboss.website.user.util.Tools.
+            generateToken(
+                new String[]{user.getUserName()}
+            );
+            
+            //this remains a plain jsf link regardless or portal or no portal
+            String link = MessageFormat.format(this.resetPasswordLink,
+            new Object[]{
+                    URLEncoder.encode(user.getUserName(),"UTF-8"),
+                    token
+            });
+            
+            //construct the resetPasswordLink
+            resetPasswordLink = this.siteConfig.getProperty("siteSSLURL") + 
+            link;
+            
+            return resetPasswordLink;
+        }
+        catch(Exception e)
+        {
+            throw new ServiceException(e);
+        }
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,9 +0,0 @@
-package org.jboss.website.user.ejb;
-
-import javax.ejb.Local;
-
- at Local
-public interface UserManagerLocal extends UserManager 
-{
-
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerLocal.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,9 @@
+package org.jboss.website.user.ejb;
+
+import javax.ejb.Local;
+
+ at Local
+public interface UserManagerLocal extends UserManager 
+{
+
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,9 +0,0 @@
-package org.jboss.website.user.ejb;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface UserManagerRemote extends UserManager 
-{
-
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ejb/UserManagerRemote.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,9 @@
+package org.jboss.website.user.ejb;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface UserManagerRemote extends UserManager 
+{
+
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,138 +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.website.user.ui;
-
-//core java
-import java.io.Serializable;
-
-//logger
-import org.apache.log4j.Logger;
-
-//jboss-website
-import org.jboss.website.utils.Util;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.service.ServiceException;
-
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * This managed bean serves as the UI controller for user account activation related usecases
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class AccountActivationController implements Serializable
-{
-    private static final Logger log = Logger.getLogger(AccountActivationController.class);
-        
-    
-    //field related
-    private String userEmail = null; //denotes the email address where the activation communication takes place with the user
-    private UserBean user = null;
-    
-    //---accessors-------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public String getUserEmail() 
-    {
-        return userEmail;
-    }
-
-    /**
-     * 
-     * @param userEmail
-     */
-    public void setUserEmail(String userEmail) 
-    {
-        this.userEmail = userEmail;
-    }     
-    //constructor--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public AccountActivationController() throws Exception
-    {
-        this.user = ProfileHelper.getRequestedUser(JSFUtil.getParameter(Constants.id));
-        this.userEmail = user.getIdentity().getEmail();
-        String input = JSFUtil.getParameter(Constants.input);
-        
-        if(
-                !Util.isEmpty(input) &&
-                input.equals("resend")
-         )
-        {
-            this.resendActivationEmail();
-        }
-    }        
-    //processing---------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * The method receives an issue reported by the end-user regarding their account activation...
-     * The site admin needs to be notified so that they can take it from there
-     */
-    public String reportActivationIssue() throws Exception
-    {
-        String navState = null;        
-        try
-        {
-            //get the email where the user must be contacted with this issue resolution
-            String contactEmail = this.userEmail;
-            
-           
-            /**
-             * sending notification to the Administrator regarding the activation issue with this particular account
-             */
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            userManager.sendActivationIssueEmail(
-            this.user, 
-            this.userEmail, //preferred email for contacting the user with this issue...not necessarily the registered address
-            //cause the registered address could be having issues
-            "N/A", //user's IP...its N/A cause cannot seem to get this information in portal
-            true //specifies that the user's password was verfied...if i get here...its verified in the JSF lifecycle
-            );
-            
-            navState = "confirm";
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);            
-        }        
-        return navState;
-    }  
-    
-    /**
-     * 
-     *
-     */
-    private void resendActivationEmail() throws ServiceException
-    {
-        /**
-         * re-sending of the activation email for this user's account...
-         * the email address to send this would be the one they registered with
-         */ 
-        UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-        userManager.sendActivationEmail(this.userEmail,this.user);
-        
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/AccountActivationController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,138 @@
+/*
+* 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.website.user.ui;
+
+//core java
+import java.io.Serializable;
+
+//logger
+import org.apache.log4j.Logger;
+
+//jboss-website
+import org.jboss.website.utils.Util;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.service.ServiceException;
+
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * This managed bean serves as the UI controller for user account activation related usecases
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class AccountActivationController implements Serializable
+{
+    private static final Logger log = Logger.getLogger(AccountActivationController.class);
+        
+    
+    //field related
+    private String userEmail = null; //denotes the email address where the activation communication takes place with the user
+    private UserBean user = null;
+    
+    //---accessors-------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public String getUserEmail() 
+    {
+        return userEmail;
+    }
+
+    /**
+     * 
+     * @param userEmail
+     */
+    public void setUserEmail(String userEmail) 
+    {
+        this.userEmail = userEmail;
+    }     
+    //constructor--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public AccountActivationController() throws Exception
+    {
+        this.user = ProfileHelper.getRequestedUser(JSFUtil.getParameter(Constants.id));
+        this.userEmail = user.getIdentity().getEmail();
+        String input = JSFUtil.getParameter(Constants.input);
+        
+        if(
+                !Util.isEmpty(input) &&
+                input.equals("resend")
+         )
+        {
+            this.resendActivationEmail();
+        }
+    }        
+    //processing---------------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * The method receives an issue reported by the end-user regarding their account activation...
+     * The site admin needs to be notified so that they can take it from there
+     */
+    public String reportActivationIssue() throws Exception
+    {
+        String navState = null;        
+        try
+        {
+            //get the email where the user must be contacted with this issue resolution
+            String contactEmail = this.userEmail;
+            
+           
+            /**
+             * sending notification to the Administrator regarding the activation issue with this particular account
+             */
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            userManager.sendActivationIssueEmail(
+            this.user, 
+            this.userEmail, //preferred email for contacting the user with this issue...not necessarily the registered address
+            //cause the registered address could be having issues
+            "N/A", //user's IP...its N/A cause cannot seem to get this information in portal
+            true //specifies that the user's password was verfied...if i get here...its verified in the JSF lifecycle
+            );
+            
+            navState = "confirm";
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);            
+        }        
+        return navState;
+    }  
+    
+    /**
+     * 
+     *
+     */
+    private void resendActivationEmail() throws ServiceException
+    {
+        /**
+         * re-sending of the activation email for this user's account...
+         * the email address to send this would be the one they registered with
+         */ 
+        UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+        userManager.sendActivationEmail(this.userEmail,this.user);
+        
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,103 +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.website.user.ui;
-
-//core java
-import java.io.IOException;
-
-//logger
-import org.apache.log4j.Logger;
-
-
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.ejb.UserManager;
-
-
-//servlet
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-
-
-/**
- * This managed bean serves as the UI controller/processor that performs the actual
- * activation of the account when a user clicks the activation link emailed to them
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class ActivationLinkProcessor extends HttpServlet
-{
-    private static final Logger log = Logger.getLogger(ActivationLinkProcessor.class);
-        
-    
-    //processors
-    /**
-     * 
-     */
-    public void doGet(HttpServletRequest request,HttpServletResponse response)
-    throws ServletException,IOException
-    {
-        this.doPost(request,response);
-    }
-    
-    /**
-     * 
-     * @param request
-     * @param response
-     * @throws ServletException
-     * @throws IOException
-     */
-    public void doPost(HttpServletRequest request,HttpServletResponse response)
-    throws ServletException,IOException
-    {
-        String id = request.getParameter("id");
-        String token = request.getParameter("token");
-        
-        boolean succeeded = false;
-        try
-        {
-            //process this id for activation of the account
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            succeeded = userManager.activateAccount(id,token);            
-        }
-        catch(Exception se)
-        {
-            log.error(this,se);
-            request.setAttribute("error",se.toString());
-            StringBuffer buffer = request.getRequestURL();
-            buffer.append("?");
-            buffer.append(request.getQueryString());
-            request.setAttribute("activationLink",buffer.toString());
-        }
-        
-        //setup ui data
-        if(succeeded)
-        {
-            request.setAttribute("succeeded",new Boolean(true));
-        }
-        
-        //forward to the ui
-        request.getRequestDispatcher("/WEB-INF/activate.jsp").forward(request,response);
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ActivationLinkProcessor.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,103 @@
+/*
+* 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.website.user.ui;
+
+//core java
+import java.io.IOException;
+
+//logger
+import org.apache.log4j.Logger;
+
+
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.ejb.UserManager;
+
+
+//servlet
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+
+
+/**
+ * This managed bean serves as the UI controller/processor that performs the actual
+ * activation of the account when a user clicks the activation link emailed to them
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class ActivationLinkProcessor extends HttpServlet
+{
+    private static final Logger log = Logger.getLogger(ActivationLinkProcessor.class);
+        
+    
+    //processors
+    /**
+     * 
+     */
+    public void doGet(HttpServletRequest request,HttpServletResponse response)
+    throws ServletException,IOException
+    {
+        this.doPost(request,response);
+    }
+    
+    /**
+     * 
+     * @param request
+     * @param response
+     * @throws ServletException
+     * @throws IOException
+     */
+    public void doPost(HttpServletRequest request,HttpServletResponse response)
+    throws ServletException,IOException
+    {
+        String id = request.getParameter("id");
+        String token = request.getParameter("token");
+        
+        boolean succeeded = false;
+        try
+        {
+            //process this id for activation of the account
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            succeeded = userManager.activateAccount(id,token);            
+        }
+        catch(Exception se)
+        {
+            log.error(this,se);
+            request.setAttribute("error",se.toString());
+            StringBuffer buffer = request.getRequestURL();
+            buffer.append("?");
+            buffer.append(request.getQueryString());
+            request.setAttribute("activationLink",buffer.toString());
+        }
+        
+        //setup ui data
+        if(succeeded)
+        {
+            request.setAttribute("succeeded",new Boolean(true));
+        }
+        
+        //forward to the ui
+        request.getRequestDispatcher("/WEB-INF/activate.jsp").forward(request,response);
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,112 +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.website.user.ui;
-
-
-import java.io.Serializable;
-
-
-import org.apache.log4j.Logger;
-
-import org.jboss.security.acl.User;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * This managed bean serves as a UI controller to help registered users change their own passwords to their account
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class ChangeMyPasswordController implements Serializable
-{
-    private static final Logger log = Logger.getLogger(ChangeMyPasswordController.class);
-        
-    //field related
-    protected ProfileHelper helper = null;    
-    
-    /**
-     * 
-     */
-    public ProfileHelper getHelper() 
-    {
-        return helper;
-    }
-
-    /**
-     * 
-     * @param helper
-     */
-    public void setHelper(ProfileHelper helper) 
-    {
-        this.helper = helper;
-    }            
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public ChangeMyPasswordController() throws Exception
-    {        
-        this.helper = new ProfileHelper();
-        
-        //load the user whose profile needs to be edited
-        User loggedInUser = JSFUtil.getAclUser();
-        String id = null;
-        if(loggedInUser!=null && loggedInUser.getIdentity()!=null && loggedInUser.getIdentity().getUserName()!=null)
-        {
-            id = loggedInUser.getIdentity().getUserName();            
-            UserBean user = ProfileHelper.getRequestedUser(id);
-            if(user!=null)
-            {
-                this.helper.setUser(user);
-            }
-        }        
-    }    
-    //----request processing operations-------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @return
-     */
-    public String changePassword()
-    {
-        String navState = null;
-        try
-        {            
-            UserBean user = this.helper.getUser();
-                                    
-            //change the user's password, by executing the reset process on the backend
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            String newPassword = this.helper.getPass1();   
-            userManager.resetPassword(user.getUserName(),newPassword.getBytes());
-             
-            //setup the navigation state
-            navState = Constants.success;
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        return navState;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ChangeMyPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,112 @@
+/*
+* 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.website.user.ui;
+
+
+import java.io.Serializable;
+
+
+import org.apache.log4j.Logger;
+
+import org.jboss.security.acl.User;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * This managed bean serves as a UI controller to help registered users change their own passwords to their account
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class ChangeMyPasswordController implements Serializable
+{
+    private static final Logger log = Logger.getLogger(ChangeMyPasswordController.class);
+        
+    //field related
+    protected ProfileHelper helper = null;    
+    
+    /**
+     * 
+     */
+    public ProfileHelper getHelper() 
+    {
+        return helper;
+    }
+
+    /**
+     * 
+     * @param helper
+     */
+    public void setHelper(ProfileHelper helper) 
+    {
+        this.helper = helper;
+    }            
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public ChangeMyPasswordController() throws Exception
+    {        
+        this.helper = new ProfileHelper();
+        
+        //load the user whose profile needs to be edited
+        User loggedInUser = JSFUtil.getAclUser();
+        String id = null;
+        if(loggedInUser!=null && loggedInUser.getIdentity()!=null && loggedInUser.getIdentity().getUserName()!=null)
+        {
+            id = loggedInUser.getIdentity().getUserName();            
+            UserBean user = ProfileHelper.getRequestedUser(id);
+            if(user!=null)
+            {
+                this.helper.setUser(user);
+            }
+        }        
+    }    
+    //----request processing operations-------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @return
+     */
+    public String changePassword()
+    {
+        String navState = null;
+        try
+        {            
+            UserBean user = this.helper.getUser();
+                                    
+            //change the user's password, by executing the reset process on the backend
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            String newPassword = this.helper.getPass1();   
+            userManager.resetPassword(user.getUserName(),newPassword.getBytes());
+             
+            //setup the navigation state
+            navState = Constants.success;
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        return navState;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,37 +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.website.user.ui;
-
-public interface Constants 
-{
-    //parameter constants
-    public static final String id = "id";
-    public static final String caller = "caller";
-    public static final String input = "input";
-    public static final String token = "token";
-    
-    //navigation constants
-    public static final String success = "success"; //signifies success on a particular usecase action
-    public static final String error = "error"; //signifies that an error occurred during usecase action
-    public static final String open = "open"; //open signifies the start of a workflow/process
-    public static final String close = "close"; //close signifies the close of a workflow/process
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Constants.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,37 @@
+/*
+* 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.website.user.ui;
+
+public interface Constants 
+{
+    //parameter constants
+    public static final String id = "id";
+    public static final String caller = "caller";
+    public static final String input = "input";
+    public static final String token = "token";
+    
+    //navigation constants
+    public static final String success = "success"; //signifies success on a particular usecase action
+    public static final String error = "error"; //signifies that an error occurred during usecase action
+    public static final String open = "open"; //open signifies the start of a workflow/process
+    public static final String close = "close"; //close signifies the close of a workflow/process
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,103 +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.website.user.ui;
-
-
-import org.apache.log4j.Logger;
-
-//jboss-acl
-import org.jboss.security.acl.User;
-
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * This managed bean serves as a UI controller for a registered user to edit his/her own profile information
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class EditMyProfileController extends EditProfileController
-{
-    private static final Logger log = Logger.getLogger(EditMyProfileController.class);
-        
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public EditMyProfileController() throws Exception 
-    {
-        this.helper = new ProfileHelper();        
-        this.loadUserProfile();
-    } 
-    
-    /**
-     * 
-     * @return
-     */
-    public String edit()
-    {
-        String navState = null;        
-        try
-        {
-            UserBean user = this.helper.getUser();
-            
-            //edit the user's profile........
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            userManager.saveUser(user);
-                     
-            this.loadUserProfile();
-            
-            navState = Constants.success;
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }        
-        return navState;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private void loadUserProfile() throws Exception
-    {
-        //load the user who profile needs to be edited
-        User loggedInUser = JSFUtil.getAclUser();
-        String id = null;
-        boolean userFound = false;
-        if(loggedInUser!=null && loggedInUser.getIdentity()!=null && loggedInUser.getIdentity().getUserName()!=null)
-        {
-            id = loggedInUser.getIdentity().getUserName();            
-            UserBean user = ProfileHelper.getRequestedUser(id);
-            if(user!=null)
-            {
-                this.helper.setUser(user);
-                userFound = true;
-            }
-        }        
-        this.userNotFound = !userFound;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditMyProfileController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,103 @@
+/*
+* 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.website.user.ui;
+
+
+import org.apache.log4j.Logger;
+
+//jboss-acl
+import org.jboss.security.acl.User;
+
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * This managed bean serves as a UI controller for a registered user to edit his/her own profile information
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class EditMyProfileController extends EditProfileController
+{
+    private static final Logger log = Logger.getLogger(EditMyProfileController.class);
+        
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public EditMyProfileController() throws Exception 
+    {
+        this.helper = new ProfileHelper();        
+        this.loadUserProfile();
+    } 
+    
+    /**
+     * 
+     * @return
+     */
+    public String edit()
+    {
+        String navState = null;        
+        try
+        {
+            UserBean user = this.helper.getUser();
+            
+            //edit the user's profile........
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            userManager.saveUser(user);
+                     
+            this.loadUserProfile();
+            
+            navState = Constants.success;
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }        
+        return navState;
+    }
+    
+    /**
+     * 
+     *
+     */
+    private void loadUserProfile() throws Exception
+    {
+        //load the user who profile needs to be edited
+        User loggedInUser = JSFUtil.getAclUser();
+        String id = null;
+        boolean userFound = false;
+        if(loggedInUser!=null && loggedInUser.getIdentity()!=null && loggedInUser.getIdentity().getUserName()!=null)
+        {
+            id = loggedInUser.getIdentity().getUserName();            
+            UserBean user = ProfileHelper.getRequestedUser(id);
+            if(user!=null)
+            {
+                this.helper.setUser(user);
+                userFound = true;
+            }
+        }        
+        this.userNotFound = !userFound;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,128 +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.website.user.ui;
-
-
-import java.io.Serializable;
-
-
-import org.apache.log4j.Logger;
-
-import org.jboss.website.utils.Util;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * This managed bean serves as a UI controller for users with proper privileges to Edit other registered user's profile information
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class EditProfileController implements Serializable
-{
-    private static final Logger log = Logger.getLogger(EditProfileController.class);
-        
-    //field related
-    protected ProfileHelper helper = null;    
-    protected boolean userNotFound = false;
-    
-    /**
-     * 
-     */
-    public ProfileHelper getHelper() 
-    {
-        return helper;
-    }
-
-    /**
-     * 
-     * @param helper
-     */
-    public void setHelper(ProfileHelper helper) 
-    {
-        this.helper = helper;
-    }
-    
-        
-    /**
-     * 
-     * @return
-     */
-    public boolean getUserNotFound()
-    {
-        return this.userNotFound;
-    }
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public EditProfileController() throws Exception
-    {
-        super();
-        if(!this.userNotFound)
-        {
-            this.helper = new ProfileHelper();
-            
-            //load the user who profile needs to be edited
-            String id = JSFUtil.getParameter(Constants.id);
-            boolean userFound = false;
-            if(!Util.isEmpty(id))
-            {                
-                UserBean user = ProfileHelper.getRequestedUser(id);
-                if(user!=null)
-                {
-                    this.helper.setUser(user);
-                    userFound = true;
-                }
-            }        
-            this.userNotFound = !userFound;
-        }
-    }    
-    //----request processing operations-------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @return
-     */
-    public String edit()
-    {
-        String navState = null;
-        try
-        {                         
-            UserBean user = this.helper.getUser();
-                        
-            //edit the user's profile........
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            userManager.saveProfile(user);
-            
-            
-            navState = Constants.success;
-            
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        return navState;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/EditProfileController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,128 @@
+/*
+* 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.website.user.ui;
+
+
+import java.io.Serializable;
+
+
+import org.apache.log4j.Logger;
+
+import org.jboss.website.utils.Util;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * This managed bean serves as a UI controller for users with proper privileges to Edit other registered user's profile information
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class EditProfileController implements Serializable
+{
+    private static final Logger log = Logger.getLogger(EditProfileController.class);
+        
+    //field related
+    protected ProfileHelper helper = null;    
+    protected boolean userNotFound = false;
+    
+    /**
+     * 
+     */
+    public ProfileHelper getHelper() 
+    {
+        return helper;
+    }
+
+    /**
+     * 
+     * @param helper
+     */
+    public void setHelper(ProfileHelper helper) 
+    {
+        this.helper = helper;
+    }
+    
+        
+    /**
+     * 
+     * @return
+     */
+    public boolean getUserNotFound()
+    {
+        return this.userNotFound;
+    }
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public EditProfileController() throws Exception
+    {
+        super();
+        if(!this.userNotFound)
+        {
+            this.helper = new ProfileHelper();
+            
+            //load the user who profile needs to be edited
+            String id = JSFUtil.getParameter(Constants.id);
+            boolean userFound = false;
+            if(!Util.isEmpty(id))
+            {                
+                UserBean user = ProfileHelper.getRequestedUser(id);
+                if(user!=null)
+                {
+                    this.helper.setUser(user);
+                    userFound = true;
+                }
+            }        
+            this.userNotFound = !userFound;
+        }
+    }    
+    //----request processing operations-------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @return
+     */
+    public String edit()
+    {
+        String navState = null;
+        try
+        {                         
+            UserBean user = this.helper.getUser();
+                        
+            //edit the user's profile........
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            userManager.saveProfile(user);
+            
+            
+            navState = Constants.success;
+            
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        return navState;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,325 +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.website.user.ui;
-
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-
-import org.apache.log4j.Logger;
-
-import org.jboss.security.acl.Role;
-import org.jboss.security.acl.User;
-import org.jboss.security.acl.UserThreadLocal;
-import org.jboss.website.utils.Util;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.service.ServiceException;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * This managed bean serves as a UI controller to helps verify the secret question of registered users so that their passwords can be reset
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
- *
- */
-public class LostPasswordController implements Serializable
-{
-    private static final Logger log = Logger.getLogger(LostPasswordController.class);
-        
-    //field related
-    private ProfileHelper helper = null; 
-    private boolean isInActive = false;
-    
-    /**
-     * represents the state when the answer submitted by the user does not match the one stored in the system
-     */
-    private boolean answerMatchFailed = false;
-    
-    /**
-     * represents the username of the user trying to retrieve the password..
-     * this is collected by asking the user
-     */
-    private String username = null;
-    
-    /**
-     * this is the secret answer submitted by the user to verify before retrieving the password
-     */
-    private String secretAnswer = null;
-    
-    /**
-     * This is used in session scoped managed beans to cleanup the state when a particular usecase reaches closure 
-     *
-     */
-    private void reset()
-    {
-        this.isInActive = false;
-        this.answerMatchFailed = false;
-        this.helper = null;        
-        this.secretAnswer = null;
-    }
-    
-    //------------------------------------------------------------------------------------------------------------------------------------------------                 
-    /**
-     * 
-     * @return
-     */
-    public boolean isInActive()
-    {
-        return this.isInActive;
-    }  
-        
-    /**
-     * 
-     * @return
-     */
-    public boolean isAnswerMatchFailed() 
-    {
-        return answerMatchFailed;
-    }
-
-    /**
-     * 
-     * @return
-     */    
-    public ProfileHelper getHelper() 
-    {
-        return helper;
-    }
-
-    /**
-     * 
-     * @param helper
-     */
-    public void setHelper(ProfileHelper helper) 
-    {
-        this.helper = helper;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public String getUsername() 
-    {
-        return username;
-    }
-
-    /**
-     * 
-     * @param username
-     */
-    public void setUsername(String username) 
-    {
-        this.username = username;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getSecretAnswer() 
-    {
-        return secretAnswer;
-    }
-
-    /**
-     * 
-     * @param secretAnswer
-     */
-    public void setSecretAnswer(String secretAnswer) 
-    {
-        this.secretAnswer = secretAnswer;
-    }
-
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public LostPasswordController() 
-    throws ServiceException,Exception
-    {                        
-    }         
-    //----request processing operations-------------------------------------------------------------------------------------------------------
-    /**
-     *  This method processes the username submitted by the user and pulls in the secret question to be asked on the next screen.
-     *  If the user is inactive or not found, the corresponding error is displayed
-     */
-    public String verifyUser()
-    {
-        String navState = null;
-        this.reset(); //this makes sure this usecase conversation starts off fresh....this bean is conversational
-        try
-        {            
-            UserBean user = ProfileHelper.getRequestedUser(this.username);
-            
-            this.helper = new ProfileHelper();
-            this.helper.setUser(user);
-            
-            if(!user.getIdentity().isActive())
-            {
-                this.isInActive = true;
-                return null; //this makes user stay on the same screen
-            }
-            
-            //check and make sure that the secret question is not empty..
-            //if it is, no point in asking the answer, go straight to sending out the reset email
-            if(Util.isEmpty(user.getIdentity().getSecretQuestion()))
-            {
-                //email them the link to reset the password on this account
-                this.sendPasswordResetEmail();
-                navState = Constants.close;
-            }
-            else
-            {
-                navState = Constants.success;
-            }                        
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        return navState;
-    }
-    /**
-     * This method processes the user's secret answer. If the secret answer associated with the secret question matches
-     * The link to reset the password is emailed to this user's registered email address
-     * If not matched the user is asked again
-     */
-    public String verifySecretAnswer()
-    {
-        String navState = null;
-        try
-        {
-            //perform matching between the stored answer and the answer submitted by the user
-            boolean matchMade = this.matchAnswer();
-           
-            //match failed...ask the user again for the answer
-            if(!matchMade)
-            {
-                return null; //this makes the user stay on the same screen
-            }
-            
-            //if i am here....answer matches..go ahead and send this user the reset email
-            this.sendPasswordResetEmail();
-            
-            navState = Constants.success;
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        return navState;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    private boolean matchAnswer()
-    {
-        boolean match = false;
-        
-        String submitted = this.secretAnswer;
-        String stored = this.helper.getAnswer();        
-        //avoid any possible nullpointers
-        if(submitted==null)
-        {
-            submitted = "";
-        }        
-        if(stored==null)
-        {
-            stored = "";
-        }
-        
-        //perform the matching
-        if(submitted.trim().equals(stored.trim()))
-        {
-            match = true;
-        }
-        
-        //set the proper state for the UI
-        this.answerMatchFailed = !match;
-        
-        return match;
-    }
-    
-    
-    /**
-     * This method sends out the email to the user where the user can start the process of resetting their password
-     *
-     */
-    private void sendPasswordResetEmail() throws Exception
-    { 
-        try
-        {
-            this.addSystemRole();
-            ((UserManager)DomainService.getService(UserManager.class.getName())).
-            sendResetPasswordEmail(this.helper.getUser());
-        }
-        finally
-        {
-            this.cleanupSystemRole();
-        }
-    }
-    
-    /**
-     * 
-     */
-    private void addSystemRole() throws Exception
-    {
-        if(UserThreadLocal.getUser()==null)
-        {
-            User user = User.getUser(null);  
-            UserThreadLocal.setUser(user);
-        }
-        Role role = new Role();
-        role.setId("system");
-        role.setName("system");
-        UserThreadLocal.getUser().getRoles().add(role);
-    }
-    
-    /**
-     * 
-     */
-    private void cleanupSystemRole()
-    {
-        if(UserThreadLocal.getUser()!=null)
-        {
-            Collection roles = UserThreadLocal.getUser().getRoles();
-            Collection newRoles = new ArrayList();
-            for(Iterator itr=roles.iterator();itr.hasNext();)
-            {
-                Role cour = (Role)itr.next();
-                if(!cour.getId().equalsIgnoreCase("system"))
-                {
-                    newRoles.add(cour);
-                }
-            }
-            UserThreadLocal.getUser().setRoles(newRoles);            
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/LostPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,325 @@
+/*
+* 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.website.user.ui;
+
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+
+import org.apache.log4j.Logger;
+
+import org.jboss.security.acl.Role;
+import org.jboss.security.acl.User;
+import org.jboss.security.acl.UserThreadLocal;
+import org.jboss.website.utils.Util;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.service.ServiceException;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * This managed bean serves as a UI controller to helps verify the secret question of registered users so that their passwords can be reset
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
+ *
+ */
+public class LostPasswordController implements Serializable
+{
+    private static final Logger log = Logger.getLogger(LostPasswordController.class);
+        
+    //field related
+    private ProfileHelper helper = null; 
+    private boolean isInActive = false;
+    
+    /**
+     * represents the state when the answer submitted by the user does not match the one stored in the system
+     */
+    private boolean answerMatchFailed = false;
+    
+    /**
+     * represents the username of the user trying to retrieve the password..
+     * this is collected by asking the user
+     */
+    private String username = null;
+    
+    /**
+     * this is the secret answer submitted by the user to verify before retrieving the password
+     */
+    private String secretAnswer = null;
+    
+    /**
+     * This is used in session scoped managed beans to cleanup the state when a particular usecase reaches closure 
+     *
+     */
+    private void reset()
+    {
+        this.isInActive = false;
+        this.answerMatchFailed = false;
+        this.helper = null;        
+        this.secretAnswer = null;
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------------------------------------                 
+    /**
+     * 
+     * @return
+     */
+    public boolean isInActive()
+    {
+        return this.isInActive;
+    }  
+        
+    /**
+     * 
+     * @return
+     */
+    public boolean isAnswerMatchFailed() 
+    {
+        return answerMatchFailed;
+    }
+
+    /**
+     * 
+     * @return
+     */    
+    public ProfileHelper getHelper() 
+    {
+        return helper;
+    }
+
+    /**
+     * 
+     * @param helper
+     */
+    public void setHelper(ProfileHelper helper) 
+    {
+        this.helper = helper;
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public String getUsername() 
+    {
+        return username;
+    }
+
+    /**
+     * 
+     * @param username
+     */
+    public void setUsername(String username) 
+    {
+        this.username = username;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getSecretAnswer() 
+    {
+        return secretAnswer;
+    }
+
+    /**
+     * 
+     * @param secretAnswer
+     */
+    public void setSecretAnswer(String secretAnswer) 
+    {
+        this.secretAnswer = secretAnswer;
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public LostPasswordController() 
+    throws ServiceException,Exception
+    {                        
+    }         
+    //----request processing operations-------------------------------------------------------------------------------------------------------
+    /**
+     *  This method processes the username submitted by the user and pulls in the secret question to be asked on the next screen.
+     *  If the user is inactive or not found, the corresponding error is displayed
+     */
+    public String verifyUser()
+    {
+        String navState = null;
+        this.reset(); //this makes sure this usecase conversation starts off fresh....this bean is conversational
+        try
+        {            
+            UserBean user = ProfileHelper.getRequestedUser(this.username);
+            
+            this.helper = new ProfileHelper();
+            this.helper.setUser(user);
+            
+            if(!user.getIdentity().isActive())
+            {
+                this.isInActive = true;
+                return null; //this makes user stay on the same screen
+            }
+            
+            //check and make sure that the secret question is not empty..
+            //if it is, no point in asking the answer, go straight to sending out the reset email
+            if(Util.isEmpty(user.getIdentity().getSecretQuestion()))
+            {
+                //email them the link to reset the password on this account
+                this.sendPasswordResetEmail();
+                navState = Constants.close;
+            }
+            else
+            {
+                navState = Constants.success;
+            }                        
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        return navState;
+    }
+    /**
+     * This method processes the user's secret answer. If the secret answer associated with the secret question matches
+     * The link to reset the password is emailed to this user's registered email address
+     * If not matched the user is asked again
+     */
+    public String verifySecretAnswer()
+    {
+        String navState = null;
+        try
+        {
+            //perform matching between the stored answer and the answer submitted by the user
+            boolean matchMade = this.matchAnswer();
+           
+            //match failed...ask the user again for the answer
+            if(!matchMade)
+            {
+                return null; //this makes the user stay on the same screen
+            }
+            
+            //if i am here....answer matches..go ahead and send this user the reset email
+            this.sendPasswordResetEmail();
+            
+            navState = Constants.success;
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        return navState;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    private boolean matchAnswer()
+    {
+        boolean match = false;
+        
+        String submitted = this.secretAnswer;
+        String stored = this.helper.getAnswer();        
+        //avoid any possible nullpointers
+        if(submitted==null)
+        {
+            submitted = "";
+        }        
+        if(stored==null)
+        {
+            stored = "";
+        }
+        
+        //perform the matching
+        if(submitted.trim().equals(stored.trim()))
+        {
+            match = true;
+        }
+        
+        //set the proper state for the UI
+        this.answerMatchFailed = !match;
+        
+        return match;
+    }
+    
+    
+    /**
+     * This method sends out the email to the user where the user can start the process of resetting their password
+     *
+     */
+    private void sendPasswordResetEmail() throws Exception
+    { 
+        try
+        {
+            this.addSystemRole();
+            ((UserManager)DomainService.getService(UserManager.class.getName())).
+            sendResetPasswordEmail(this.helper.getUser());
+        }
+        finally
+        {
+            this.cleanupSystemRole();
+        }
+    }
+    
+    /**
+     * 
+     */
+    private void addSystemRole() throws Exception
+    {
+        if(UserThreadLocal.getUser()==null)
+        {
+            User user = User.getUser(null);  
+            UserThreadLocal.setUser(user);
+        }
+        Role role = new Role();
+        role.setId("system");
+        role.setName("system");
+        UserThreadLocal.getUser().getRoles().add(role);
+    }
+    
+    /**
+     * 
+     */
+    private void cleanupSystemRole()
+    {
+        if(UserThreadLocal.getUser()!=null)
+        {
+            Collection roles = UserThreadLocal.getUser().getRoles();
+            Collection newRoles = new ArrayList();
+            for(Iterator itr=roles.iterator();itr.hasNext();)
+            {
+                Role cour = (Role)itr.next();
+                if(!cour.getId().equalsIgnoreCase("system"))
+                {
+                    newRoles.add(cour);
+                }
+            }
+            UserThreadLocal.getUser().setRoles(newRoles);            
+        }
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,974 +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.website.user.ui;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.faces.model.SelectItem;
-
-import org.jboss.security.acl.User;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.security.JBossIdentity;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.utils.Util;
-import org.jboss.website.user.bo.ProfileBean;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-import org.jboss.website.service.ServiceException;
-
-//jboss-identity-management 
-import org.jboss.security.idm.Address;
-
-/**
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class ProfileHelper implements Serializable 
-{    
-    //lists data
-    private static final String[][] ROLES =
-    {
-        {"","Please Choose"}, 
-        {"developer","Developer"}, 
-        {"operations_support","Operations/Support"}, 
-        {"cto_cio","CTO/CIO"}, 
-        {"sales_marketing","Sales/Marketing"}, 
-        {"other","Other"}
-    };
-        
-    private static final String[] COUNTRIES =
-    {
-        "", "United States of America", "Afganistan", "Albania", "Algeria", "AmericanSamoa", "Andorra", "Angola", "Anguilla", "Antigua&Barbuda", "Argentina", "Armenia",
-        "Aruba", "Australia", "Austria", "Azerbaijan", "Azores", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium",
-        "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bonaire", "Bosnia&Herzegovina", "Botswana", "Brazil", "BritishIndianOceanTer",
-        "Brunei", "Bulgaria", "BurkinaFaso", "Burundi", "Cambodia", "Cameroon", "Canada", "CanaryIslands", "CapeVerde", "CaymanIslands",
-        "CentralAfricanRepublic", "Chad", "ChannelIslands", "Chile", "China", "ChristmasIsland", "CocosIsland", "Columbia", "Comoros",
-        "Congo", "CookIslands", "CostaRica", "CoteDIvoire", "Croatia", "Cuba", "Curaco", "Cyprus", "CzechRepublic", "Denmark", "Djibouti",
-        "Dominica", "DominicanRepublic", "EastTimor", "Ecuador", "Egypt", "ElSalvador", "EquatorialGuinea", "Eritrea", "Estonia", "Ethiopia",
-        "FalklandIslands", "FaroeIslands", "Fiji", "Finland", "France", "FrenchGuiana", "FrenchPolynesia", "FrenchSouthernTer", "Gabon",
-        "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "GreatBritain", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam",
-        "Guatemala", "Guinea", "Guyana", "Haiti", "Hawaii", "Honduras", "HongKong", "Hungary", "Iceland", "India", "Indonesia", "Iran", "Iraq",
-        "Ireland", "IsleofMan", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "KoreaNorth", "KoreaSout",
-        "Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg",
-        "Macau", "Macedonia", "Madagascar", "Malaysia", "Malawi", "Maldives", "Mali", "Malta", "MarshallIslands", "Martinique", "Mauritania",
-        "Mauritius", "Mayotte", "Mexico", "MidwayIslands", "Moldova", "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar",
-        "Nambia", "Nauru", "Nepal", "NetherlandAntilles", "Netherlands", "Nevis", "NewCaledonia", "NewZealand", "Nicaragua", "Niger",
-        "Nigeria", "Niue", "NorfolkIsland", "Norway", "Oman", "Pakistan", "PalauIsland", "Palestine", "Panama", "PapuaNewGuinea", "Paraguay",
-        "Peru", "Phillipines", "PitcairnIsland", "Poland", "Portugal", "PuertoRico", "Qatar", "Reunion", "Romania", "Russia", "Rwanda",
-        "StBarthelemy", "StEustatius", "StHelena", "StKitts-Nevis", "StLucia", "StMaarten", "StPierre&Miquelon", "StVincent&Grenadines",
-        "Saipan", "Samoa", "SamoaAmerican", "SanMarino", "SaoTome&Principe", "SaudiArabia", "Senegal", "Seychelles", "Serbia&Montenegro",
-        "SierraLeone", "Singapore", "Slovakia", "Slovenia", "SolomonIslands", "Somalia", "SouthAfrica", "Spain", "SriLanka", "Sudan",
-        "Suriname", "Swaziland", "Sweden", "Switzerland", "Syria", "Tahiti", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "Togo",
-        "Tokelau", "Tonga", "Trinidad&Tobago", "Tunisia", "Turkey", "Turkmenistan", "Turks&CaicosIs", "Tuvalu", "Uganda", "Ukraine",
-        "UnitedArabErimates", "UnitedKingdom", "Uraguay", "Uzbekistan", "Vanuatu", "VaticanCityState", "Venezuela",
-        "Vietnam", "VirginIslands(Brit)", "VirginIslands(USA)", "WakeIsland", "Wallis&FutanaIs", "Yemen", "Zaire", "Zambia", "Zimbabwe"
-     };
-    
-    private static final String[][] STATES =
-    {
-        {"",""}, 
-        {"ALABAMA","AL"}, 
-        {"ALASKA","AK"}, 
-        {"AMERICAN SAMOA","AS"}, 
-        {"ARIZONA","AZ"}, 
-        {"ARKANSAS","AR"}, 
-        {"CALIFORNIA","CA"}, 
-        {"COLORADO","CO"}, 
-        {"CONNECTICUT","CT"}, 
-        {"DELAWARE","DE"},
-        {"DISTRICT OF COLUMBIA","DC"}, 
-        {"FLORIDA","FL"}, 
-        {"GEORGIA","GA"}, 
-        {"GUAM","GU"}, 
-        {"HAWAII","HI"}, 
-        {"IDAHO","ID"}, 
-        {"ILLINOIS","IL"},
-        {"INDIANA","IN"}, 
-        {"IOWA","IA"}, 
-        {"KANSAS","KS"},
-        {"KENTUCKY","KY"}, 
-        {"LOUISIANA","LA"}, 
-        {"MAINE","ME"}, 
-        {"MARYLAND","MD"}, 
-        {"MASSACHUSETTS","MA"}, 
-        {"MICHIGAN","MI"}, 
-        {"MINNESOTA","MN"}, 
-        {"MISSISSIPPI","MS"}, 
-        {"MISSOURI","MO"},
-        {"MONTANA","MT"}, 
-        {"NEBRASKA","NE"}, 
-        {"NEVADA","NV"}, 
-        {"NEW HAMPSHIRE","NH"}, 
-        {"NEW JERSEY","NJ"}, 
-        {"NEW MEXICO","NM"}, 
-        {"NEW YORK","NY"}, 
-        {"NORTH CAROLINA","NC"}, 
-        {"NORTH DAKOTA","ND"},
-        {"OHIO","OH"}, 
-        {"OKLAHOMA","OK"}, 
-        {"OREGON","OR"}, 
-        {"PENNSYLVANIA","PA"}, 
-        {"PUERTO RICO","PR"}, 
-        {"RHODE ISLAND","RI"}, 
-        {"SOUTH CAROLINA","SC"}, 
-        {"SOUTH DAKOTA","SD"}, 
-        {"TENNESSEE","TN"},
-        {"TEXAS","TX"}, 
-        {"UTAH","UT"}, 
-        {"VERMONT","VT"}, 
-        {"VIRGIN ISLANDS","VI"}, 
-        {"VIRGINIA","VA"}, 
-        {"WASHINGTON","WA"}, 
-        {"WEST VIRGINIA","WV"}, 
-        {"WISCONSIN","WI"}, 
-        {"WYOMING","WY"}
-    };
-    
-    private static final String[][] USERTYPES =
-    {
-        {"","Please Choose"}, 
-        {"enduser","End-User"}, 
-        {"systemintegrator","Systems Integrator"}, 
-        {"softwarevendor","Software Vendor"}, 
-        {"academia","Academia"}, 
-        {"other","Other"}
-    };
-    
-    private static final String[][] COMPANYSIZES =
-    {
-        {"","Please Choose"}, 
-        {"_20","Less than 20 employees"}, 
-        {"21_100","21-100 employees"}, 
-        {"100_999","100-999 employees"},
-        {"1000_","1000+ employees"}, 
-        {"other","Other"}
-    };
-    
-    //field data
-    private String uname = null;
-    private String pass1 = null;
-    private String pass2 = null;
-    private String realemail = null;
-    private String confirmrealemail = null;
-    private String fakeemail = null;
-    private String question = null;
-    private String answer = null;
-    private String fname = null;
-    private String lname = null;
-    private String cname = null;
-    private String title = null;
-    private String phone = null;
-    private String street = null;
-    private String city = null;
-    private String zip = null;
-    private String country = null;
-    private String state = null;
-    private String interestinjboss_eval = null;
-    private String interestinjboss_dev = null;
-    private String interestinjboss_deploy = null;
-    private boolean newsletter = false;
-    private boolean salescontact = false;
-    private boolean supportcontact = false;
-    private String role = null;
-    private String usertype = null;
-    private String companysize = null;
-    private String industry = null;
-    
-    //eloqua data
-    
-    
-    
-    //--------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @return
-     */
-    public String getUname()
-    {
-        return this.uname;
-    }
-    
-    /**
-     * 
-     * @param uname
-     */
-    public void setUname(String uname)
-    {
-        this.uname = uname;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getPass1()
-    {
-        return this.pass1;
-    }
-    
-    /**
-     * 
-     * @param pass1
-     */
-    public void setPass1(String pass1)
-    {
-        this.pass1 = pass1;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getPass2()
-    {
-        return this.pass2;
-    }
-    
-    /**
-     * 
-     * @param pass2
-     */
-    public void setPass2(String pass2)
-    {
-        this.pass2 = pass2;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getRealemail()
-    {
-        return this.realemail;
-    }
-    
-    /**
-     * 
-     * @param realemail
-     */
-    public void setRealemail(String realemail)
-    {
-        this.realemail = realemail;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getConfirmrealemail()
-    {
-        return this.confirmrealemail;
-    }
-    
-    /**
-     * 
-     * @param confirmrealemail
-     */
-    public void setConfirmrealemail(String confirmrealemail)
-    {
-        this.confirmrealemail = confirmrealemail;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getFakeemail()
-    {
-        return this.fakeemail;
-    }
-    
-    /**
-     * 
-     * @param fakeemail
-     */
-    public void setFakeemail(String fakeemail)
-    {
-        this.fakeemail = fakeemail;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getQuestion()
-    {
-        return this.question;
-    }
-    
-    /**
-     * 
-     * @param question
-     */
-    public void setQuestion(String question)
-    {
-        this.question = question;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getAnswer()
-    {
-        return this.answer;
-    }
-    
-    /**
-     * 
-     * @param answer
-     */
-    public void setAnswer(String answer)
-    {
-        this.answer = answer;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getFname()
-    {
-        return this.fname;
-    }
-    
-    /**
-     * 
-     * @param fname
-     */
-    public void setFname(String fname)
-    {
-        this.fname = fname;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getLname()
-    {
-        return this.lname;
-    }
-    
-    /**
-     * 
-     * @param lname
-     */
-    public void setLname(String lname)
-    {
-        this.lname = lname;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getCname()
-    {
-        return this.cname;
-    }
-    
-    /**
-     * 
-     * @param cname
-     */
-    public void setCname(String cname)
-    {
-        this.cname = cname;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getTitle()
-    {
-        return this.title;
-    }
-    
-    /**
-     * 
-     * @param title
-     */
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getPhone()
-    {
-        return this.phone;
-    }
-    
-    /**
-     * 
-     * @param phone
-     */
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getStreet()
-    {
-        return this.street;
-    }
-    
-    /**
-     * 
-     * @param street
-     */
-    public void setStreet(String street)
-    {
-        this.street = street;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getCity()
-    {
-        return this.city;
-    }
-    
-    /**
-     * 
-     * @param city
-     */
-    public void setCity(String city)
-    {
-        this.city = city;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getZip()
-    {
-        return this.zip;
-    }
-    
-    /**
-     * 
-     * @param zip
-     */
-    public void setZip(String zip)
-    {
-        this.zip = zip;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getCountry()
-    {
-        return this.country;
-    }
-    
-    /**
-     * 
-     * @param country
-     */
-    public void setCountry(String country)
-    {
-        this.country = country;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public Collection<SelectItem> getCountries()
-    {
-        Collection<SelectItem> countries = null;
-        
-        countries = new ArrayList<SelectItem>();
-        for(int i=0;i<ProfileHelper.COUNTRIES.length;i++)
-        {
-            String cour = ProfileHelper.COUNTRIES[i];
-            SelectItem item = new SelectItem();
-            item.setValue(cour);
-            item.setLabel(cour);
-            
-            if(cour.equalsIgnoreCase("United States of America"))
-            {
-                item.setValue("USA");
-            }
-            
-            countries.add(item);
-        }
-        
-        return countries;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getState()
-    {
-        return this.state;
-    }
-    
-    /**
-     * 
-     * @param state
-     */
-    public void setState(String state)
-    {
-        this.state = state;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public Collection<SelectItem> getStates()
-    {
-        Collection<SelectItem> states = null;
-        
-        states = new ArrayList<SelectItem>();
-        for(int i=0;i<ProfileHelper.STATES.length;i++)
-        {
-            String value = ProfileHelper.STATES[i][1];
-            String label = ProfileHelper.STATES[i][0];
-            SelectItem item = new SelectItem();
-            item.setValue(value);
-            item.setLabel(label);                                   
-            states.add(item);
-        }
-        
-        return states;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getRole()
-    {
-        return this.role;
-    }
-    
-    /**
-     * 
-     * @param role
-     */
-    public void setRole(String role)
-    {
-        this.role = role;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public Collection<SelectItem> getRoles()
-    {
-        Collection<SelectItem> roles = null;
-        
-        roles = new ArrayList<SelectItem>();
-        for(int i=0;i<ProfileHelper.ROLES.length;i++)
-        {
-            String roleValue = ProfileHelper.ROLES[i][0];
-            String roleLabel = ProfileHelper.ROLES[i][1];
-            SelectItem item = new SelectItem();
-            item.setValue(roleValue);
-            item.setLabel(roleLabel);
-            roles.add(item);
-        }       
-        
-        return roles;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String[] getInterestinjboss_eval()
-    {
-        String[] items = null;
-        if(!Util.isEmpty(this.interestinjboss_eval))
-        {
-            items = new String[]{this.interestinjboss_eval};
-        }
-        return items;
-    }
-    
-    /**
-     * 
-     * @param items
-     */
-    public void setInterestinjboss_eval(String[] items)
-    {
-        if(!Util.isEmpty(items))
-        {
-            this.interestinjboss_eval = items[0];
-        }
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String[] getInterestinjboss_dev()
-    {
-        String[] items = null;
-        if(!Util.isEmpty(this.interestinjboss_dev))
-        {
-            items = new String[]{this.interestinjboss_dev};
-        }
-        return items;
-    }
-    
-    /**
-     * 
-     * @param items
-     */
-    public void setInterestinjboss_dev(String[] items)
-    {
-        if(!Util.isEmpty(items))
-        {
-            this.interestinjboss_dev = items[0];
-        }
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String[] getInterestinjboss_deploy()
-    {
-        String[] items = null;
-        if(!Util.isEmpty(this.interestinjboss_deploy))
-        {
-            items = new String[]{this.interestinjboss_deploy};
-        }
-        return items;
-    }
-    public void setInterestinjboss_deploy(String[] items)
-    {
-        if(!Util.isEmpty(items))
-        {
-            this.interestinjboss_deploy = items[0];
-        }
-    }
-    public boolean getSalescontact()
-    {
-        return this.salescontact;
-    }
-    public void setSalescontact(boolean salescontact)
-    {
-        this.salescontact = salescontact;
-    }
-    public boolean getSupportcontact()
-    {
-        return this.supportcontact;
-    }
-    public void setSupportcontact(boolean supportcontact)
-    {
-        this.supportcontact = supportcontact;
-    }
-    public boolean getNewsletter()
-    {
-        return this.newsletter;
-    }
-    public void setNewsletter(boolean newsletter)
-    {
-        this.newsletter = newsletter;
-    }
-    public String getUsertype()
-    {
-        return this.usertype;
-    }
-    public void setUsertype(String usertype)
-    {
-        this.usertype = usertype;
-    }
-    public Collection<SelectItem> getUsertypes()
-    {
-        Collection<SelectItem> usertypes = null;
-        
-        usertypes = new ArrayList<SelectItem>();
-        for(int i=0;i<ProfileHelper.USERTYPES.length;i++)
-        {
-            String value = ProfileHelper.USERTYPES[i][0];
-            String label = ProfileHelper.USERTYPES[i][1];
-            SelectItem item = new SelectItem();
-            item.setValue(value);
-            item.setLabel(label);                                   
-            usertypes.add(item);
-        }
-        
-        return usertypes;
-    }
-    public String getCompanysize()
-    {
-        return this.companysize;
-    }
-    public void setCompanysize(String companysize)
-    {
-        this.companysize = companysize;
-    }
-    public Collection<SelectItem> getCompanysizes()
-    {
-        Collection<SelectItem> companySizes = null;
-        
-        companySizes = new ArrayList<SelectItem>();
-        for(int i=0;i<ProfileHelper.COMPANYSIZES.length;i++)
-        {
-            String value = ProfileHelper.COMPANYSIZES[i][0];
-            String label = ProfileHelper.COMPANYSIZES[i][1];
-            SelectItem item = new SelectItem();
-            item.setValue(value);
-            item.setLabel(label);                                   
-            companySizes.add(item);
-        }
-        
-        return companySizes;
-    }
-    public String getIndustry()
-    {
-        return this.industry;
-    }
-    public void setIndustry(String industry)
-    {
-        this.industry = industry;
-    }
-    
-    //---------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     * @param user
-     */
-    protected void setUser(UserBean user)
-    {
-        JBossIdentity identity = user.getIdentity();
-        ProfileBean profile = user.getProfile();
-        
-        //registered username
-        this.uname = user.getUserName();
-        
-        //---identity unmarshalling-----------------------------------------------------------------------------------------------------
-        if(identity!=null)
-        {
-            //registered email address
-            this.realemail = identity.getEmail();
-            
-            //firstname and lastname
-            String fullName = identity.getFullName();
-            int nameSeparator = fullName.indexOf(' ');
-            this.fname = fullName.substring(0,nameSeparator).trim();
-            this.lname = fullName.substring(nameSeparator).trim();
-            
-            //secret question
-            this.question = identity.getSecretQuestion();
-            
-            //secret answer
-            this.answer = identity.getSecretAnswer();
-            
-            //fakeemail
-            if(!Util.isEmpty(identity.getOtherEmails()))
-            {                
-                this.fakeemail = (String)identity.getOtherEmails().iterator().next();
-            }
-            
-            //phone number
-            if(!Util.isEmpty(identity.getPhoneNumbers()))
-            {                
-                this.phone = (String)identity.getPhoneNumbers().iterator().next();
-            }
-            
-            //company name,company role,companytitle
-            this.cname = identity.getCompanyName();
-            this.role = identity.getCompanyRole();
-            this.title = identity.getCompanyTitle();
-            
-            //company address
-            if(identity.getCompanyAddress()!=null)
-            {
-                Address companyAddress = identity.getCompanyAddress();
-                this.street = companyAddress.getStreet();
-                this.city = companyAddress.getCity();
-                this.state = companyAddress.getState();
-                this.zip = companyAddress.getPostalCode();
-                this.country = companyAddress.getCountry();
-            }
-            
-        }        
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    protected UserBean getUser()
-    {
-        UserBean user = new UserBean();
-        ProfileBean profile = new ProfileBean();
-        JBossIdentity identity = new JBossIdentity();
-        user.setProfile(profile);
-        user.setIdentity(identity);
-        
-        //start userbean construction
-        user.setValidated(true);
-        
-        //identity setup-----------------------------------------------------------------------------------------------------------------------------------
-        //username
-        user.setUserName(this.uname);
-        identity.setUserName(this.uname);
-        
-        //password
-        if(this.pass1!=null)
-        {
-            identity.setPassword(this.pass1.getBytes());
-        }
-        
-        //email information
-        identity.setEmail(this.realemail);
-        
-        //fullName
-        identity.setFullName(this.fname+" "+this.lname);
-        
-        //secret question and answer
-        identity.setSecretQuestion(this.question);
-        identity.setSecretAnswer(this.answer);
-        
-        //other emails
-        identity.addEmail(this.fakeemail);
-        
-        //other phone
-        identity.addPhoneNumber(this.phone);
-        
-        //company name,company role,companytitle
-        identity.setCompanyName(this.cname);
-        identity.setCompanyRole(this.role);
-        identity.setCompanyTitle(this.title);
-        
-        //company address
-        Address companyAddress = new Address();
-        companyAddress.setStreet(this.street);
-        companyAddress.setCity(this.city);
-        companyAddress.setState(this.state);
-        companyAddress.setCountry(this.country);
-        companyAddress.setPostalCode(this.zip);
-        identity.setCompanyAddress(companyAddress);
-        
-        //profile setup----------------------------------------------------------------------------------------------------------------
-        //company type
-        profile.setCompanyType(this.usertype);
-        
-        //company size
-        profile.setCompanySize(this.companysize);
-        
-        //interest type
-        StringBuffer buffer = new StringBuffer();
-        if(!Util.isEmpty(this.interestinjboss_eval))
-        {
-            buffer.append("eval:");
-        }
-        if(!Util.isEmpty(this.interestinjboss_dev))
-        {
-            buffer.append("dev:");
-        }
-        if(!Util.isEmpty(this.interestinjboss_deploy))
-        {
-            buffer.append("deploy");
-        }
-        profile.setInterestType(buffer.toString());
-        
-        //industry
-        profile.setIndustry(this.industry);
-        
-        //newsletter
-        profile.setNewsLetter(this.newsletter);
-        
-        //salescontact
-        profile.setSalesContact(this.salescontact);
-        
-        //suppport contact
-        profile.setSupportContact(this.supportcontact);
-                
-        return user;
-    }
-    
-    /**
-     * 
-     * @return
-     * @throws Exception
-     */
-    public static UserBean getLoggedInUser() throws Exception
-    {
-        UserBean user = null;
-        
-        //load the user who profile needs to be edited
-        User loggedInUser = JSFUtil.getAclUser();
-        String id = null;
-        if(loggedInUser!=null && loggedInUser.getIdentity()!=null && loggedInUser.getIdentity().getUserName()!=null)
-        {
-            id = loggedInUser.getIdentity().getUserName();
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            user = userManager.getUser(id);            
-        }
-        
-        return user;
-    }
-    
-    public static UserBean getRequestedUser(String username) throws ServiceException
-    {
-        UserBean user = null;
-        
-        if(!Util.isEmpty(username))
-        {
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            user = userManager.getUser(username);            
-        }
-        
-        return user;
-    }
-    
-    public static UserBean readUserProfile(String username) throws ServiceException
-    {
-        UserBean user = null;
-        
-        if(!Util.isEmpty(username))
-        {
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            user = userManager.readProfile(username);            
-        }
-        
-        return user;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileHelper.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,974 @@
+/*
+* 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.website.user.ui;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.faces.model.SelectItem;
+
+import org.jboss.security.acl.User;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.security.JBossIdentity;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.utils.Util;
+import org.jboss.website.user.bo.ProfileBean;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+import org.jboss.website.service.ServiceException;
+
+//jboss-identity-management 
+import org.jboss.security.idm.Address;
+
+/**
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class ProfileHelper implements Serializable 
+{    
+    //lists data
+    private static final String[][] ROLES =
+    {
+        {"","Please Choose"}, 
+        {"developer","Developer"}, 
+        {"operations_support","Operations/Support"}, 
+        {"cto_cio","CTO/CIO"}, 
+        {"sales_marketing","Sales/Marketing"}, 
+        {"other","Other"}
+    };
+        
+    private static final String[] COUNTRIES =
+    {
+        "", "United States of America", "Afganistan", "Albania", "Algeria", "AmericanSamoa", "Andorra", "Angola", "Anguilla", "Antigua&Barbuda", "Argentina", "Armenia",
+        "Aruba", "Australia", "Austria", "Azerbaijan", "Azores", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium",
+        "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bonaire", "Bosnia&Herzegovina", "Botswana", "Brazil", "BritishIndianOceanTer",
+        "Brunei", "Bulgaria", "BurkinaFaso", "Burundi", "Cambodia", "Cameroon", "Canada", "CanaryIslands", "CapeVerde", "CaymanIslands",
+        "CentralAfricanRepublic", "Chad", "ChannelIslands", "Chile", "China", "ChristmasIsland", "CocosIsland", "Columbia", "Comoros",
+        "Congo", "CookIslands", "CostaRica", "CoteDIvoire", "Croatia", "Cuba", "Curaco", "Cyprus", "CzechRepublic", "Denmark", "Djibouti",
+        "Dominica", "DominicanRepublic", "EastTimor", "Ecuador", "Egypt", "ElSalvador", "EquatorialGuinea", "Eritrea", "Estonia", "Ethiopia",
+        "FalklandIslands", "FaroeIslands", "Fiji", "Finland", "France", "FrenchGuiana", "FrenchPolynesia", "FrenchSouthernTer", "Gabon",
+        "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "GreatBritain", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam",
+        "Guatemala", "Guinea", "Guyana", "Haiti", "Hawaii", "Honduras", "HongKong", "Hungary", "Iceland", "India", "Indonesia", "Iran", "Iraq",
+        "Ireland", "IsleofMan", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "KoreaNorth", "KoreaSout",
+        "Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg",
+        "Macau", "Macedonia", "Madagascar", "Malaysia", "Malawi", "Maldives", "Mali", "Malta", "MarshallIslands", "Martinique", "Mauritania",
+        "Mauritius", "Mayotte", "Mexico", "MidwayIslands", "Moldova", "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar",
+        "Nambia", "Nauru", "Nepal", "NetherlandAntilles", "Netherlands", "Nevis", "NewCaledonia", "NewZealand", "Nicaragua", "Niger",
+        "Nigeria", "Niue", "NorfolkIsland", "Norway", "Oman", "Pakistan", "PalauIsland", "Palestine", "Panama", "PapuaNewGuinea", "Paraguay",
+        "Peru", "Phillipines", "PitcairnIsland", "Poland", "Portugal", "PuertoRico", "Qatar", "Reunion", "Romania", "Russia", "Rwanda",
+        "StBarthelemy", "StEustatius", "StHelena", "StKitts-Nevis", "StLucia", "StMaarten", "StPierre&Miquelon", "StVincent&Grenadines",
+        "Saipan", "Samoa", "SamoaAmerican", "SanMarino", "SaoTome&Principe", "SaudiArabia", "Senegal", "Seychelles", "Serbia&Montenegro",
+        "SierraLeone", "Singapore", "Slovakia", "Slovenia", "SolomonIslands", "Somalia", "SouthAfrica", "Spain", "SriLanka", "Sudan",
+        "Suriname", "Swaziland", "Sweden", "Switzerland", "Syria", "Tahiti", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "Togo",
+        "Tokelau", "Tonga", "Trinidad&Tobago", "Tunisia", "Turkey", "Turkmenistan", "Turks&CaicosIs", "Tuvalu", "Uganda", "Ukraine",
+        "UnitedArabErimates", "UnitedKingdom", "Uraguay", "Uzbekistan", "Vanuatu", "VaticanCityState", "Venezuela",
+        "Vietnam", "VirginIslands(Brit)", "VirginIslands(USA)", "WakeIsland", "Wallis&FutanaIs", "Yemen", "Zaire", "Zambia", "Zimbabwe"
+     };
+    
+    private static final String[][] STATES =
+    {
+        {"",""}, 
+        {"ALABAMA","AL"}, 
+        {"ALASKA","AK"}, 
+        {"AMERICAN SAMOA","AS"}, 
+        {"ARIZONA","AZ"}, 
+        {"ARKANSAS","AR"}, 
+        {"CALIFORNIA","CA"}, 
+        {"COLORADO","CO"}, 
+        {"CONNECTICUT","CT"}, 
+        {"DELAWARE","DE"},
+        {"DISTRICT OF COLUMBIA","DC"}, 
+        {"FLORIDA","FL"}, 
+        {"GEORGIA","GA"}, 
+        {"GUAM","GU"}, 
+        {"HAWAII","HI"}, 
+        {"IDAHO","ID"}, 
+        {"ILLINOIS","IL"},
+        {"INDIANA","IN"}, 
+        {"IOWA","IA"}, 
+        {"KANSAS","KS"},
+        {"KENTUCKY","KY"}, 
+        {"LOUISIANA","LA"}, 
+        {"MAINE","ME"}, 
+        {"MARYLAND","MD"}, 
+        {"MASSACHUSETTS","MA"}, 
+        {"MICHIGAN","MI"}, 
+        {"MINNESOTA","MN"}, 
+        {"MISSISSIPPI","MS"}, 
+        {"MISSOURI","MO"},
+        {"MONTANA","MT"}, 
+        {"NEBRASKA","NE"}, 
+        {"NEVADA","NV"}, 
+        {"NEW HAMPSHIRE","NH"}, 
+        {"NEW JERSEY","NJ"}, 
+        {"NEW MEXICO","NM"}, 
+        {"NEW YORK","NY"}, 
+        {"NORTH CAROLINA","NC"}, 
+        {"NORTH DAKOTA","ND"},
+        {"OHIO","OH"}, 
+        {"OKLAHOMA","OK"}, 
+        {"OREGON","OR"}, 
+        {"PENNSYLVANIA","PA"}, 
+        {"PUERTO RICO","PR"}, 
+        {"RHODE ISLAND","RI"}, 
+        {"SOUTH CAROLINA","SC"}, 
+        {"SOUTH DAKOTA","SD"}, 
+        {"TENNESSEE","TN"},
+        {"TEXAS","TX"}, 
+        {"UTAH","UT"}, 
+        {"VERMONT","VT"}, 
+        {"VIRGIN ISLANDS","VI"}, 
+        {"VIRGINIA","VA"}, 
+        {"WASHINGTON","WA"}, 
+        {"WEST VIRGINIA","WV"}, 
+        {"WISCONSIN","WI"}, 
+        {"WYOMING","WY"}
+    };
+    
+    private static final String[][] USERTYPES =
+    {
+        {"","Please Choose"}, 
+        {"enduser","End-User"}, 
+        {"systemintegrator","Systems Integrator"}, 
+        {"softwarevendor","Software Vendor"}, 
+        {"academia","Academia"}, 
+        {"other","Other"}
+    };
+    
+    private static final String[][] COMPANYSIZES =
+    {
+        {"","Please Choose"}, 
+        {"_20","Less than 20 employees"}, 
+        {"21_100","21-100 employees"}, 
+        {"100_999","100-999 employees"},
+        {"1000_","1000+ employees"}, 
+        {"other","Other"}
+    };
+    
+    //field data
+    private String uname = null;
+    private String pass1 = null;
+    private String pass2 = null;
+    private String realemail = null;
+    private String confirmrealemail = null;
+    private String fakeemail = null;
+    private String question = null;
+    private String answer = null;
+    private String fname = null;
+    private String lname = null;
+    private String cname = null;
+    private String title = null;
+    private String phone = null;
+    private String street = null;
+    private String city = null;
+    private String zip = null;
+    private String country = null;
+    private String state = null;
+    private String interestinjboss_eval = null;
+    private String interestinjboss_dev = null;
+    private String interestinjboss_deploy = null;
+    private boolean newsletter = false;
+    private boolean salescontact = false;
+    private boolean supportcontact = false;
+    private String role = null;
+    private String usertype = null;
+    private String companysize = null;
+    private String industry = null;
+    
+    //eloqua data
+    
+    
+    
+    //--------------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @return
+     */
+    public String getUname()
+    {
+        return this.uname;
+    }
+    
+    /**
+     * 
+     * @param uname
+     */
+    public void setUname(String uname)
+    {
+        this.uname = uname;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getPass1()
+    {
+        return this.pass1;
+    }
+    
+    /**
+     * 
+     * @param pass1
+     */
+    public void setPass1(String pass1)
+    {
+        this.pass1 = pass1;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getPass2()
+    {
+        return this.pass2;
+    }
+    
+    /**
+     * 
+     * @param pass2
+     */
+    public void setPass2(String pass2)
+    {
+        this.pass2 = pass2;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getRealemail()
+    {
+        return this.realemail;
+    }
+    
+    /**
+     * 
+     * @param realemail
+     */
+    public void setRealemail(String realemail)
+    {
+        this.realemail = realemail;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getConfirmrealemail()
+    {
+        return this.confirmrealemail;
+    }
+    
+    /**
+     * 
+     * @param confirmrealemail
+     */
+    public void setConfirmrealemail(String confirmrealemail)
+    {
+        this.confirmrealemail = confirmrealemail;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getFakeemail()
+    {
+        return this.fakeemail;
+    }
+    
+    /**
+     * 
+     * @param fakeemail
+     */
+    public void setFakeemail(String fakeemail)
+    {
+        this.fakeemail = fakeemail;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getQuestion()
+    {
+        return this.question;
+    }
+    
+    /**
+     * 
+     * @param question
+     */
+    public void setQuestion(String question)
+    {
+        this.question = question;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getAnswer()
+    {
+        return this.answer;
+    }
+    
+    /**
+     * 
+     * @param answer
+     */
+    public void setAnswer(String answer)
+    {
+        this.answer = answer;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getFname()
+    {
+        return this.fname;
+    }
+    
+    /**
+     * 
+     * @param fname
+     */
+    public void setFname(String fname)
+    {
+        this.fname = fname;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getLname()
+    {
+        return this.lname;
+    }
+    
+    /**
+     * 
+     * @param lname
+     */
+    public void setLname(String lname)
+    {
+        this.lname = lname;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getCname()
+    {
+        return this.cname;
+    }
+    
+    /**
+     * 
+     * @param cname
+     */
+    public void setCname(String cname)
+    {
+        this.cname = cname;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getTitle()
+    {
+        return this.title;
+    }
+    
+    /**
+     * 
+     * @param title
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getPhone()
+    {
+        return this.phone;
+    }
+    
+    /**
+     * 
+     * @param phone
+     */
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getStreet()
+    {
+        return this.street;
+    }
+    
+    /**
+     * 
+     * @param street
+     */
+    public void setStreet(String street)
+    {
+        this.street = street;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getCity()
+    {
+        return this.city;
+    }
+    
+    /**
+     * 
+     * @param city
+     */
+    public void setCity(String city)
+    {
+        this.city = city;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getZip()
+    {
+        return this.zip;
+    }
+    
+    /**
+     * 
+     * @param zip
+     */
+    public void setZip(String zip)
+    {
+        this.zip = zip;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getCountry()
+    {
+        return this.country;
+    }
+    
+    /**
+     * 
+     * @param country
+     */
+    public void setCountry(String country)
+    {
+        this.country = country;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public Collection<SelectItem> getCountries()
+    {
+        Collection<SelectItem> countries = null;
+        
+        countries = new ArrayList<SelectItem>();
+        for(int i=0;i<ProfileHelper.COUNTRIES.length;i++)
+        {
+            String cour = ProfileHelper.COUNTRIES[i];
+            SelectItem item = new SelectItem();
+            item.setValue(cour);
+            item.setLabel(cour);
+            
+            if(cour.equalsIgnoreCase("United States of America"))
+            {
+                item.setValue("USA");
+            }
+            
+            countries.add(item);
+        }
+        
+        return countries;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getState()
+    {
+        return this.state;
+    }
+    
+    /**
+     * 
+     * @param state
+     */
+    public void setState(String state)
+    {
+        this.state = state;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public Collection<SelectItem> getStates()
+    {
+        Collection<SelectItem> states = null;
+        
+        states = new ArrayList<SelectItem>();
+        for(int i=0;i<ProfileHelper.STATES.length;i++)
+        {
+            String value = ProfileHelper.STATES[i][1];
+            String label = ProfileHelper.STATES[i][0];
+            SelectItem item = new SelectItem();
+            item.setValue(value);
+            item.setLabel(label);                                   
+            states.add(item);
+        }
+        
+        return states;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getRole()
+    {
+        return this.role;
+    }
+    
+    /**
+     * 
+     * @param role
+     */
+    public void setRole(String role)
+    {
+        this.role = role;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public Collection<SelectItem> getRoles()
+    {
+        Collection<SelectItem> roles = null;
+        
+        roles = new ArrayList<SelectItem>();
+        for(int i=0;i<ProfileHelper.ROLES.length;i++)
+        {
+            String roleValue = ProfileHelper.ROLES[i][0];
+            String roleLabel = ProfileHelper.ROLES[i][1];
+            SelectItem item = new SelectItem();
+            item.setValue(roleValue);
+            item.setLabel(roleLabel);
+            roles.add(item);
+        }       
+        
+        return roles;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String[] getInterestinjboss_eval()
+    {
+        String[] items = null;
+        if(!Util.isEmpty(this.interestinjboss_eval))
+        {
+            items = new String[]{this.interestinjboss_eval};
+        }
+        return items;
+    }
+    
+    /**
+     * 
+     * @param items
+     */
+    public void setInterestinjboss_eval(String[] items)
+    {
+        if(!Util.isEmpty(items))
+        {
+            this.interestinjboss_eval = items[0];
+        }
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String[] getInterestinjboss_dev()
+    {
+        String[] items = null;
+        if(!Util.isEmpty(this.interestinjboss_dev))
+        {
+            items = new String[]{this.interestinjboss_dev};
+        }
+        return items;
+    }
+    
+    /**
+     * 
+     * @param items
+     */
+    public void setInterestinjboss_dev(String[] items)
+    {
+        if(!Util.isEmpty(items))
+        {
+            this.interestinjboss_dev = items[0];
+        }
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String[] getInterestinjboss_deploy()
+    {
+        String[] items = null;
+        if(!Util.isEmpty(this.interestinjboss_deploy))
+        {
+            items = new String[]{this.interestinjboss_deploy};
+        }
+        return items;
+    }
+    public void setInterestinjboss_deploy(String[] items)
+    {
+        if(!Util.isEmpty(items))
+        {
+            this.interestinjboss_deploy = items[0];
+        }
+    }
+    public boolean getSalescontact()
+    {
+        return this.salescontact;
+    }
+    public void setSalescontact(boolean salescontact)
+    {
+        this.salescontact = salescontact;
+    }
+    public boolean getSupportcontact()
+    {
+        return this.supportcontact;
+    }
+    public void setSupportcontact(boolean supportcontact)
+    {
+        this.supportcontact = supportcontact;
+    }
+    public boolean getNewsletter()
+    {
+        return this.newsletter;
+    }
+    public void setNewsletter(boolean newsletter)
+    {
+        this.newsletter = newsletter;
+    }
+    public String getUsertype()
+    {
+        return this.usertype;
+    }
+    public void setUsertype(String usertype)
+    {
+        this.usertype = usertype;
+    }
+    public Collection<SelectItem> getUsertypes()
+    {
+        Collection<SelectItem> usertypes = null;
+        
+        usertypes = new ArrayList<SelectItem>();
+        for(int i=0;i<ProfileHelper.USERTYPES.length;i++)
+        {
+            String value = ProfileHelper.USERTYPES[i][0];
+            String label = ProfileHelper.USERTYPES[i][1];
+            SelectItem item = new SelectItem();
+            item.setValue(value);
+            item.setLabel(label);                                   
+            usertypes.add(item);
+        }
+        
+        return usertypes;
+    }
+    public String getCompanysize()
+    {
+        return this.companysize;
+    }
+    public void setCompanysize(String companysize)
+    {
+        this.companysize = companysize;
+    }
+    public Collection<SelectItem> getCompanysizes()
+    {
+        Collection<SelectItem> companySizes = null;
+        
+        companySizes = new ArrayList<SelectItem>();
+        for(int i=0;i<ProfileHelper.COMPANYSIZES.length;i++)
+        {
+            String value = ProfileHelper.COMPANYSIZES[i][0];
+            String label = ProfileHelper.COMPANYSIZES[i][1];
+            SelectItem item = new SelectItem();
+            item.setValue(value);
+            item.setLabel(label);                                   
+            companySizes.add(item);
+        }
+        
+        return companySizes;
+    }
+    public String getIndustry()
+    {
+        return this.industry;
+    }
+    public void setIndustry(String industry)
+    {
+        this.industry = industry;
+    }
+    
+    //---------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     * @param user
+     */
+    protected void setUser(UserBean user)
+    {
+        JBossIdentity identity = user.getIdentity();
+        ProfileBean profile = user.getProfile();
+        
+        //registered username
+        this.uname = user.getUserName();
+        
+        //---identity unmarshalling-----------------------------------------------------------------------------------------------------
+        if(identity!=null)
+        {
+            //registered email address
+            this.realemail = identity.getEmail();
+            
+            //firstname and lastname
+            String fullName = identity.getFullName();
+            int nameSeparator = fullName.indexOf(' ');
+            this.fname = fullName.substring(0,nameSeparator).trim();
+            this.lname = fullName.substring(nameSeparator).trim();
+            
+            //secret question
+            this.question = identity.getSecretQuestion();
+            
+            //secret answer
+            this.answer = identity.getSecretAnswer();
+            
+            //fakeemail
+            if(!Util.isEmpty(identity.getOtherEmails()))
+            {                
+                this.fakeemail = (String)identity.getOtherEmails().iterator().next();
+            }
+            
+            //phone number
+            if(!Util.isEmpty(identity.getPhoneNumbers()))
+            {                
+                this.phone = (String)identity.getPhoneNumbers().iterator().next();
+            }
+            
+            //company name,company role,companytitle
+            this.cname = identity.getCompanyName();
+            this.role = identity.getCompanyRole();
+            this.title = identity.getCompanyTitle();
+            
+            //company address
+            if(identity.getCompanyAddress()!=null)
+            {
+                Address companyAddress = identity.getCompanyAddress();
+                this.street = companyAddress.getStreet();
+                this.city = companyAddress.getCity();
+                this.state = companyAddress.getState();
+                this.zip = companyAddress.getPostalCode();
+                this.country = companyAddress.getCountry();
+            }
+            
+        }        
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    protected UserBean getUser()
+    {
+        UserBean user = new UserBean();
+        ProfileBean profile = new ProfileBean();
+        JBossIdentity identity = new JBossIdentity();
+        user.setProfile(profile);
+        user.setIdentity(identity);
+        
+        //start userbean construction
+        user.setValidated(true);
+        
+        //identity setup-----------------------------------------------------------------------------------------------------------------------------------
+        //username
+        user.setUserName(this.uname);
+        identity.setUserName(this.uname);
+        
+        //password
+        if(this.pass1!=null)
+        {
+            identity.setPassword(this.pass1.getBytes());
+        }
+        
+        //email information
+        identity.setEmail(this.realemail);
+        
+        //fullName
+        identity.setFullName(this.fname+" "+this.lname);
+        
+        //secret question and answer
+        identity.setSecretQuestion(this.question);
+        identity.setSecretAnswer(this.answer);
+        
+        //other emails
+        identity.addEmail(this.fakeemail);
+        
+        //other phone
+        identity.addPhoneNumber(this.phone);
+        
+        //company name,company role,companytitle
+        identity.setCompanyName(this.cname);
+        identity.setCompanyRole(this.role);
+        identity.setCompanyTitle(this.title);
+        
+        //company address
+        Address companyAddress = new Address();
+        companyAddress.setStreet(this.street);
+        companyAddress.setCity(this.city);
+        companyAddress.setState(this.state);
+        companyAddress.setCountry(this.country);
+        companyAddress.setPostalCode(this.zip);
+        identity.setCompanyAddress(companyAddress);
+        
+        //profile setup----------------------------------------------------------------------------------------------------------------
+        //company type
+        profile.setCompanyType(this.usertype);
+        
+        //company size
+        profile.setCompanySize(this.companysize);
+        
+        //interest type
+        StringBuffer buffer = new StringBuffer();
+        if(!Util.isEmpty(this.interestinjboss_eval))
+        {
+            buffer.append("eval:");
+        }
+        if(!Util.isEmpty(this.interestinjboss_dev))
+        {
+            buffer.append("dev:");
+        }
+        if(!Util.isEmpty(this.interestinjboss_deploy))
+        {
+            buffer.append("deploy");
+        }
+        profile.setInterestType(buffer.toString());
+        
+        //industry
+        profile.setIndustry(this.industry);
+        
+        //newsletter
+        profile.setNewsLetter(this.newsletter);
+        
+        //salescontact
+        profile.setSalesContact(this.salescontact);
+        
+        //suppport contact
+        profile.setSupportContact(this.supportcontact);
+                
+        return user;
+    }
+    
+    /**
+     * 
+     * @return
+     * @throws Exception
+     */
+    public static UserBean getLoggedInUser() throws Exception
+    {
+        UserBean user = null;
+        
+        //load the user who profile needs to be edited
+        User loggedInUser = JSFUtil.getAclUser();
+        String id = null;
+        if(loggedInUser!=null && loggedInUser.getIdentity()!=null && loggedInUser.getIdentity().getUserName()!=null)
+        {
+            id = loggedInUser.getIdentity().getUserName();
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            user = userManager.getUser(id);            
+        }
+        
+        return user;
+    }
+    
+    public static UserBean getRequestedUser(String username) throws ServiceException
+    {
+        UserBean user = null;
+        
+        if(!Util.isEmpty(username))
+        {
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            user = userManager.getUser(username);            
+        }
+        
+        return user;
+    }
+    
+    public static UserBean readUserProfile(String username) throws ServiceException
+    {
+        UserBean user = null;
+        
+        if(!Util.isEmpty(username))
+        {
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            user = userManager.readProfile(username);            
+        }
+        
+        return user;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,523 +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.website.user.ui;
-
-import java.io.Serializable;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.ValidatorException;
-
-import org.jboss.website.jsf.utils.FacesBundleMessage;
-import org.jboss.website.utils.Util;
-import org.jboss.website.security.Tools;
-
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.jsf.utils.JSFUtil;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class ProfileValidator implements Serializable 
-{
-    /**
-     * 
-     *
-     */
-	public ProfileValidator()
-	{
-		super();
-	}
-	
-	//validate the existence of the username
-	private UIInput uname = null;
-    
-    //validation of the current password during the "change my own password" usecase
-    private UIInput currentPassword = null;
-	
-	//validation of input password and confirm password fields
-	private UIInput pass1 = null;
-	private UIInput pass2 = null;
-	
-	
-	//validation of realemail and confirmrealemail fields
-	private UIInput realemail = null;
-	private UIInput confirmrealemail = null;
-	
-	//validation of interestinjboss fields
-	private UIInput interestinjboss_eval = null;
-	private UIInput interestinjboss_dev = null;
-	private UIInput interestinjboss_deploy = null;
-	
-	
-	//validation of salescontact and supportcontact fields
-	private UIInput salescontact = null;
-	private UIInput supportcontact = null;
-	
-	
-	//accessors-----------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-	public UIInput getUname()
-	{
-		return this.uname;
-	}
-    /**
-     * 
-     * @param uname
-     */
-	public void setUname(UIInput uname)
-	{
-		this.uname = uname;
-	}
-    /**
-     * 
-     * @return
-     */
-	public UIInput getPass1()
-	{
-		return this.pass1;
-	}
-	/**
-     * 
-     * @param pass1
-	 */
-	public void setPass1(UIInput pass1)
-	{
-		this.pass1 = pass1;
-	}
-	/**
-     * 
-     * @return
-	 */
-	public UIInput getPass2()
-	{
-		return this.pass2;
-	}
-	/**
-     * 
-     * @param pass2
-	 */
-	public void setPass2(UIInput pass2)
-	{
-		this.pass2 = pass2;
-	}
-    
-    /**
-     * 
-     * @return
-     */
-	public UIInput getCurrentPassword() 
-    {
-        return currentPassword;
-    }
-    
-    /**
-     * 
-     * @param currentPassword
-     */
-    public void setCurrentPassword(UIInput currentPassword) 
-    {
-        this.currentPassword = currentPassword;
-    }
-    
-    
-    /**
-     * 
-     * @return
-	 */
-	public UIInput getRealemail()
-	{
-		return this.realemail;
-	}
-	/**
-     * 
-     * @param realemail
-	 */
-	public void setRealemail(UIInput realemail)
-	{
-		this.realemail = realemail;
-	}
-	/**
-     * 
-     * @return
-	 */
-	public UIInput getConfirmrealemail()
-	{
-		return this.confirmrealemail;
-	}
-	/**
-     * 
-     * @param confirmrealemail
-	 */
-	public void setConfirmrealemail(UIInput confirmrealemail)
-	{
-		this.confirmrealemail = confirmrealemail;
-	}
-	/**
-     * 
-     * @return
-	 */
-	public UIInput getInterestinjboss_eval()
-	{
-		return this.interestinjboss_eval;
-	}
-    /**
-     * 
-     * @param interest
-     */
-	public void setInterestinjboss_eval(UIInput interest)
-	{
-		this.interestinjboss_eval = interest;
-	}
-    /**
-     * 
-     * @return
-     */
-	public UIInput getInterestinjboss_dev()
-	{		
-		return this.interestinjboss_dev;
-	}
-    /**
-     * 
-     * @param interest
-     */
-	public void setInterestinjboss_dev(UIInput interest)
-	{
-		this.interestinjboss_dev = interest;
-	}
-    /**
-     * 
-     * @return
-     */
-	public UIInput getInterestinjboss_deploy()
-	{
-		return this.interestinjboss_deploy;
-	}
-    /**
-     * 
-     * @param interest
-     */
-	public void setInterestinjboss_deploy(UIInput interest)
-	{
-		this.interestinjboss_deploy = interest;
-	}
-    /**
-     * 
-     * @return
-     */
-	public UIInput getSalescontact()
-	{
-		return this.salescontact;
-	}
-    /**
-     * 
-     * @param salescontact
-     */
-	public void setSalescontact(UIInput salescontact)
-	{
-		this.salescontact = salescontact;
-	}
-    /**
-     * 
-     * @return
-     */
-	public UIInput getSupportcontact()
-	{
-		return this.supportcontact;
-	}
-    /**
-     * 
-     * @param supportcontact
-     */
-	public void setSupportcontact(UIInput supportcontact)
-	{
-		this.supportcontact = supportcontact;
-	}
-	
-	
-	//form validation related methods-------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-	public void passwordCheck(FacesContext context,UIComponent component,Object value)
-	{
-		//check if input password and confirm password are equal
-		boolean isValid = false;
-		
-		String password1 = (String)this.pass1.getLocalValue();
-		String password2 = (String)this.pass2.getLocalValue();
-		
-		if(password1==null)
-		{
-			password1 = "";
-		}
-		if(password2==null)
-		{
-			password2 = "";
-		}
-		
-		if(password1.equals(password2))
-		{
-			isValid = true;
-		}
-		
-		if(!isValid)
-		{
-			//validator exception, invalid value was submitted
-			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-			message.setSummary("passwordMismatch");
-			message.setDetail("passwordMismatchDetail");
-			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-			throw new ValidatorException(message);
-		}
-	}
-    
-    /**
-     * check if the user provided currentPassword matches the actual password in the database,
-     * during "change my own password" usecase
-     *      
-     * @param context
-     * @param component
-     * @param value
-     */
-    public void currentPasswordCheck(FacesContext context,UIComponent component,Object value)
-    throws Exception
-    {        
-        boolean isValid = false;
-        
-        String currentPassword = (String)this.currentPassword.getLocalValue();
-        
-        if(currentPassword==null)
-        {
-            currentPassword = "";
-        }
-        
-        UserBean user = null;
-                
-        //perform the validation check between the password input by the user and the one stored in the system
-        user = ProfileHelper.getLoggedInUser();
-        if(user==null)
-        {
-            user = ProfileHelper.getRequestedUser(JSFUtil.getParameter(Constants.id));
-        }
-        
-        if(user!=null)
-        {
-            //currentPassword is in clear text (since just submitted by the user but ofcourse secure in transit since
-            //transferred over SSL)
-            currentPassword = Tools.getEncodedPassword(currentPassword);
-            String storedPassword = user.getPassword();
-            if(
-                    currentPassword.equals(storedPassword)
-            )
-            {
-                isValid = true;
-            }
-        }
-        
-        
-        if(!isValid)
-        {
-            //validator exception, invalid value was submitted
-            FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-            message.setSummary("currentPasswordInvalid");
-            message.setDetail("currentPasswordInvalidDetail");
-            message.setSeverity(FacesMessage.SEVERITY_ERROR);
-            throw new ValidatorException(message);
-        }
-    }
-	
-    /**
-     * 
-     * @param context
-     * @param component
-     * @param value
-     */
-	public void emailCheck(FacesContext context,UIComponent component,Object value)
-	{
-		//check if input email and confirm email are equal
-		boolean isValid = false;
-		
-		String email1 = (String)this.realemail.getLocalValue();
-		String email2 = (String)this.confirmrealemail.getLocalValue();
-		
-		if(email1==null)
-		{
-			email1 = "";
-		}
-		if(email2==null)
-		{
-			email2 = "";
-		}
-		
-		if(email1.equals(email2))
-		{
-			isValid = true;
-		}
-		
-		if(!isValid)
-		{
-			//validator exception, invalid value was submitted
-			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-			message.setSummary("emailMismatch");
-			message.setDetail("emailMismatchDetail");
-			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-			throw new ValidatorException(message);
-		}
-	}
-	
-    /**
-     * 
-     * @param context
-     * @param component
-     * @param value
-     */
-	public void interestCheck(FacesContext context,UIComponent component,Object value)
-	{
-		
-		boolean isValid = false;
-        
-        Object eval = this.interestinjboss_eval.getLocalValue();
-        Object dev = this.interestinjboss_dev.getLocalValue();
-        Object deploy = this.interestinjboss_deploy.getLocalValue();
-        
-        
-		if(
-                !Util.isEmpty((String[])this.interestinjboss_eval.getLocalValue()) ||
-                !Util.isEmpty((String[])this.interestinjboss_dev.getLocalValue())  ||
-                !Util.isEmpty((String[])this.interestinjboss_deploy.getLocalValue())
-        )
-        {
-		   isValid = true; 
-        }
-					
-		if(!isValid)
-		{
-			//validator exception, invalid value was submitted
-			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-			message.setSummary("interestInJBossMissing");
-			message.setDetail("interestInJBossMissingDetail");
-			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-			throw new ValidatorException(message);
-		}
-	}
-	
-    /**
-     * 
-     * @param context
-     * @param component
-     * @param value
-     */
-	public void contactCheck(FacesContext context,UIComponent component,Object value)
-	{
-		boolean isValid = true;
-		
-		Boolean salesContact = (Boolean)this.salescontact.getLocalValue();
-		Boolean supportContact = (Boolean)this.supportcontact.getLocalValue();
-		
-		if(
-		   salesContact.booleanValue() &&
-		   supportContact.booleanValue()
-		)
-		{
-			isValid = false;
-		}
-					
-		if(!isValid)
-		{
-			//validator exception, invalid value was submitted
-			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-			message.setSummary("contactError");
-			message.setDetail("contactErrorDetail");
-			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-			throw new ValidatorException(message);
-		}
-	}
-	
-    /**
-     * 
-     * @param context
-     * @param component
-     * @param value
-     */
-	public void checkUsername(FacesContext context,UIComponent component,Object value)
-	{
-		boolean isValid = true;
-		
-		String username = (String)this.uname.getLocalValue();
-        
-        if(!Util.isEmpty(username))
-        {        
-    		if(UserBean.doesUserExist(username))
-    		{
-    			isValid = false;
-    		}
-    		
-    		if(!isValid)
-    		{
-    			//validator exception, user with this username already registered
-    			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-    			message.setSummary("userAlreadyRegistered");
-    			((FacesBundleMessage)message).setDetail("userAlreadyRegisteredDetail",new Object[]{username});
-    			message.setSeverity(FacesMessage.SEVERITY_ERROR);
-    			throw new ValidatorException(message);
-    		}
-        }
-	}
-    
-    /**
-     * 
-     * @param context
-     * @param component
-     * @param value
-     */
-    public void checkUsernameExists(FacesContext context,UIComponent component,Object value)
-    {
-        boolean isValid = false;
-        
-        String username = (String)this.uname.getLocalValue();
-        
-        if(!Util.isEmpty(username))
-        {        
-            if(UserBean.doesUserExist(username))
-            {
-                isValid = true;
-            }
-            
-            if(!isValid)
-            {
-                //validator exception, user with this username already registered
-                FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
-                message.setSummary("userNotFound");
-                ((FacesBundleMessage)message).setDetail("userNotFoundDetail",new Object[]{username});
-                message.setSeverity(FacesMessage.SEVERITY_ERROR);
-                throw new ValidatorException(message);
-            }
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ProfileValidator.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,523 @@
+/*
+* 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.website.user.ui;
+
+import java.io.Serializable;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+
+import org.jboss.website.jsf.utils.FacesBundleMessage;
+import org.jboss.website.utils.Util;
+import org.jboss.website.security.Tools;
+
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.jsf.utils.JSFUtil;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class ProfileValidator implements Serializable 
+{
+    /**
+     * 
+     *
+     */
+	public ProfileValidator()
+	{
+		super();
+	}
+	
+	//validate the existence of the username
+	private UIInput uname = null;
+    
+    //validation of the current password during the "change my own password" usecase
+    private UIInput currentPassword = null;
+	
+	//validation of input password and confirm password fields
+	private UIInput pass1 = null;
+	private UIInput pass2 = null;
+	
+	
+	//validation of realemail and confirmrealemail fields
+	private UIInput realemail = null;
+	private UIInput confirmrealemail = null;
+	
+	//validation of interestinjboss fields
+	private UIInput interestinjboss_eval = null;
+	private UIInput interestinjboss_dev = null;
+	private UIInput interestinjboss_deploy = null;
+	
+	
+	//validation of salescontact and supportcontact fields
+	private UIInput salescontact = null;
+	private UIInput supportcontact = null;
+	
+	
+	//accessors-----------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+	public UIInput getUname()
+	{
+		return this.uname;
+	}
+    /**
+     * 
+     * @param uname
+     */
+	public void setUname(UIInput uname)
+	{
+		this.uname = uname;
+	}
+    /**
+     * 
+     * @return
+     */
+	public UIInput getPass1()
+	{
+		return this.pass1;
+	}
+	/**
+     * 
+     * @param pass1
+	 */
+	public void setPass1(UIInput pass1)
+	{
+		this.pass1 = pass1;
+	}
+	/**
+     * 
+     * @return
+	 */
+	public UIInput getPass2()
+	{
+		return this.pass2;
+	}
+	/**
+     * 
+     * @param pass2
+	 */
+	public void setPass2(UIInput pass2)
+	{
+		this.pass2 = pass2;
+	}
+    
+    /**
+     * 
+     * @return
+     */
+	public UIInput getCurrentPassword() 
+    {
+        return currentPassword;
+    }
+    
+    /**
+     * 
+     * @param currentPassword
+     */
+    public void setCurrentPassword(UIInput currentPassword) 
+    {
+        this.currentPassword = currentPassword;
+    }
+    
+    
+    /**
+     * 
+     * @return
+	 */
+	public UIInput getRealemail()
+	{
+		return this.realemail;
+	}
+	/**
+     * 
+     * @param realemail
+	 */
+	public void setRealemail(UIInput realemail)
+	{
+		this.realemail = realemail;
+	}
+	/**
+     * 
+     * @return
+	 */
+	public UIInput getConfirmrealemail()
+	{
+		return this.confirmrealemail;
+	}
+	/**
+     * 
+     * @param confirmrealemail
+	 */
+	public void setConfirmrealemail(UIInput confirmrealemail)
+	{
+		this.confirmrealemail = confirmrealemail;
+	}
+	/**
+     * 
+     * @return
+	 */
+	public UIInput getInterestinjboss_eval()
+	{
+		return this.interestinjboss_eval;
+	}
+    /**
+     * 
+     * @param interest
+     */
+	public void setInterestinjboss_eval(UIInput interest)
+	{
+		this.interestinjboss_eval = interest;
+	}
+    /**
+     * 
+     * @return
+     */
+	public UIInput getInterestinjboss_dev()
+	{		
+		return this.interestinjboss_dev;
+	}
+    /**
+     * 
+     * @param interest
+     */
+	public void setInterestinjboss_dev(UIInput interest)
+	{
+		this.interestinjboss_dev = interest;
+	}
+    /**
+     * 
+     * @return
+     */
+	public UIInput getInterestinjboss_deploy()
+	{
+		return this.interestinjboss_deploy;
+	}
+    /**
+     * 
+     * @param interest
+     */
+	public void setInterestinjboss_deploy(UIInput interest)
+	{
+		this.interestinjboss_deploy = interest;
+	}
+    /**
+     * 
+     * @return
+     */
+	public UIInput getSalescontact()
+	{
+		return this.salescontact;
+	}
+    /**
+     * 
+     * @param salescontact
+     */
+	public void setSalescontact(UIInput salescontact)
+	{
+		this.salescontact = salescontact;
+	}
+    /**
+     * 
+     * @return
+     */
+	public UIInput getSupportcontact()
+	{
+		return this.supportcontact;
+	}
+    /**
+     * 
+     * @param supportcontact
+     */
+	public void setSupportcontact(UIInput supportcontact)
+	{
+		this.supportcontact = supportcontact;
+	}
+	
+	
+	//form validation related methods-------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+	public void passwordCheck(FacesContext context,UIComponent component,Object value)
+	{
+		//check if input password and confirm password are equal
+		boolean isValid = false;
+		
+		String password1 = (String)this.pass1.getLocalValue();
+		String password2 = (String)this.pass2.getLocalValue();
+		
+		if(password1==null)
+		{
+			password1 = "";
+		}
+		if(password2==null)
+		{
+			password2 = "";
+		}
+		
+		if(password1.equals(password2))
+		{
+			isValid = true;
+		}
+		
+		if(!isValid)
+		{
+			//validator exception, invalid value was submitted
+			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+			message.setSummary("passwordMismatch");
+			message.setDetail("passwordMismatchDetail");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			throw new ValidatorException(message);
+		}
+	}
+    
+    /**
+     * check if the user provided currentPassword matches the actual password in the database,
+     * during "change my own password" usecase
+     *      
+     * @param context
+     * @param component
+     * @param value
+     */
+    public void currentPasswordCheck(FacesContext context,UIComponent component,Object value)
+    throws Exception
+    {        
+        boolean isValid = false;
+        
+        String currentPassword = (String)this.currentPassword.getLocalValue();
+        
+        if(currentPassword==null)
+        {
+            currentPassword = "";
+        }
+        
+        UserBean user = null;
+                
+        //perform the validation check between the password input by the user and the one stored in the system
+        user = ProfileHelper.getLoggedInUser();
+        if(user==null)
+        {
+            user = ProfileHelper.getRequestedUser(JSFUtil.getParameter(Constants.id));
+        }
+        
+        if(user!=null)
+        {
+            //currentPassword is in clear text (since just submitted by the user but ofcourse secure in transit since
+            //transferred over SSL)
+            currentPassword = Tools.getEncodedPassword(currentPassword);
+            String storedPassword = user.getPassword();
+            if(
+                    currentPassword.equals(storedPassword)
+            )
+            {
+                isValid = true;
+            }
+        }
+        
+        
+        if(!isValid)
+        {
+            //validator exception, invalid value was submitted
+            FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+            message.setSummary("currentPasswordInvalid");
+            message.setDetail("currentPasswordInvalidDetail");
+            message.setSeverity(FacesMessage.SEVERITY_ERROR);
+            throw new ValidatorException(message);
+        }
+    }
+	
+    /**
+     * 
+     * @param context
+     * @param component
+     * @param value
+     */
+	public void emailCheck(FacesContext context,UIComponent component,Object value)
+	{
+		//check if input email and confirm email are equal
+		boolean isValid = false;
+		
+		String email1 = (String)this.realemail.getLocalValue();
+		String email2 = (String)this.confirmrealemail.getLocalValue();
+		
+		if(email1==null)
+		{
+			email1 = "";
+		}
+		if(email2==null)
+		{
+			email2 = "";
+		}
+		
+		if(email1.equals(email2))
+		{
+			isValid = true;
+		}
+		
+		if(!isValid)
+		{
+			//validator exception, invalid value was submitted
+			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+			message.setSummary("emailMismatch");
+			message.setDetail("emailMismatchDetail");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			throw new ValidatorException(message);
+		}
+	}
+	
+    /**
+     * 
+     * @param context
+     * @param component
+     * @param value
+     */
+	public void interestCheck(FacesContext context,UIComponent component,Object value)
+	{
+		
+		boolean isValid = false;
+        
+        Object eval = this.interestinjboss_eval.getLocalValue();
+        Object dev = this.interestinjboss_dev.getLocalValue();
+        Object deploy = this.interestinjboss_deploy.getLocalValue();
+        
+        
+		if(
+                !Util.isEmpty((String[])this.interestinjboss_eval.getLocalValue()) ||
+                !Util.isEmpty((String[])this.interestinjboss_dev.getLocalValue())  ||
+                !Util.isEmpty((String[])this.interestinjboss_deploy.getLocalValue())
+        )
+        {
+		   isValid = true; 
+        }
+					
+		if(!isValid)
+		{
+			//validator exception, invalid value was submitted
+			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+			message.setSummary("interestInJBossMissing");
+			message.setDetail("interestInJBossMissingDetail");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			throw new ValidatorException(message);
+		}
+	}
+	
+    /**
+     * 
+     * @param context
+     * @param component
+     * @param value
+     */
+	public void contactCheck(FacesContext context,UIComponent component,Object value)
+	{
+		boolean isValid = true;
+		
+		Boolean salesContact = (Boolean)this.salescontact.getLocalValue();
+		Boolean supportContact = (Boolean)this.supportcontact.getLocalValue();
+		
+		if(
+		   salesContact.booleanValue() &&
+		   supportContact.booleanValue()
+		)
+		{
+			isValid = false;
+		}
+					
+		if(!isValid)
+		{
+			//validator exception, invalid value was submitted
+			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+			message.setSummary("contactError");
+			message.setDetail("contactErrorDetail");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			throw new ValidatorException(message);
+		}
+	}
+	
+    /**
+     * 
+     * @param context
+     * @param component
+     * @param value
+     */
+	public void checkUsername(FacesContext context,UIComponent component,Object value)
+	{
+		boolean isValid = true;
+		
+		String username = (String)this.uname.getLocalValue();
+        
+        if(!Util.isEmpty(username))
+        {        
+    		if(UserBean.doesUserExist(username))
+    		{
+    			isValid = false;
+    		}
+    		
+    		if(!isValid)
+    		{
+    			//validator exception, user with this username already registered
+    			FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+    			message.setSummary("userAlreadyRegistered");
+    			((FacesBundleMessage)message).setDetail("userAlreadyRegisteredDetail",new Object[]{username});
+    			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+    			throw new ValidatorException(message);
+    		}
+        }
+	}
+    
+    /**
+     * 
+     * @param context
+     * @param component
+     * @param value
+     */
+    public void checkUsernameExists(FacesContext context,UIComponent component,Object value)
+    {
+        boolean isValid = false;
+        
+        String username = (String)this.uname.getLocalValue();
+        
+        if(!Util.isEmpty(username))
+        {        
+            if(UserBean.doesUserExist(username))
+            {
+                isValid = true;
+            }
+            
+            if(!isValid)
+            {
+                //validator exception, user with this username already registered
+                FacesMessage message = new FacesBundleMessage("org.jboss.website.user.ui.messages");
+                message.setSummary("userNotFound");
+                ((FacesBundleMessage)message).setDetail("userNotFoundDetail",new Object[]{username});
+                message.setSeverity(FacesMessage.SEVERITY_ERROR);
+                throw new ValidatorException(message);
+            }
+        }
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,228 +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.website.user.ui;
-
-import java.io.Serializable;
-
-import org.apache.log4j.Logger;
-
-//commons-http client
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-
-
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.ejb.UserManager;
-import org.jboss.website.user.bo.UserBean;
-
-/**
- * This managed bean serves as a UI controller for the user registration process
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 27, 2006
- *
- */
-public class Registrar implements Serializable
-{
-    private static final Logger log = Logger.getLogger(Registrar.class);
-        
-	//field related
-    private ProfileHelper helper = null;
-	
-
-    /**
-     * 
-     *
-     */
-	public Registrar()
-	{
-		super();
-        this.helper = new ProfileHelper();
-	}
-	
-	//bean data related methods-----------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public ProfileHelper getHelper() 
-    {
-        return helper;
-    }
-
-    /**
-     * 
-     * @param helper
-     */
-    public void setHelper(ProfileHelper helper) 
-    {
-        this.helper = helper;
-    }        
-	//request processing operations--------------------------------------------------------------------------------------------------------------------------
-	public final String register()
-	{
-		String navState = null;
-        boolean success = false;
-		try
-		{	                        
-			UserBean user = this.helper.getUser();
-			
-			//register this user
-			UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());            
-			userManager.register(user);
-								
-			//registration was successfull
-			navState = org.jboss.website.user.ui.Constants.success;
-            
-            success = true;
-		}
-		catch(Exception e)
-		{
-            return JSFUtil.handleException(e);
-		}
-        finally
-        {
-            if(success)
-            {
-                //spawn a thread that performs Eloqua submission in the background
-                this.submitEloqua(this.helper);
-            }
-        }
-		return navState;
-	}       
-    //---------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @param helper
-     */
-    private void submitEloqua(ProfileHelper helper)
-    {
-        EloquaDaemon daemon = new EloquaDaemon(helper);
-        Thread t = new Thread(daemon);
-        
-        //spawn the thread that will perform the job in the background
-        t.start();
-    }
- 
-    /**
-     * 
-     * @author Sohil Shah - sohil.shah at jboss.com - Mar 30, 2006
-     *
-     */
-    private class EloquaDaemon extends Thread
-    {
-        /**
-         * 
-         */
-        ProfileHelper helper = null;
-        
-        /**
-         * 
-         * @param helper
-         */
-        private EloquaDaemon(ProfileHelper helper)
-        {
-            this.helper = helper;
-        }
-        
-        /**
-         * this makes a background thread perform an Eloqua submission 
-         */
-        public void run()
-        {
-            HttpClient client = new HttpClient();
-            
-            PostMethod method = new PostMethod("https://secure.eloqua.com/f.asp");
-            String eval = "";
-            String dev = "";
-            String deploy = "";
-            if(this.helper.getInterestinjboss_eval()!=null)
-            {
-               String[] cour = this.helper.getInterestinjboss_eval();
-               eval = cour[0];
-            }
-            if(this.helper.getInterestinjboss_dev()!=null)
-            {
-               String[] cour = this.helper.getInterestinjboss_dev();
-               dev = cour[0];
-            }
-            if(this.helper.getInterestinjboss_deploy()!=null)
-            {
-               String[] cour = this.helper.getInterestinjboss_deploy();
-               deploy = cour[0];
-            }
-            NameValuePair[] data = {
-                    new NameValuePair("elqFormName", "member_register"),
-                    new NameValuePair("elqSiteID", "257"),
-                    new NameValuePair("elqDefaultTargetURL", ""),
-                    new NameValuePair("elqPost", ""),
-                    new NameValuePair("oid", "00D300000000ADy"),                    
-                    //member registration data
-                    new NameValuePair("uname", this.helper.getUname()),
-                    new NameValuePair("answer", this.helper.getAnswer()),
-                    new NameValuePair("city", this.helper.getCity()),
-                    new NameValuePair("cname", this.helper.getCname()),
-                    new NameValuePair("companysize", this.helper.getCompanysize()),
-                    new NameValuePair("country", this.helper.getCountry()),
-                    new NameValuePair("fakeemail", this.helper.getFakeemail()),
-                    new NameValuePair("fname", this.helper.getFname()),
-                    new NameValuePair("lname", this.helper.getLname()),
-                    new NameValuePair("phone", this.helper.getPhone()),
-                    new NameValuePair("question", this.helper.getQuestion()),
-                    new NameValuePair("realemail", this.helper.getRealemail()),
-                    new NameValuePair("state", this.helper.getState()),
-                    new NameValuePair("street", this.helper.getStreet()),
-                    new NameValuePair("title", this.helper.getTitle()),
-                    new NameValuePair("usertype", this.helper.getUsertype()),
-                    new NameValuePair("zip", this.helper.getZip()),
-                    new NameValuePair("interestinjboss_eval",eval),
-                    new NameValuePair("interestinjboss_dev",dev),
-                    new NameValuePair("interestinjboss_deploy",deploy),
-                    new NameValuePair("industry",this.helper.getIndustry()),
-                    new NameValuePair("supportcontact",String.valueOf(this.helper.getSupportcontact())),
-                    new NameValuePair("salescontact",String.valueOf(this.helper.getSalescontact())),
-                    new NameValuePair("newsletter",String.valueOf(this.helper.getNewsletter())),
-                    new NameValuePair("Role",this.helper.getRole())
-                  };
-            method.setRequestBody(data);
-            try
-            {            
-                int statusCode = client.executeMethod(method);
-                byte[] response = method.getResponseBody();
-                
-                log.debug("Eloqua Status Code--------------------("+this.helper.getUname()+")"+statusCode);
-                log.debug(new String(response));
-            }
-            catch(Exception e)
-            {
-                log.error("Eloqua Error for - "+this.helper.getUname());
-                log.error(this,e);
-            }
-            finally
-            {
-                if(method!=null)
-                {
-                    method.releaseConnection();
-                }
-            }            
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/Registrar.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,228 @@
+/*
+* 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.website.user.ui;
+
+import java.io.Serializable;
+
+import org.apache.log4j.Logger;
+
+//commons-http client
+import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.methods.*;
+
+
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.ejb.UserManager;
+import org.jboss.website.user.bo.UserBean;
+
+/**
+ * This managed bean serves as a UI controller for the user registration process
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 27, 2006
+ *
+ */
+public class Registrar implements Serializable
+{
+    private static final Logger log = Logger.getLogger(Registrar.class);
+        
+	//field related
+    private ProfileHelper helper = null;
+	
+
+    /**
+     * 
+     *
+     */
+	public Registrar()
+	{
+		super();
+        this.helper = new ProfileHelper();
+	}
+	
+	//bean data related methods-----------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public ProfileHelper getHelper() 
+    {
+        return helper;
+    }
+
+    /**
+     * 
+     * @param helper
+     */
+    public void setHelper(ProfileHelper helper) 
+    {
+        this.helper = helper;
+    }        
+	//request processing operations--------------------------------------------------------------------------------------------------------------------------
+	public final String register()
+	{
+		String navState = null;
+        boolean success = false;
+		try
+		{	                        
+			UserBean user = this.helper.getUser();
+			
+			//register this user
+			UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());            
+			userManager.register(user);
+								
+			//registration was successfull
+			navState = org.jboss.website.user.ui.Constants.success;
+            
+            success = true;
+		}
+		catch(Exception e)
+		{
+            return JSFUtil.handleException(e);
+		}
+        finally
+        {
+            if(success)
+            {
+                //spawn a thread that performs Eloqua submission in the background
+                this.submitEloqua(this.helper);
+            }
+        }
+		return navState;
+	}       
+    //---------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @param helper
+     */
+    private void submitEloqua(ProfileHelper helper)
+    {
+        EloquaDaemon daemon = new EloquaDaemon(helper);
+        Thread t = new Thread(daemon);
+        
+        //spawn the thread that will perform the job in the background
+        t.start();
+    }
+ 
+    /**
+     * 
+     * @author Sohil Shah - sohil.shah at jboss.com - Mar 30, 2006
+     *
+     */
+    private class EloquaDaemon extends Thread
+    {
+        /**
+         * 
+         */
+        ProfileHelper helper = null;
+        
+        /**
+         * 
+         * @param helper
+         */
+        private EloquaDaemon(ProfileHelper helper)
+        {
+            this.helper = helper;
+        }
+        
+        /**
+         * this makes a background thread perform an Eloqua submission 
+         */
+        public void run()
+        {
+            HttpClient client = new HttpClient();
+            
+            PostMethod method = new PostMethod("https://secure.eloqua.com/f.asp");
+            String eval = "";
+            String dev = "";
+            String deploy = "";
+            if(this.helper.getInterestinjboss_eval()!=null)
+            {
+               String[] cour = this.helper.getInterestinjboss_eval();
+               eval = cour[0];
+            }
+            if(this.helper.getInterestinjboss_dev()!=null)
+            {
+               String[] cour = this.helper.getInterestinjboss_dev();
+               dev = cour[0];
+            }
+            if(this.helper.getInterestinjboss_deploy()!=null)
+            {
+               String[] cour = this.helper.getInterestinjboss_deploy();
+               deploy = cour[0];
+            }
+            NameValuePair[] data = {
+                    new NameValuePair("elqFormName", "member_register"),
+                    new NameValuePair("elqSiteID", "257"),
+                    new NameValuePair("elqDefaultTargetURL", ""),
+                    new NameValuePair("elqPost", ""),
+                    new NameValuePair("oid", "00D300000000ADy"),                    
+                    //member registration data
+                    new NameValuePair("uname", this.helper.getUname()),
+                    new NameValuePair("answer", this.helper.getAnswer()),
+                    new NameValuePair("city", this.helper.getCity()),
+                    new NameValuePair("cname", this.helper.getCname()),
+                    new NameValuePair("companysize", this.helper.getCompanysize()),
+                    new NameValuePair("country", this.helper.getCountry()),
+                    new NameValuePair("fakeemail", this.helper.getFakeemail()),
+                    new NameValuePair("fname", this.helper.getFname()),
+                    new NameValuePair("lname", this.helper.getLname()),
+                    new NameValuePair("phone", this.helper.getPhone()),
+                    new NameValuePair("question", this.helper.getQuestion()),
+                    new NameValuePair("realemail", this.helper.getRealemail()),
+                    new NameValuePair("state", this.helper.getState()),
+                    new NameValuePair("street", this.helper.getStreet()),
+                    new NameValuePair("title", this.helper.getTitle()),
+                    new NameValuePair("usertype", this.helper.getUsertype()),
+                    new NameValuePair("zip", this.helper.getZip()),
+                    new NameValuePair("interestinjboss_eval",eval),
+                    new NameValuePair("interestinjboss_dev",dev),
+                    new NameValuePair("interestinjboss_deploy",deploy),
+                    new NameValuePair("industry",this.helper.getIndustry()),
+                    new NameValuePair("supportcontact",String.valueOf(this.helper.getSupportcontact())),
+                    new NameValuePair("salescontact",String.valueOf(this.helper.getSalescontact())),
+                    new NameValuePair("newsletter",String.valueOf(this.helper.getNewsletter())),
+                    new NameValuePair("Role",this.helper.getRole())
+                  };
+            method.setRequestBody(data);
+            try
+            {            
+                int statusCode = client.executeMethod(method);
+                byte[] response = method.getResponseBody();
+                
+                log.debug("Eloqua Status Code--------------------("+this.helper.getUname()+")"+statusCode);
+                log.debug(new String(response));
+            }
+            catch(Exception e)
+            {
+                log.error("Eloqua Error for - "+this.helper.getUname());
+                log.error(this,e);
+            }
+            finally
+            {
+                if(method!=null)
+                {
+                    method.releaseConnection();
+                }
+            }            
+        }
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,124 +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.website.user.ui;
-
-
-import org.apache.log4j.Logger;
-
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.service.ServiceException;
-import org.jboss.website.user.ejb.UserManager;
-import org.jboss.website.user.util.NukesUtil;
-
-import org.jboss.website.user.bo.UserBean;
-
-/**
- * This managed bean serves as a UI controller to help old Nukes users to reset their old password into a new password that will be managed by the new
- * system
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
- *
- */
-public class ResetNukesPasswordController extends ChangeMyPasswordController
-{
-    private static final Logger log = Logger.getLogger(ResetNukesPasswordController.class);    
-    
-    private String password = null;
-    
-    /**
-     * 
-     * @return
-     */
-    public String getPassword() 
-    {
-        return password;
-    }
-    /**
-     * 
-     * @param password
-     */
-    public void setPassword(String password) 
-    {
-        this.password = password;
-    }        
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public ResetNukesPasswordController() 
-    throws ServiceException,Exception
-    {
-        UserBean user = ProfileHelper.getRequestedUser(JSFUtil.getParameter(Constants.id));
-        if(user!=null)
-        {
-            this.helper.setUser(user);
-        }
-    } 
-    //---------------------------------------------------------------------------------------------------------------------------------------------
-    public String changePassword()
-    {
-        String navState = null;
-        try
-        {
-            //check if the old Nukes Password matches up....
-            if(!this.isNukesCredentialValid(this.helper.getUname(),this.password))
-            {
-                throw new RuntimeException("Password does not match. Please input a valid username and password");
-            }
-            
-            //now go ahead and reset the password to the newly specified password
-            navState = super.changePassword();            
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }        
-        return navState;
-    }
-    
-    /**
-     * 
-     * @param username
-     * @param password
-     * @return
-     */
-    private boolean isNukesCredentialValid(String username,String password) throws Exception
-    {
-        boolean isValid = false;
-        
-        UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-        UserBean user = userManager.getUser(username);
-        
-        if(user!=null)
-        {
-            String oldNukesPass = user.getOldNukesPass();
-            String encodedPass = NukesUtil.md5AsHexString(password);
-            if(oldNukesPass.equalsIgnoreCase(encodedPass))
-            {
-                isValid = true;
-            }
-        }
-        
-        return isValid;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetNukesPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,124 @@
+/*
+* 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.website.user.ui;
+
+
+import org.apache.log4j.Logger;
+
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.service.ServiceException;
+import org.jboss.website.user.ejb.UserManager;
+import org.jboss.website.user.util.NukesUtil;
+
+import org.jboss.website.user.bo.UserBean;
+
+/**
+ * This managed bean serves as a UI controller to help old Nukes users to reset their old password into a new password that will be managed by the new
+ * system
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
+ *
+ */
+public class ResetNukesPasswordController extends ChangeMyPasswordController
+{
+    private static final Logger log = Logger.getLogger(ResetNukesPasswordController.class);    
+    
+    private String password = null;
+    
+    /**
+     * 
+     * @return
+     */
+    public String getPassword() 
+    {
+        return password;
+    }
+    /**
+     * 
+     * @param password
+     */
+    public void setPassword(String password) 
+    {
+        this.password = password;
+    }        
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public ResetNukesPasswordController() 
+    throws ServiceException,Exception
+    {
+        UserBean user = ProfileHelper.getRequestedUser(JSFUtil.getParameter(Constants.id));
+        if(user!=null)
+        {
+            this.helper.setUser(user);
+        }
+    } 
+    //---------------------------------------------------------------------------------------------------------------------------------------------
+    public String changePassword()
+    {
+        String navState = null;
+        try
+        {
+            //check if the old Nukes Password matches up....
+            if(!this.isNukesCredentialValid(this.helper.getUname(),this.password))
+            {
+                throw new RuntimeException("Password does not match. Please input a valid username and password");
+            }
+            
+            //now go ahead and reset the password to the newly specified password
+            navState = super.changePassword();            
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }        
+        return navState;
+    }
+    
+    /**
+     * 
+     * @param username
+     * @param password
+     * @return
+     */
+    private boolean isNukesCredentialValid(String username,String password) throws Exception
+    {
+        boolean isValid = false;
+        
+        UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+        UserBean user = userManager.getUser(username);
+        
+        if(user!=null)
+        {
+            String oldNukesPass = user.getOldNukesPass();
+            String encodedPass = NukesUtil.md5AsHexString(password);
+            if(oldNukesPass.equalsIgnoreCase(encodedPass))
+            {
+                isValid = true;
+            }
+        }
+        
+        return isValid;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,86 +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.website.user.ui;
-
-
-import org.apache.log4j.Logger;
-
-import org.jboss.website.utils.Util;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.ServiceException;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.util.Tools;
-
-/**
- * This managed bean serves as a UI controller to help registered users reset their password after having forgotten it or requesting a manual password reset
- * from the admin
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
- *
- */
-public class ResetPasswordController extends ChangeMyPasswordController
-{
-    private static final Logger log = Logger.getLogger(ResetPasswordController.class);
-        
-    //field related    
-    private boolean illegalAccess = false;        
-        
-    /**
-     * 
-     * @return
-     */
-    public boolean getIllegalAccess()
-    {
-        return this.illegalAccess;
-    }
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public ResetPasswordController() 
-    throws ServiceException,Exception
-    {                        
-        String id = JSFUtil.getParameter(Constants.id);
-        String token = JSFUtil.getParameter(Constants.token);
-        
-        if(!Util.isEmpty(id) && !Util.isEmpty(token))
-        {            
-            UserBean user = ProfileHelper.getRequestedUser(id);
-            
-            if(user!=null && Tools.verifyUserNameEncoding(user,token))
-            {
-                this.helper = new ProfileHelper();
-                this.helper.setUser(user); 
-            }
-            else
-            {
-                //suggest that this is illegal
-                this.illegalAccess = true;
-            }
-        }
-        else
-        {
-            //suggest that this is illegal
-            this.illegalAccess = true;
-        }
-    }        
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ResetPasswordController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,86 @@
+/*
+* 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.website.user.ui;
+
+
+import org.apache.log4j.Logger;
+
+import org.jboss.website.utils.Util;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.ServiceException;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.util.Tools;
+
+/**
+ * This managed bean serves as a UI controller to help registered users reset their password after having forgotten it or requesting a manual password reset
+ * from the admin
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
+ *
+ */
+public class ResetPasswordController extends ChangeMyPasswordController
+{
+    private static final Logger log = Logger.getLogger(ResetPasswordController.class);
+        
+    //field related    
+    private boolean illegalAccess = false;        
+        
+    /**
+     * 
+     * @return
+     */
+    public boolean getIllegalAccess()
+    {
+        return this.illegalAccess;
+    }
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public ResetPasswordController() 
+    throws ServiceException,Exception
+    {                        
+        String id = JSFUtil.getParameter(Constants.id);
+        String token = JSFUtil.getParameter(Constants.token);
+        
+        if(!Util.isEmpty(id) && !Util.isEmpty(token))
+        {            
+            UserBean user = ProfileHelper.getRequestedUser(id);
+            
+            if(user!=null && Tools.verifyUserNameEncoding(user,token))
+            {
+                this.helper = new ProfileHelper();
+                this.helper.setUser(user); 
+            }
+            else
+            {
+                //suggest that this is illegal
+                this.illegalAccess = true;
+            }
+        }
+        else
+        {
+            //suggest that this is illegal
+            this.illegalAccess = true;
+        }
+    }        
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,277 +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.website.user.ui;
-
-import java.util.Collection;
-import java.util.ArrayList;
-import java.io.Serializable;
-
-
-import org.apache.log4j.Logger;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.utils.Util;
-
-//model classes
-import org.jboss.website.user.bo.ProfileBean;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-import org.jboss.website.security.JBossIdentity;
-import org.jboss.website.service.DomainService;
-
-
-
-/**
- * This managed bean serves as the UI controller for privileged users to search through the registered users in the system 
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 23, 2006
- *
- */
-public class SearchController implements Serializable
-{
-    private static final Logger log = Logger.getLogger(SearchController.class);
-    
-    //navigation state constants    
-    private static final String display = "display";    
-    
-    
-    private static final String[] letters = 
-    {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
-    private static final String all = "all";    
-    
-    /**
-     * input data
-     */
-    private String input = null; //represents the search string input by the user
-    private String type = null; //represents the type of search selected by the user
-    private String currentPage = null; //represents the current result page if the search results are split up into multiple pages
-    private SearchHelper helper = null;    
-    
-    
-    /**
-     * 
-     * @return
-     */    
-    public String getInput() 
-    {
-        return input;
-    }
-
-    /**
-     * 
-     * @param name
-     */
-    public void setInput(String input) 
-    {
-        this.input = input;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public String getType() 
-    {
-        return type;
-    }
-
-    /**
-     * 
-     * @param type
-     */
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getCurrentPage() 
-    {
-        return currentPage;
-    }
-
-    /**
-     * 
-     * @param currentPage
-     */
-    public void setCurrentPage(String currentPage) 
-    {
-        this.currentPage = currentPage;
-    }
-            
-    /**
-     * 
-     * @return
-     */
-    public String[] getLetters()
-    {
-        return SearchController.letters;
-    } 
-    
-    /**
-     * 
-     * @return
-     */
-    public SearchHelper getHelper()
-    {
-        return this.helper;
-    }
-    //------------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     *
-     */
-    public SearchController()
-    {
-        super();
-    }
-    
-    /**
-     * 
-     */
-    private void reset()
-    {        
-        this.currentPage = null;
-        this.helper = null;
-    }
-    //-----ui controller processing methods-----------------------------------------------------------------------------------------------------------
-    /**
-     * This method starts a brand new search through the registered user database
-     */
-    public String search()
-    {
-        String navState = null;
-        try
-        {                        
-            //reset the state before commencing a brand new search
-            this.reset();
-            
-            //setup the search helper
-            this.helper = new SearchHelper();
-            helper.setSearchInput(this.input);
-            helper.setSearchType(this.type);
-            
-            //grab the results for this search from the backend model
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            Collection all = userManager.searchUsers(this.input,Integer.parseInt(this.type));            
-            helper.setAll(all);
-                                   
-            navState = SearchController.display;                        
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        finally
-        {
-            //clear the all wildcard from the input field
-            if(
-                    this.input.equals("*")
-            )
-            {
-                this.input = "";
-            }
-        }
-        return navState;
-    }
-    
-    /**
-     * this method starts a brand new search through the user database using the first letter of the username
-     */
-    public String searchByLetter()
-    {
-        String navState = null;
-        String inputStr = JSFUtil.getParameter(Constants.input);
-        if(!Util.isEmpty(inputStr))
-        {
-            if(inputStr.equalsIgnoreCase(SearchController.all))
-            {
-                this.input = "*"; //wildcard suggesting all users
-            }
-            else
-            {
-                this.input = inputStr;
-            }
-            this.type = "0";
-            navState = this.search();
-        }        
-        return navState;
-    }
-    
-    /**
-     * This method displays one of the result pages in case multiple result pages are found for a particular page
-     * search results are split into pages so that if there are lots of records they are not displayed on just one huge page
-     * Plus, this helps with better usage of memory as well
-     * 
-     * @return
-     */
-    public String displayPage()
-    {
-        int pageNumber = Integer.parseInt(this.currentPage);
-                
-        this.helper.setPageNumber(pageNumber);
-                
-        return SearchController.display;
-    }
-    
-    //-------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * TODO: implement this..
-     * resets the state of this helper. Since SearchController is a session level bean
-     * this method helps keep user's session memory in check...
-     * purely a performance related thing...does not affect functinality
-     */
-    public static void cleanup()
-    {
-        
-    }    
-    //------------stub methods-------------------------------------------------------------------------------------------------------------    
-    /**
-     * this method is only to test the ui controller without end-to-end integration with the backend model layer
-     */
-    private Collection getStubUsers()
-    {
-        Collection users = new ArrayList();
-        
-        //add first user
-        UserBean user1 = new UserBean();
-        ProfileBean profile1 = new ProfileBean();
-        JBossIdentity identity1 = new JBossIdentity();
-        user1.setProfile(profile1);
-        user1.setIdentity(identity1);
-        user1.setUserName("test6 at jboss.com");
-        identity1.setEmail("sohil at jboss.org");
-        identity1.setCompanyName("JBoss,Inc");
-        identity1.setActive(true);        
-                
-        
-        for(int i=0;i<505;i++)
-        {
-            SearchResultBean result = new SearchResultBean(user1);
-            users.add(result);
-        }
-        
-        return users;
-    }    
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,277 @@
+/*
+* 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.website.user.ui;
+
+import java.util.Collection;
+import java.util.ArrayList;
+import java.io.Serializable;
+
+
+import org.apache.log4j.Logger;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.utils.Util;
+
+//model classes
+import org.jboss.website.user.bo.ProfileBean;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+import org.jboss.website.security.JBossIdentity;
+import org.jboss.website.service.DomainService;
+
+
+
+/**
+ * This managed bean serves as the UI controller for privileged users to search through the registered users in the system 
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 23, 2006
+ *
+ */
+public class SearchController implements Serializable
+{
+    private static final Logger log = Logger.getLogger(SearchController.class);
+    
+    //navigation state constants    
+    private static final String display = "display";    
+    
+    
+    private static final String[] letters = 
+    {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
+    private static final String all = "all";    
+    
+    /**
+     * input data
+     */
+    private String input = null; //represents the search string input by the user
+    private String type = null; //represents the type of search selected by the user
+    private String currentPage = null; //represents the current result page if the search results are split up into multiple pages
+    private SearchHelper helper = null;    
+    
+    
+    /**
+     * 
+     * @return
+     */    
+    public String getInput() 
+    {
+        return input;
+    }
+
+    /**
+     * 
+     * @param name
+     */
+    public void setInput(String input) 
+    {
+        this.input = input;
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public String getType() 
+    {
+        return type;
+    }
+
+    /**
+     * 
+     * @param type
+     */
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public String getCurrentPage() 
+    {
+        return currentPage;
+    }
+
+    /**
+     * 
+     * @param currentPage
+     */
+    public void setCurrentPage(String currentPage) 
+    {
+        this.currentPage = currentPage;
+    }
+            
+    /**
+     * 
+     * @return
+     */
+    public String[] getLetters()
+    {
+        return SearchController.letters;
+    } 
+    
+    /**
+     * 
+     * @return
+     */
+    public SearchHelper getHelper()
+    {
+        return this.helper;
+    }
+    //------------------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     *
+     */
+    public SearchController()
+    {
+        super();
+    }
+    
+    /**
+     * 
+     */
+    private void reset()
+    {        
+        this.currentPage = null;
+        this.helper = null;
+    }
+    //-----ui controller processing methods-----------------------------------------------------------------------------------------------------------
+    /**
+     * This method starts a brand new search through the registered user database
+     */
+    public String search()
+    {
+        String navState = null;
+        try
+        {                        
+            //reset the state before commencing a brand new search
+            this.reset();
+            
+            //setup the search helper
+            this.helper = new SearchHelper();
+            helper.setSearchInput(this.input);
+            helper.setSearchType(this.type);
+            
+            //grab the results for this search from the backend model
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            Collection all = userManager.searchUsers(this.input,Integer.parseInt(this.type));            
+            helper.setAll(all);
+                                   
+            navState = SearchController.display;                        
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        finally
+        {
+            //clear the all wildcard from the input field
+            if(
+                    this.input.equals("*")
+            )
+            {
+                this.input = "";
+            }
+        }
+        return navState;
+    }
+    
+    /**
+     * this method starts a brand new search through the user database using the first letter of the username
+     */
+    public String searchByLetter()
+    {
+        String navState = null;
+        String inputStr = JSFUtil.getParameter(Constants.input);
+        if(!Util.isEmpty(inputStr))
+        {
+            if(inputStr.equalsIgnoreCase(SearchController.all))
+            {
+                this.input = "*"; //wildcard suggesting all users
+            }
+            else
+            {
+                this.input = inputStr;
+            }
+            this.type = "0";
+            navState = this.search();
+        }        
+        return navState;
+    }
+    
+    /**
+     * This method displays one of the result pages in case multiple result pages are found for a particular page
+     * search results are split into pages so that if there are lots of records they are not displayed on just one huge page
+     * Plus, this helps with better usage of memory as well
+     * 
+     * @return
+     */
+    public String displayPage()
+    {
+        int pageNumber = Integer.parseInt(this.currentPage);
+                
+        this.helper.setPageNumber(pageNumber);
+                
+        return SearchController.display;
+    }
+    
+    //-------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * TODO: implement this..
+     * resets the state of this helper. Since SearchController is a session level bean
+     * this method helps keep user's session memory in check...
+     * purely a performance related thing...does not affect functinality
+     */
+    public static void cleanup()
+    {
+        
+    }    
+    //------------stub methods-------------------------------------------------------------------------------------------------------------    
+    /**
+     * this method is only to test the ui controller without end-to-end integration with the backend model layer
+     */
+    private Collection getStubUsers()
+    {
+        Collection users = new ArrayList();
+        
+        //add first user
+        UserBean user1 = new UserBean();
+        ProfileBean profile1 = new ProfileBean();
+        JBossIdentity identity1 = new JBossIdentity();
+        user1.setProfile(profile1);
+        user1.setIdentity(identity1);
+        user1.setUserName("test6 at jboss.com");
+        identity1.setEmail("sohil at jboss.org");
+        identity1.setCompanyName("JBoss,Inc");
+        identity1.setActive(true);        
+                
+        
+        for(int i=0;i<505;i++)
+        {
+            SearchResultBean result = new SearchResultBean(user1);
+            users.add(result);
+        }
+        
+        return users;
+    }    
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,352 +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.website.user.ui;
-
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.io.Serializable;
-
-
-//jsf
-import javax.faces.model.SelectItem;
-
-
-import org.jboss.website.utils.Util;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 23, 2006
- *
- */
-public class SearchHelper implements Serializable
-{
-    /**
-     * 
-     */  
-    private int pageSize = 25;  //this is the default page size
-    private String searchInput = null; //search string input by the user
-    private String searchType = null; //search type selected by the user
-    private int pageNumber = 0; //defaults to the first page
-    private Collection all = null; //represents all the user found as part of this particular search
-    
-    /**
-     * 
-     *
-     */
-    public SearchHelper()
-    {
-        
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public String getSearchInput() 
-    {
-        return searchInput;
-    }
-
-    /**
-     * 
-     * @param searchInput
-     */
-    public void setSearchInput(String searchInput) 
-    {
-        this.searchInput = searchInput;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public String getSearchType() 
-    {
-        return searchType;
-    }
-
-    /**
-     * 
-     * @param searchType
-     */
-    public void setSearchType(String searchType) 
-    {
-        this.searchType = searchType;
-    } 
-    
-    /**
-     * 
-     * @return
-     */    
-    public int getPageSize() 
-    {
-        return pageSize;
-    }
-
-    /**
-     * 
-     * @param pageSize
-     */
-    public void setPageSize(int pageSize) 
-    {
-        this.pageSize = pageSize;
-    }
-        
-    /**
-     * 
-     * @return
-     */
-    public Collection getAll() 
-    {
-        return all;
-    }
-
-    /**
-     * 
-     * @param all
-     */
-    public void setAll(Collection all) 
-    {
-        Collection sorted = new ArrayList();
-        if(
-           Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_USERNAME || 
-           Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_FIRST || 
-           Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_LAST
-        )
-        {
-            Object[] objects = all.toArray();
-            Arrays.sort(objects,new UserNameComparator());
-            for(int i=0;i<objects.length;i++)
-            {
-                sorted.add(objects[i]);
-            }
-        }
-        else if(Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_EMAIL)
-        {
-            Object[] objects = all.toArray();
-            Arrays.sort(objects,new EmailComparator());
-            for(int i=0;i<objects.length;i++)
-            {
-                sorted.add(objects[i]);
-            }
-        }
-        else if(Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_COMPANY)
-        {
-            Object[] objects = all.toArray();
-            Arrays.sort(objects,new CompanyComparator());
-            for(int i=0;i<objects.length;i++)
-            {
-                sorted.add(objects[i]);
-            }
-        }
-        this.all = sorted;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public int getPageNumber() 
-    {
-        return pageNumber;
-    }
-
-    /**
-     * 
-     * @param pageNumber
-     */
-    public void setPageNumber(int pageNumber) 
-    {
-        this.pageNumber = pageNumber;
-    }
-
-    //--------------------------------------------------------------------------------------------------------------------------------------------        
-    /**
-     * calculates the total number of result pages associated with this particular search
-     * @return
-     */
-    public int getPageCount()
-    {
-       int pageCount = 0;
-       
-       //calculate the pageCount
-       double totalDbl = this.getTotal();
-       double pageSizeDbl = this.pageSize;
-       double pageCountDbl = totalDbl/pageSizeDbl;
-       pageCount = (int)Math.ceil(pageCountDbl);
-              
-       return pageCount;
-    }
-    
-    /**
-     * this is used to fuel the drop down list that lists the pages as part of this search
-     * @return
-     */
-    public SelectItem[] getPages()
-    {
-        SelectItem[] items = null;
-        
-        int pageCount = this.getPageCount();
-        items = new SelectItem[pageCount];
-        for(int i=0;i<pageCount;i++)
-        {
-            items[i] = new SelectItem(String.valueOf(i),String.valueOf(i+1));
-        }
-        
-        return items;
-    } 
-    
-    /**
-     * returns list of users for the specified page
-     * @return
-     */
-    public Collection getUsers() 
-    {
-        Collection users = new ArrayList();
-        
-        if(!Util.isEmpty(this.all))
-        {
-            //find the starting point based on pageNumber
-            Object[] resultArray = this.all.toArray();
-            int startIndex = this.pageNumber * this.pageSize;
-            int endIndex = startIndex + this.pageSize;
-            
-            if(startIndex<resultArray.length)
-            {
-                if(endIndex>=resultArray.length)
-                {
-                    endIndex = resultArray.length;
-                }
-                for(int i=startIndex;i<endIndex;i++)
-                {
-                    UserBean cour = (UserBean)resultArray[i];
-                    users.add(new SearchResultBean(cour));
-                }
-            }
-        }
-        
-        return users;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public int getTotal() 
-    {
-        int total = 0;
-        
-        if(!Util.isEmpty(this.all))
-        {
-            total = all.size();
-        }
-        
-        return total;
-    }
-    
-    /**
-     * returns the number of users displayed on the selected page
-     */
-    public int getResultSize()
-    {
-        int resultSize = 0;
-        Collection users = this.getUsers();
-        if(!Util.isEmpty(users))
-        {
-            resultSize = users.size();
-        }
-        return resultSize;
-    }
-    
-    /**
-     * 
-     * @author Sohil Shah - sohil.shah at jboss.com - Nov 7, 2006
-     *
-     */
-    private class UserNameComparator implements Comparator
-    {
-        public int compare(Object o1, Object o2) 
-        {
-            int result = 0;
-            
-            if(o1 instanceof UserBean && o2 instanceof UserBean)
-            {
-                UserBean left = (UserBean)o1;
-                UserBean right = (UserBean)o2;
-                
-                result = left.getUserName().toLowerCase().compareToIgnoreCase(right.getUserName().toLowerCase());
-            }
-            
-            return result;
-        }        
-    }
-    
-    /**
-     * 
-     * @author Sohil Shah - sohil.shah at jboss.com - Nov 7, 2006
-     *
-     */
-    private class EmailComparator implements Comparator
-    {
-        public int compare(Object o1, Object o2) 
-        {
-            int result = 0;
-            
-            if(o1 instanceof UserBean && o2 instanceof UserBean)
-            {
-                UserBean left = (UserBean)o1;
-                UserBean right = (UserBean)o2;
-                
-                result = left.getIdentity().getEmail().toLowerCase().compareToIgnoreCase(right.getIdentity().getEmail().toLowerCase());
-            }
-            
-            return result;
-        }        
-    }
-    
-    /**
-     * 
-     * @author Sohil Shah - sohil.shah at jboss.com - Nov 7, 2006
-     *
-     */
-    private class CompanyComparator implements Comparator
-    {
-        public int compare(Object o1, Object o2) 
-        {
-            int result = 0;
-            
-            if(o1 instanceof UserBean && o2 instanceof UserBean)
-            {
-                UserBean left = (UserBean)o1;
-                UserBean right = (UserBean)o2;
-                
-                result = left.getIdentity().getCompanyName().toLowerCase().compareToIgnoreCase(right.getIdentity().getCompanyName().toLowerCase());
-            }
-            
-            return result;
-        }        
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchHelper.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,352 @@
+/*
+* 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.website.user.ui;
+
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.io.Serializable;
+
+
+//jsf
+import javax.faces.model.SelectItem;
+
+
+import org.jboss.website.utils.Util;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 23, 2006
+ *
+ */
+public class SearchHelper implements Serializable
+{
+    /**
+     * 
+     */  
+    private int pageSize = 25;  //this is the default page size
+    private String searchInput = null; //search string input by the user
+    private String searchType = null; //search type selected by the user
+    private int pageNumber = 0; //defaults to the first page
+    private Collection all = null; //represents all the user found as part of this particular search
+    
+    /**
+     * 
+     *
+     */
+    public SearchHelper()
+    {
+        
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public String getSearchInput() 
+    {
+        return searchInput;
+    }
+
+    /**
+     * 
+     * @param searchInput
+     */
+    public void setSearchInput(String searchInput) 
+    {
+        this.searchInput = searchInput;
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public String getSearchType() 
+    {
+        return searchType;
+    }
+
+    /**
+     * 
+     * @param searchType
+     */
+    public void setSearchType(String searchType) 
+    {
+        this.searchType = searchType;
+    } 
+    
+    /**
+     * 
+     * @return
+     */    
+    public int getPageSize() 
+    {
+        return pageSize;
+    }
+
+    /**
+     * 
+     * @param pageSize
+     */
+    public void setPageSize(int pageSize) 
+    {
+        this.pageSize = pageSize;
+    }
+        
+    /**
+     * 
+     * @return
+     */
+    public Collection getAll() 
+    {
+        return all;
+    }
+
+    /**
+     * 
+     * @param all
+     */
+    public void setAll(Collection all) 
+    {
+        Collection sorted = new ArrayList();
+        if(
+           Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_USERNAME || 
+           Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_FIRST || 
+           Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_LAST
+        )
+        {
+            Object[] objects = all.toArray();
+            Arrays.sort(objects,new UserNameComparator());
+            for(int i=0;i<objects.length;i++)
+            {
+                sorted.add(objects[i]);
+            }
+        }
+        else if(Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_EMAIL)
+        {
+            Object[] objects = all.toArray();
+            Arrays.sort(objects,new EmailComparator());
+            for(int i=0;i<objects.length;i++)
+            {
+                sorted.add(objects[i]);
+            }
+        }
+        else if(Integer.parseInt(this.searchType) == UserManager.SEARCH_BY_COMPANY)
+        {
+            Object[] objects = all.toArray();
+            Arrays.sort(objects,new CompanyComparator());
+            for(int i=0;i<objects.length;i++)
+            {
+                sorted.add(objects[i]);
+            }
+        }
+        this.all = sorted;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public int getPageNumber() 
+    {
+        return pageNumber;
+    }
+
+    /**
+     * 
+     * @param pageNumber
+     */
+    public void setPageNumber(int pageNumber) 
+    {
+        this.pageNumber = pageNumber;
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------------------------------        
+    /**
+     * calculates the total number of result pages associated with this particular search
+     * @return
+     */
+    public int getPageCount()
+    {
+       int pageCount = 0;
+       
+       //calculate the pageCount
+       double totalDbl = this.getTotal();
+       double pageSizeDbl = this.pageSize;
+       double pageCountDbl = totalDbl/pageSizeDbl;
+       pageCount = (int)Math.ceil(pageCountDbl);
+              
+       return pageCount;
+    }
+    
+    /**
+     * this is used to fuel the drop down list that lists the pages as part of this search
+     * @return
+     */
+    public SelectItem[] getPages()
+    {
+        SelectItem[] items = null;
+        
+        int pageCount = this.getPageCount();
+        items = new SelectItem[pageCount];
+        for(int i=0;i<pageCount;i++)
+        {
+            items[i] = new SelectItem(String.valueOf(i),String.valueOf(i+1));
+        }
+        
+        return items;
+    } 
+    
+    /**
+     * returns list of users for the specified page
+     * @return
+     */
+    public Collection getUsers() 
+    {
+        Collection users = new ArrayList();
+        
+        if(!Util.isEmpty(this.all))
+        {
+            //find the starting point based on pageNumber
+            Object[] resultArray = this.all.toArray();
+            int startIndex = this.pageNumber * this.pageSize;
+            int endIndex = startIndex + this.pageSize;
+            
+            if(startIndex<resultArray.length)
+            {
+                if(endIndex>=resultArray.length)
+                {
+                    endIndex = resultArray.length;
+                }
+                for(int i=startIndex;i<endIndex;i++)
+                {
+                    UserBean cour = (UserBean)resultArray[i];
+                    users.add(new SearchResultBean(cour));
+                }
+            }
+        }
+        
+        return users;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public int getTotal() 
+    {
+        int total = 0;
+        
+        if(!Util.isEmpty(this.all))
+        {
+            total = all.size();
+        }
+        
+        return total;
+    }
+    
+    /**
+     * returns the number of users displayed on the selected page
+     */
+    public int getResultSize()
+    {
+        int resultSize = 0;
+        Collection users = this.getUsers();
+        if(!Util.isEmpty(users))
+        {
+            resultSize = users.size();
+        }
+        return resultSize;
+    }
+    
+    /**
+     * 
+     * @author Sohil Shah - sohil.shah at jboss.com - Nov 7, 2006
+     *
+     */
+    private class UserNameComparator implements Comparator
+    {
+        public int compare(Object o1, Object o2) 
+        {
+            int result = 0;
+            
+            if(o1 instanceof UserBean && o2 instanceof UserBean)
+            {
+                UserBean left = (UserBean)o1;
+                UserBean right = (UserBean)o2;
+                
+                result = left.getUserName().toLowerCase().compareToIgnoreCase(right.getUserName().toLowerCase());
+            }
+            
+            return result;
+        }        
+    }
+    
+    /**
+     * 
+     * @author Sohil Shah - sohil.shah at jboss.com - Nov 7, 2006
+     *
+     */
+    private class EmailComparator implements Comparator
+    {
+        public int compare(Object o1, Object o2) 
+        {
+            int result = 0;
+            
+            if(o1 instanceof UserBean && o2 instanceof UserBean)
+            {
+                UserBean left = (UserBean)o1;
+                UserBean right = (UserBean)o2;
+                
+                result = left.getIdentity().getEmail().toLowerCase().compareToIgnoreCase(right.getIdentity().getEmail().toLowerCase());
+            }
+            
+            return result;
+        }        
+    }
+    
+    /**
+     * 
+     * @author Sohil Shah - sohil.shah at jboss.com - Nov 7, 2006
+     *
+     */
+    private class CompanyComparator implements Comparator
+    {
+        public int compare(Object o1, Object o2) 
+        {
+            int result = 0;
+            
+            if(o1 instanceof UserBean && o2 instanceof UserBean)
+            {
+                UserBean left = (UserBean)o1;
+                UserBean right = (UserBean)o2;
+                
+                result = left.getIdentity().getCompanyName().toLowerCase().compareToIgnoreCase(right.getIdentity().getCompanyName().toLowerCase());
+            }
+            
+            return result;
+        }        
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,83 +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.website.user.ui;
-
-import java.net.URLEncoder;
-import java.io.Serializable;
-
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.jsf.utils.PortalUtil;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 29, 2006
- *
- */
-public class SearchResultBean implements Serializable
-{
-    /**
-     * 
-     */
-    private UserBean user = null;
-    
-    /**
-     * 
-     *
-     */
-    public SearchResultBean(UserBean user)
-    {
-        this.user = user;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public UserBean getUser() 
-    {
-        return user;
-    }
-
-    /**
-     * 
-     * @param user
-     */
-    public void setUser(UserBean user) 
-    {
-        this.user = user;
-    }  
-    
-    /**
-     * 
-     * @return
-     */
-    public String getProfileUrl() throws Exception
-    {
-        String profileUrl = "";
-                
-        String caller = PortalUtil.outputLink("/admin/search/results.jsf",true);
-        caller = URLEncoder.encode(caller,"UTF-8");
-        profileUrl = "/admin/profile/view.jsf?id="+this.user.getUserName()+"&caller="+caller;
-        
-        return profileUrl;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/SearchResultBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,83 @@
+/*
+* 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.website.user.ui;
+
+import java.net.URLEncoder;
+import java.io.Serializable;
+
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.jsf.utils.PortalUtil;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 29, 2006
+ *
+ */
+public class SearchResultBean implements Serializable
+{
+    /**
+     * 
+     */
+    private UserBean user = null;
+    
+    /**
+     * 
+     *
+     */
+    public SearchResultBean(UserBean user)
+    {
+        this.user = user;
+    }
+
+    /**
+     * 
+     * @return
+     */
+    public UserBean getUser() 
+    {
+        return user;
+    }
+
+    /**
+     * 
+     * @param user
+     */
+    public void setUser(UserBean user) 
+    {
+        this.user = user;
+    }  
+    
+    /**
+     * 
+     * @return
+     */
+    public String getProfileUrl() throws Exception
+    {
+        String profileUrl = "";
+                
+        String caller = PortalUtil.outputLink("/admin/search/results.jsf",true);
+        caller = URLEncoder.encode(caller,"UTF-8");
+        profileUrl = "/admin/profile/view.jsf?id="+this.user.getUserName()+"&caller="+caller;
+        
+        return profileUrl;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,95 +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.website.user.ui;
-
-import org.apache.myfaces.portlet.MyFacesGenericPortlet;
-
-import java.io.IOException;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.jboss.website.jsf.utils.PortalUtil;
-
-/**
- * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
- *
- * 
- */
-public class UserManagerJSFPortlet extends MyFacesGenericPortlet 
-{
-    /**
-     * Called by the portlet container to allow the portlet to process an action request.
-     */
-    public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException
-    {        
-        this.setupRenderParameters(request,response);        
-        super.processAction(request,response);
-    }
-    
-    /**
-     * 
-     */
-    protected void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException 
-    {
-        try
-        {            
-            super.doView(request, response);
-        }
-        catch(Exception e)
-        {
-            PortalUtil.sendRedirect(response,"/");
-        }
-    }
-    
-    /**
-     * 
-     * @author sshah
-     *
-     */
-    private void setupRenderParameters(ActionRequest request,ActionResponse response) throws PortletException,IOException
-    {
-        String id = PortalUtil.getParameter(request,Constants.id);
-        String caller = PortalUtil.getParameter(request,Constants.caller);
-        String input = PortalUtil.getParameter(request,Constants.input);
-        String token = PortalUtil.getParameter(request,Constants.token);
-        if(id!=null && id.trim().length()>0)
-        {
-            response.setRenderParameter(Constants.id,id);
-        }
-        if(caller!=null && caller.trim().length()>0)
-        {
-            response.setRenderParameter(Constants.caller,caller);
-        }
-        if(input!=null && input.trim().length()>0)
-        {
-            response.setRenderParameter(Constants.input,input);
-        }
-        if(token!=null && token.trim().length()>0)
-        {
-            response.setRenderParameter(Constants.token,token);
-        }
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/UserManagerJSFPortlet.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,95 @@
+/*
+* 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.website.user.ui;
+
+import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.jboss.website.jsf.utils.PortalUtil;
+
+/**
+ * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
+ *
+ * 
+ */
+public class UserManagerJSFPortlet extends MyFacesGenericPortlet 
+{
+    /**
+     * Called by the portlet container to allow the portlet to process an action request.
+     */
+    public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException
+    {        
+        this.setupRenderParameters(request,response);        
+        super.processAction(request,response);
+    }
+    
+    /**
+     * 
+     */
+    protected void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException 
+    {
+        try
+        {            
+            super.doView(request, response);
+        }
+        catch(Exception e)
+        {
+            PortalUtil.sendRedirect(response,"/");
+        }
+    }
+    
+    /**
+     * 
+     * @author sshah
+     *
+     */
+    private void setupRenderParameters(ActionRequest request,ActionResponse response) throws PortletException,IOException
+    {
+        String id = PortalUtil.getParameter(request,Constants.id);
+        String caller = PortalUtil.getParameter(request,Constants.caller);
+        String input = PortalUtil.getParameter(request,Constants.input);
+        String token = PortalUtil.getParameter(request,Constants.token);
+        if(id!=null && id.trim().length()>0)
+        {
+            response.setRenderParameter(Constants.id,id);
+        }
+        if(caller!=null && caller.trim().length()>0)
+        {
+            response.setRenderParameter(Constants.caller,caller);
+        }
+        if(input!=null && input.trim().length()>0)
+        {
+            response.setRenderParameter(Constants.input,input);
+        }
+        if(token!=null && token.trim().length()>0)
+        {
+            response.setRenderParameter(Constants.token,token);
+        }
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,190 +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.website.user.ui;
-
-//core java
-import java.io.Serializable;
-
-//logger
-import org.apache.log4j.Logger;
-
-//jboss-website
-import org.jboss.website.utils.Util;
-import org.jboss.website.jsf.utils.JSFUtil;
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * This managed bean serves as the UI controller for privileged users to view the profile of other registered users in the system
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
- *
- */
-public class ViewProfileController implements Serializable
-{
-    private static final Logger log = Logger.getLogger(ViewProfileController.class);
-        
-    
-    //field related
-    private UserBean user = null;
-    private ProfileHelper helper = null;
-    private boolean userNotFound = false;
-    private boolean passwordReset = false;
-    
-    /**
-     * 
-     */
-    public ProfileHelper getHelper() 
-    {
-        return helper;
-    }
-
-    /**
-     * 
-     * @param helper
-     */
-    public void setHelper(ProfileHelper helper) 
-    {
-        this.helper = helper;
-    }
-        
-    
-    /**
-     * 
-     * @return
-     */
-    public boolean getUserNotFound()
-    {
-        return this.userNotFound;
-    }   
-    
-    /**
-     * 
-     * @return
-     */
-    public boolean isPasswordReset()
-    {
-        return this.passwordReset;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public UserBean getUser()
-    {
-        return this.user;
-    }
-    //--------------------------------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public ViewProfileController() throws Exception
-    {
-        super();
-        this.helper = new ProfileHelper();
-        
-        //load the user who profile needs to be edited
-        String id = JSFUtil.getParameter(Constants.id);
-        boolean userFound = false;
-        if(!Util.isEmpty(id))
-        {            
-            UserBean user = ProfileHelper.readUserProfile(id);
-            if(user!=null)
-            {
-                this.helper.setUser(user);
-                this.user = user;
-                userFound = true;
-            }
-        }        
-        this.userNotFound = !userFound;
-    }  
-    //-----------methods that provide useful service to the ui associated with this controller----------------------------------------------------
-    /**
-     * 
-     */
-    public String getEditUrl() throws Exception
-    {
-        String editUrl = "";
-                        
-        editUrl = "/admin/profile/edit.jsf?id="+this.helper.getUser().getUserName();
-        String caller = JSFUtil.getParameter(Constants.caller);
-        if(!Util.isEmpty(caller))
-        {
-            caller = java.net.URLEncoder.encode(caller,"UTF-8");
-            editUrl += "&caller="+caller;
-        }
-        
-        return editUrl;
-    }
-    
-    //processing---------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public String changeAccountStatus() 
-    {
-        String navState = null;
-        try
-        {
-            /**
-             *change the actual account status of this user
-            * hookup to the backend service
-            */
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            userManager.changeActiveStatus(this.user); 
-            
-            //reload the new information
-            this.user = ProfileHelper.getRequestedUser(this.user.getUserName());
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        return navState;
-    }
-    
-    /**
-     * this method sends the current user an email to initiate the password reset process...
-     */
-    public String resetPassword()
-    {
-        String navState = null;
-        try
-        {
-            /**
-             *change the actual account status of this user
-            * hookup to the backend service
-            */
-            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
-            userManager.sendResetPasswordEmail(this.user); 
-            
-            this.passwordReset = true;
-        }
-        catch(Exception e)
-        {
-            return JSFUtil.handleException(e);
-        }
-        return navState;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/ui/ViewProfileController.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,190 @@
+/*
+* 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.website.user.ui;
+
+//core java
+import java.io.Serializable;
+
+//logger
+import org.apache.log4j.Logger;
+
+//jboss-website
+import org.jboss.website.utils.Util;
+import org.jboss.website.jsf.utils.JSFUtil;
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * This managed bean serves as the UI controller for privileged users to view the profile of other registered users in the system
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Mar 25, 2006
+ *
+ */
+public class ViewProfileController implements Serializable
+{
+    private static final Logger log = Logger.getLogger(ViewProfileController.class);
+        
+    
+    //field related
+    private UserBean user = null;
+    private ProfileHelper helper = null;
+    private boolean userNotFound = false;
+    private boolean passwordReset = false;
+    
+    /**
+     * 
+     */
+    public ProfileHelper getHelper() 
+    {
+        return helper;
+    }
+
+    /**
+     * 
+     * @param helper
+     */
+    public void setHelper(ProfileHelper helper) 
+    {
+        this.helper = helper;
+    }
+        
+    
+    /**
+     * 
+     * @return
+     */
+    public boolean getUserNotFound()
+    {
+        return this.userNotFound;
+    }   
+    
+    /**
+     * 
+     * @return
+     */
+    public boolean isPasswordReset()
+    {
+        return this.passwordReset;
+    }
+    
+    /**
+     * 
+     * @return
+     */
+    public UserBean getUser()
+    {
+        return this.user;
+    }
+    //--------------------------------------------------------------------------------------------------------------------------------------------    
+    /**
+     * 
+     */
+    public ViewProfileController() throws Exception
+    {
+        super();
+        this.helper = new ProfileHelper();
+        
+        //load the user who profile needs to be edited
+        String id = JSFUtil.getParameter(Constants.id);
+        boolean userFound = false;
+        if(!Util.isEmpty(id))
+        {            
+            UserBean user = ProfileHelper.readUserProfile(id);
+            if(user!=null)
+            {
+                this.helper.setUser(user);
+                this.user = user;
+                userFound = true;
+            }
+        }        
+        this.userNotFound = !userFound;
+    }  
+    //-----------methods that provide useful service to the ui associated with this controller----------------------------------------------------
+    /**
+     * 
+     */
+    public String getEditUrl() throws Exception
+    {
+        String editUrl = "";
+                        
+        editUrl = "/admin/profile/edit.jsf?id="+this.helper.getUser().getUserName();
+        String caller = JSFUtil.getParameter(Constants.caller);
+        if(!Util.isEmpty(caller))
+        {
+            caller = java.net.URLEncoder.encode(caller,"UTF-8");
+            editUrl += "&caller="+caller;
+        }
+        
+        return editUrl;
+    }
+    
+    //processing---------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    public String changeAccountStatus() 
+    {
+        String navState = null;
+        try
+        {
+            /**
+             *change the actual account status of this user
+            * hookup to the backend service
+            */
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            userManager.changeActiveStatus(this.user); 
+            
+            //reload the new information
+            this.user = ProfileHelper.getRequestedUser(this.user.getUserName());
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        return navState;
+    }
+    
+    /**
+     * this method sends the current user an email to initiate the password reset process...
+     */
+    public String resetPassword()
+    {
+        String navState = null;
+        try
+        {
+            /**
+             *change the actual account status of this user
+            * hookup to the backend service
+            */
+            UserManager userManager = (UserManager)DomainService.getService(UserManager.class.getName());
+            userManager.sendResetPasswordEmail(this.user); 
+            
+            this.passwordReset = true;
+        }
+        catch(Exception e)
+        {
+            return JSFUtil.handleException(e);
+        }
+        return navState;
+    }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,91 +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.website.user.util;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.apache.log4j.Logger;
-
-/**
- * @author Julien Viet - julien.viet at jboss.com - This is a copy and paste of the Nukes password code from the Nukes codebase
- * @author Sohil Shah - sohil.shah at jboss.com - Jul 24, 2006
- *
- */
-public class NukesUtil 
-{
-    private static final Logger log = Logger.getLogger(NukesUtil.class);
-    
-    /**
-     * Computes an md5 hash of a string.
-     * @param text the hashed string
-     * @return the string hash
-     * @exception NullPointerException if text is null
-     */
-    public static byte[] md5(String text)
-    {
-       // arguments check
-       if (text == null)
-       {
-          throw new NullPointerException("null text");
-       }
-
-       try
-       {
-          MessageDigest md = MessageDigest.getInstance("MD5");
-          md.update(text.getBytes());
-          return md.digest();
-       }
-       catch (NoSuchAlgorithmException e)
-       {
-          log.error("Cannot find MD5 algorithm", e);
-          throw new RuntimeException("Cannot find MD5 algorithm");
-       }
-    }
-
-    /**
-     * Computes an md5 hash and returns the result as a string in hexadecimal format.
-     * @param text the hashed string
-     * @return the string hash
-     * @exception NullPointerException if text is null
-     */
-    public static String md5AsHexString(String text)
-    {
-       return toHexString(md5(text));
-    }
-
-    /**
-     * Returns a string in the hexadecimal format.
-     * @param bytes the converted bytes
-     * @return the hexadecimal string representing the bytes data
-     */
-    public static String toHexString(byte[] bytes)
-    {
-       StringBuffer hex = new StringBuffer();
-       for (int i = 0;i < bytes.length;i++)
-       {
-          hex.append(Character.forDigit((bytes[i] & 0XF0) >> 4, 16));
-          hex.append(Character.forDigit((bytes[i] & 0X0F), 16));
-       }
-       return hex.toString();
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/NukesUtil.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,91 @@
+/*
+* 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.website.user.util;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author Julien Viet - julien.viet at jboss.com - This is a copy and paste of the Nukes password code from the Nukes codebase
+ * @author Sohil Shah - sohil.shah at jboss.com - Jul 24, 2006
+ *
+ */
+public class NukesUtil 
+{
+    private static final Logger log = Logger.getLogger(NukesUtil.class);
+    
+    /**
+     * Computes an md5 hash of a string.
+     * @param text the hashed string
+     * @return the string hash
+     * @exception NullPointerException if text is null
+     */
+    public static byte[] md5(String text)
+    {
+       // arguments check
+       if (text == null)
+       {
+          throw new NullPointerException("null text");
+       }
+
+       try
+       {
+          MessageDigest md = MessageDigest.getInstance("MD5");
+          md.update(text.getBytes());
+          return md.digest();
+       }
+       catch (NoSuchAlgorithmException e)
+       {
+          log.error("Cannot find MD5 algorithm", e);
+          throw new RuntimeException("Cannot find MD5 algorithm");
+       }
+    }
+
+    /**
+     * Computes an md5 hash and returns the result as a string in hexadecimal format.
+     * @param text the hashed string
+     * @return the string hash
+     * @exception NullPointerException if text is null
+     */
+    public static String md5AsHexString(String text)
+    {
+       return toHexString(md5(text));
+    }
+
+    /**
+     * Returns a string in the hexadecimal format.
+     * @param bytes the converted bytes
+     * @return the hexadecimal string representing the bytes data
+     */
+    public static String toHexString(byte[] bytes)
+    {
+       StringBuffer hex = new StringBuffer();
+       for (int i = 0;i < bytes.length;i++)
+       {
+          hex.append(Character.forDigit((bytes[i] & 0XF0) >> 4, 16));
+          hex.append(Character.forDigit((bytes[i] & 0X0F), 16));
+       }
+       return hex.toString();
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,84 +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.website.user.util;
-
-import org.jboss.website.utils.Util;
-
-import org.jboss.website.user.bo.UserBean;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
- *
- */
-public class Tools 
-{
-    public static final String salt = "g3r0n1m0r0n5";
-    
-    /**
-     * 
-     * @param user
-     * @param token
-     * @return
-     * @throws Exception
-     */
-    public static boolean verifyUserNameEncoding(UserBean user,String token) throws Exception
-    {
-        boolean isValid = false;
-        
-        String validToken = org.jboss.website.security.Tools.
-        getEncodedPassword(user.getUserName()+Tools.salt);
-        
-        if(token.equals(validToken))
-        {
-            isValid = true;
-        }
-        
-        return isValid;
-    } 
-    
-    /**
-     * 
-     * @param concatStrs
-     * @return
-     * @throws Exception
-     */
-    public static String generateToken(String[] concatStrs) throws Exception
-    {
-        String token = "";
-        
-        StringBuffer buffer = new StringBuffer();
-        if(!Util.isEmpty(concatStrs))
-        {
-            for(int i=0;i<concatStrs.length;i++)
-            {
-                buffer.append(concatStrs[i]);
-            }
-        }
-        buffer.append(Tools.salt);
-        
-        token = org.jboss.website.security.Tools.
-        getEncodedPassword(buffer.toString());
-        
-        return token;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,84 @@
+/*
+* 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.website.user.util;
+
+import org.jboss.website.utils.Util;
+
+import org.jboss.website.user.bo.UserBean;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Apr 11, 2006
+ *
+ */
+public class Tools 
+{
+    public static final String salt = "g3r0n1m0r0n5";
+    
+    /**
+     * 
+     * @param user
+     * @param token
+     * @return
+     * @throws Exception
+     */
+    public static boolean verifyUserNameEncoding(UserBean user,String token) throws Exception
+    {
+        boolean isValid = false;
+        
+        String validToken = org.jboss.website.security.Tools.
+        getEncodedPassword(user.getUserName()+Tools.salt);
+        
+        if(token.equals(validToken))
+        {
+            isValid = true;
+        }
+        
+        return isValid;
+    } 
+    
+    /**
+     * 
+     * @param concatStrs
+     * @return
+     * @throws Exception
+     */
+    public static String generateToken(String[] concatStrs) throws Exception
+    {
+        String token = "";
+        
+        StringBuffer buffer = new StringBuffer();
+        if(!Util.isEmpty(concatStrs))
+        {
+            for(int i=0;i<concatStrs.length;i++)
+            {
+                buffer.append(concatStrs[i]);
+            }
+        }
+        buffer.append(Tools.salt);
+        
+        token = org.jboss.website.security.Tools.
+        getEncodedPassword(buffer.toString());
+        
+        return token;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,322 +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.website.user.util;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.security.jacc.PolicyContext;
-
-// core java
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-// core java security
-import java.security.Principal;
-import java.security.acl.Group;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.LoginException;
-import javax.transaction.TransactionManager;
-
-// core jboss security
-import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.UserProfileModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.NoSuchUserException;
-import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
-import org.jboss.security.SimpleGroup;
-
-// jboss-sso imports
-import org.jboss.security.idm.IdentityManager;
-import org.jboss.security.idm.Identity;
-import org.jboss.security.idm.LoginProvider;
-
-// jboss-website-user
-import org.jboss.website.service.DomainService;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.ejb.UserManager;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Jun 12, 2006
- * 
- */
-public class UsernameAndPasswordLoginModule extends UsernamePasswordLoginModule
-{
-   Collection authenticatedRoles = new ArrayList();
-
-   private LoginProvider provider = null;
-
-   private UserModule userModule = null;
-
-   private UserProfileModule userProfileModule = null;
-
-
-   /**
-    * 
-    */
-   public void initialize(Subject subject, CallbackHandler callbackHandler,
-         Map sharedState, Map options)
-   {
-      super.initialize(subject, callbackHandler, sharedState, options);
-
-      // Setup the authenticatedRoles... this is a comma-separated list
-      String authenticatedRoles = (String) options.get("authenticatedRoles");
-      if (authenticatedRoles != null && authenticatedRoles.trim().length() > 0)
-      {
-         StringTokenizer st = new StringTokenizer(authenticatedRoles, ",");
-         while (st.hasMoreTokens())
-         {
-            this.authenticatedRoles.add(st.nextToken());
-         }
-      }
-
-      // Use the specified provider
-      String providerId = (String) options.get("provider");
-      if (providerId == null || providerId.trim().length() == 0)
-      {
-         provider = IdentityManager.findLoginProvider();
-      }
-      else
-      {
-         provider = IdentityManager.findLoginProvider(providerId);
-      }
-
-
-      // Setup the portal identity services to be used
-      try
-      {
-         userModule = (UserModule) new InitialContext()
-               .lookup("java:portal/UserModule");         
-         userProfileModule = (UserProfileModule) new InitialContext()
-               .lookup("java:portal/UserProfileModule");         
-      }
-      catch (NamingException e)
-      {
-         log.error(e);
-      }
-   }
-   
-   /**
-    * 
-    */
-   protected boolean validatePassword(String inputPassword,String expectedPassword)
-   {
-      boolean syncNeeded = false;
-      Identity identity = null;
-      try
-      {
-         boolean loginSuccess = false;
-         HttpServletRequest request = (HttpServletRequest) PolicyContext
-               .getContext("javax.servlet.http.HttpServletRequest");
-
-         if (provider.exists(this.getUsername()))
-         {
-            identity = provider.read(this.getUsername());            
-
-            // also make sure the user is active
-            if (!identity.isActive())
-            {
-               // signify to the system that this account is inactive
-               LoginException e = new LoginException(
-                     "The specified account has not been activated-"
-                           + this.getUsername());
-               request.getSession().setAttribute("j_exception", e);
-               request.getSession().setAttribute("username", this.getUsername());
-               throw e;
-            }
-
-            // here make sure a forceReset Status is not active...If this is the
-            // case
-            // make the user reset his password
-            UserManager userManager = (UserManager) DomainService
-                  .getService(UserManager.class.getName());
-            UserBean user = userManager.getUser(this.getUsername());
-            if (user.isForceResetEnabled())
-            {
-               LoginException e = new LoginException("forceReset");
-               request.getSession().setAttribute("j_exception", e);
-               request.getSession().setAttribute("username", this.getUsername());
-               throw e;
-            }
-            
-            loginSuccess = provider.login(this.getUsername(), inputPassword.getBytes());
-            if(!loginSuccess)
-            {
-               //lets make sure this is not part of sso auto login, in which case input password is already
-               //in the encrypted format. if it is, the verification logic should be
-               String storedPassword = new String(identity.getPassword());
-               if(storedPassword.equalsIgnoreCase(inputPassword))
-               {
-                  loginSuccess = true;
-               }
-            }
-         }
-         syncNeeded = true;         
-         return loginSuccess;
-      }
-      catch (Exception e)
-      {
-         log.error(this, e);
-         return false;
-      }
-      finally
-      {
-         //Sync up the identity stored in the LDAP store (primary store)
-         //with the local portal database, because portal services key off
-         //of these entities. only sync up bare minimum to keep the data dependence
-         //consistent
-         if(syncNeeded)
-         {
-            try
-            {
-               this.syncIdentityWithPortal(identity);
-            }
-            catch(Exception e)
-            {
-               log.error(e);
-               return false;
-            }
-         }
-      }
-   }
-
-   /**
-    * 
-    */
-   protected String getUsersPassword() throws LoginException
-   {
-      return "";
-   }
-   
-   /**
-    * 
-    * @param userName
-    */
-   private void syncIdentityWithPortal(Identity identity) throws Exception
-   { 
-      boolean isUserFound = true;
-      TransactionManager tm = (TransactionManager) new InitialContext().lookup("java:/TransactionManager");
-      tm.begin();
-      boolean commit = false;
-      try
-      {
-         try
-         {
-            this.userModule.findUserByUserName(identity.getUserName());
-            
-         }
-         catch(NoSuchUserException nse)
-         {
-            isUserFound = false;
-         }
-         
-         if(!isUserFound)
-         {
-            User user = this.userModule.createUser(identity.getUserName(), "");
-            this.userProfileModule.setProperty(user, User.INFO_USER_ENABLED, true);
-            commit = true;
-         }
-      }
-      finally
-      {
-         if(commit)
-         {
-            tm.commit();
-         }
-         else
-         {
-            tm.rollback();
-         }
-      }
-   }
-
-   /**
-    * 
-    */
-   protected Group[] getRoleSets() throws LoginException
-   {
-      try
-      {
-         Group[] groups =
-         { new SimpleGroup("Roles") };
-
-         // perform check against the specified IdentityProvider
-         if (provider.exists(this.getUsername()))
-         {
-            Identity identity = provider.read(this.getUsername());
-
-            if (this.authenticatedRoles != null)
-            {
-               for (Iterator itr = this.authenticatedRoles.iterator(); itr
-                     .hasNext();)
-               {
-                  Principal role = this.createIdentity((String) itr.next());
-                  groups[0].addMember(role);
-               }
-            }
-
-            // grab the roles associated with this user
-            Collection roles = identity.getRoles(this.provider);
-            boolean hasAdmin = false;
-            boolean hasUser = false;
-            if (roles != null)
-            {
-               for (Iterator itr = roles.iterator(); itr.hasNext();)
-               {
-                  String roleName = (String) itr.next();
-                  Principal role = this.createIdentity(roleName);
-                  groups[0].addMember(role);
-                  
-                  if(roleName.equalsIgnoreCase("Admin"))
-                  {
-                     hasAdmin = true;
-                  }
-                  else if(roleName.equalsIgnoreCase("User"))
-                  {
-                     hasUser = true;
-                  }
-               }
-            }
-            
-            //if neither admin or user role is found...force adding regular user role
-            if(!hasAdmin && !hasUser)
-            {
-               Principal role = this.createIdentity("User");
-               groups[0].addMember(role);
-            }
-         }
-
-         return groups;
-      }
-      catch (Exception e)
-      {
-         log.error(this, e);
-         throw new LoginException(e.toString());
-      }
-   }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/java/org/jboss/website/user/util/UsernameAndPasswordLoginModule.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,322 @@
+/*
+ * 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.website.user.util;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
+import javax.security.jacc.PolicyContext;
+
+// core java
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+// core java security
+import java.security.Principal;
+import java.security.acl.Group;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
+import javax.transaction.TransactionManager;
+
+// core jboss security
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
+import org.jboss.security.SimpleGroup;
+
+// jboss-sso imports
+import org.jboss.security.idm.IdentityManager;
+import org.jboss.security.idm.Identity;
+import org.jboss.security.idm.LoginProvider;
+
+// jboss-website-user
+import org.jboss.website.service.DomainService;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.ejb.UserManager;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Jun 12, 2006
+ * 
+ */
+public class UsernameAndPasswordLoginModule extends UsernamePasswordLoginModule
+{
+   Collection authenticatedRoles = new ArrayList();
+
+   private LoginProvider provider = null;
+
+   private UserModule userModule = null;
+
+   private UserProfileModule userProfileModule = null;
+
+
+   /**
+    * 
+    */
+   public void initialize(Subject subject, CallbackHandler callbackHandler,
+         Map sharedState, Map options)
+   {
+      super.initialize(subject, callbackHandler, sharedState, options);
+
+      // Setup the authenticatedRoles... this is a comma-separated list
+      String authenticatedRoles = (String) options.get("authenticatedRoles");
+      if (authenticatedRoles != null && authenticatedRoles.trim().length() > 0)
+      {
+         StringTokenizer st = new StringTokenizer(authenticatedRoles, ",");
+         while (st.hasMoreTokens())
+         {
+            this.authenticatedRoles.add(st.nextToken());
+         }
+      }
+
+      // Use the specified provider
+      String providerId = (String) options.get("provider");
+      if (providerId == null || providerId.trim().length() == 0)
+      {
+         provider = IdentityManager.findLoginProvider();
+      }
+      else
+      {
+         provider = IdentityManager.findLoginProvider(providerId);
+      }
+
+
+      // Setup the portal identity services to be used
+      try
+      {
+         userModule = (UserModule) new InitialContext()
+               .lookup("java:portal/UserModule");         
+         userProfileModule = (UserProfileModule) new InitialContext()
+               .lookup("java:portal/UserProfileModule");         
+      }
+      catch (NamingException e)
+      {
+         log.error(e);
+      }
+   }
+   
+   /**
+    * 
+    */
+   protected boolean validatePassword(String inputPassword,String expectedPassword)
+   {
+      boolean syncNeeded = false;
+      Identity identity = null;
+      try
+      {
+         boolean loginSuccess = false;
+         HttpServletRequest request = (HttpServletRequest) PolicyContext
+               .getContext("javax.servlet.http.HttpServletRequest");
+
+         if (provider.exists(this.getUsername()))
+         {
+            identity = provider.read(this.getUsername());            
+
+            // also make sure the user is active
+            if (!identity.isActive())
+            {
+               // signify to the system that this account is inactive
+               LoginException e = new LoginException(
+                     "The specified account has not been activated-"
+                           + this.getUsername());
+               request.getSession().setAttribute("j_exception", e);
+               request.getSession().setAttribute("username", this.getUsername());
+               throw e;
+            }
+
+            // here make sure a forceReset Status is not active...If this is the
+            // case
+            // make the user reset his password
+            UserManager userManager = (UserManager) DomainService
+                  .getService(UserManager.class.getName());
+            UserBean user = userManager.getUser(this.getUsername());
+            if (user.isForceResetEnabled())
+            {
+               LoginException e = new LoginException("forceReset");
+               request.getSession().setAttribute("j_exception", e);
+               request.getSession().setAttribute("username", this.getUsername());
+               throw e;
+            }
+            
+            loginSuccess = provider.login(this.getUsername(), inputPassword.getBytes());
+            if(!loginSuccess)
+            {
+               //lets make sure this is not part of sso auto login, in which case input password is already
+               //in the encrypted format. if it is, the verification logic should be
+               String storedPassword = new String(identity.getPassword());
+               if(storedPassword.equalsIgnoreCase(inputPassword))
+               {
+                  loginSuccess = true;
+               }
+            }
+         }
+         syncNeeded = true;         
+         return loginSuccess;
+      }
+      catch (Exception e)
+      {
+         log.error(this, e);
+         return false;
+      }
+      finally
+      {
+         //Sync up the identity stored in the LDAP store (primary store)
+         //with the local portal database, because portal services key off
+         //of these entities. only sync up bare minimum to keep the data dependence
+         //consistent
+         if(syncNeeded)
+         {
+            try
+            {
+               this.syncIdentityWithPortal(identity);
+            }
+            catch(Exception e)
+            {
+               log.error(e);
+               return false;
+            }
+         }
+      }
+   }
+
+   /**
+    * 
+    */
+   protected String getUsersPassword() throws LoginException
+   {
+      return "";
+   }
+   
+   /**
+    * 
+    * @param userName
+    */
+   private void syncIdentityWithPortal(Identity identity) throws Exception
+   { 
+      boolean isUserFound = true;
+      TransactionManager tm = (TransactionManager) new InitialContext().lookup("java:/TransactionManager");
+      tm.begin();
+      boolean commit = false;
+      try
+      {
+         try
+         {
+            this.userModule.findUserByUserName(identity.getUserName());
+            
+         }
+         catch(NoSuchUserException nse)
+         {
+            isUserFound = false;
+         }
+         
+         if(!isUserFound)
+         {
+            User user = this.userModule.createUser(identity.getUserName(), "");
+            this.userProfileModule.setProperty(user, User.INFO_USER_ENABLED, true);
+            commit = true;
+         }
+      }
+      finally
+      {
+         if(commit)
+         {
+            tm.commit();
+         }
+         else
+         {
+            tm.rollback();
+         }
+      }
+   }
+
+   /**
+    * 
+    */
+   protected Group[] getRoleSets() throws LoginException
+   {
+      try
+      {
+         Group[] groups =
+         { new SimpleGroup("Roles") };
+
+         // perform check against the specified IdentityProvider
+         if (provider.exists(this.getUsername()))
+         {
+            Identity identity = provider.read(this.getUsername());
+
+            if (this.authenticatedRoles != null)
+            {
+               for (Iterator itr = this.authenticatedRoles.iterator(); itr
+                     .hasNext();)
+               {
+                  Principal role = this.createIdentity((String) itr.next());
+                  groups[0].addMember(role);
+               }
+            }
+
+            // grab the roles associated with this user
+            Collection roles = identity.getRoles(this.provider);
+            boolean hasAdmin = false;
+            boolean hasUser = false;
+            if (roles != null)
+            {
+               for (Iterator itr = roles.iterator(); itr.hasNext();)
+               {
+                  String roleName = (String) itr.next();
+                  Principal role = this.createIdentity(roleName);
+                  groups[0].addMember(role);
+                  
+                  if(roleName.equalsIgnoreCase("Admin"))
+                  {
+                     hasAdmin = true;
+                  }
+                  else if(roleName.equalsIgnoreCase("User"))
+                  {
+                     hasUser = true;
+                  }
+               }
+            }
+            
+            //if neither admin or user role is found...force adding regular user role
+            if(!hasAdmin && !hasUser)
+            {
+               Principal role = this.createIdentity("User");
+               groups[0].addMember(role);
+            }
+         }
+
+         return groups;
+      }
+      catch (Exception e)
+      {
+         log.error(this, e);
+         throw new LoginException(e.toString());
+      }
+   }
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,8 +0,0 @@
-<application>
-	<display-name>JBoss.com UserManagement Tool</display-name>	
-	<module>
-		<web>
-			<web-uri>jbwebsite-user-admin.war</web-uri>
-		</web>
-	</module>
-</application>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/application.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,8 @@
+<application>
+	<display-name>JBoss.com UserManagement Tool</display-name>	
+	<module>
+		<web>
+			<web-uri>jbwebsite-user-admin.war</web-uri>
+		</web>
+	</module>
+</application>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app> 
-   <module>
-         <service>user-admin.sar</service>
-   </module>
-   <module>
-      <service>jboss-service.xml</service>
-   </module>
-</jboss-app>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/jboss-app.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app> 
+   <module>
+         <service>user-admin.sar</service>
+   </module>
+   <module>
+      <service>jboss-service.xml</service>
+   </module>
+</jboss-app>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
-security domain used by the security-spec test case
--->
-<policy>
-    <application-policy name="user">       
-       <authentication>
-         <login-module code="org.jboss.security.idm.UsernameAndPasswordLoginModule" flag="sufficient">
-	             <module-option name="unauthenticatedIdentity">guest</module-option>                        
-	             <module-option name="password-stacking">useFirstPass</module-option>           
-	             <module-option name="hashAlgorithm">MD5</module-option>
-	             <module-option name="hashEncoding">HEX</module-option>             
-	             <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
-         </login-module>         
-      </authentication>
-    </application-policy>
-</policy>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/META-INF/security-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
+security domain used by the security-spec test case
+-->
+<policy>
+    <application-policy name="user">       
+       <authentication>
+         <login-module code="org.jboss.security.idm.UsernameAndPasswordLoginModule" flag="sufficient">
+	             <module-option name="unauthenticatedIdentity">guest</module-option>                        
+	             <module-option name="password-stacking">useFirstPass</module-option>           
+	             <module-option name="hashAlgorithm">MD5</module-option>
+	             <module-option name="hashEncoding">HEX</module-option>             
+	             <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
+         </login-module>         
+      </authentication>
+    </application-policy>
+</policy>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,243 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<faces-config>	
-	<!-- general application configuration -->
-	<application>
-	    <!-- jbossportal-facelets integration -->
-	    <!--property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
-	    <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler-->
-	    
-	    <!-- standalone facelets integration -->
-    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>     	    	
-    </application>
-    
-    <!--lifecycle>
-    	<phase-listener>org.jboss.website.jsf.listeners.ActionErrorHandler</phase-listener>
-    </lifecycle-->
-    
-    <!--  custom validator registrations -->
-	<validator>
-		<validator-id>org.jboss.website.jsf.validator.Email</validator-id>
-		<validator-class>org.jboss.website.jsf.validator.EmailValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>org.jboss.website.jsf.validator.Password</validator-id>
-		<validator-class>org.jboss.website.jsf.validator.PasswordValidator</validator-class>
-	</validator>
-    
-    <!--  generic navigation rules, irrespective of the (from-view-id) -->
-	<!--navigation-rule>		
-		<navigation-case>
-			<from-outcome>noauth</from-outcome>
-			<to-view-id>/admin/noauth.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule-->
-
-	<!-- managed bean for user profile usecases (registration,edit,view etc) -->
-	<managed-bean>
-		<managed-bean-name>profileValidator</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ProfileValidator</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>registrar</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.Registrar</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>	
-	<managed-bean>
-		<managed-bean-name>editProfile</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.EditProfileController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>editMyProfile</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.EditMyProfileController</managed-bean-class>
-		<managed-bean-scope>session</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>myPassword</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ChangeMyPasswordController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>viewProfile</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ViewProfileController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>		
-			
-	<!-- navigation rules for /admin/profile/checkage.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/checkage.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>register</from-outcome>
-			<to-view-id>/admin/profile/register.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>underage</from-outcome>
-			<to-view-id>/admin/profile/underage.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/register.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/register.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/profile/confirmation.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/view.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/view.xhtml</from-view-id>										
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-				
-	<!-- navigation rules for /admin/profile/edit.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/edit.xhtml</from-view-id>								
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/profile/view.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>cancel</from-outcome>
-			<to-view-id>/admin/profile/view.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/editMyProfile.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/editMyProfile.xhtml</from-view-id>								
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>cancel</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
-		</navigation-case>						
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/changeMyPassword.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/changeMyPassword.xhtml</from-view-id>								
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/profile/editMyProfile.xhtml</to-view-id>
-		</navigation-case>						
-	</navigation-rule>
-	
-					
-	<!--  user search related usecases -->
-	<managed-bean>
-		<managed-bean-name>search</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.SearchController</managed-bean-class>
-		<managed-bean-scope>session</managed-bean-scope>
-	</managed-bean>
-	<navigation-rule>
-		<from-view-id>/admin/search/index.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>display</from-outcome>
-			<to-view-id>/admin/search/results.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/admin/search/results.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>display</from-outcome>
-			<to-view-id>/admin/search/results.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	
-	<!--  user account activation related usecases -->
-	<managed-bean>
-		<managed-bean-name>activation</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.AccountActivationController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	
-	<!-- navigation rules for /admin/activation/resendActivationConf.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/activation/resendActivationConf.xhtml</from-view-id>		
-		<!--  open means start of this usecase of reporting this issue to the Administrator -->
-		<navigation-case>
-			<from-outcome>open</from-outcome>
-			<to-view-id>/admin/activation/contactAdmin.xhtml</to-view-id>
-		</navigation-case>			
-	</navigation-rule>
-	
-		
-	<!-- navigation rules for /admin/activation/contactAdmin.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/activation/contactAdmin.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>confirm</from-outcome>
-			<to-view-id>/admin/activation/contactAdminConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>	
-	
-	<!--  user password management related usecases -->
-	<managed-bean>
-		<managed-bean-name>reset</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ResetPasswordController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>resetNukesPass</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ResetNukesPasswordController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>lostPassword</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.LostPasswordController</managed-bean-class>
-		<managed-bean-scope>session</managed-bean-scope>
-	</managed-bean>
-	<!-- navigation rules for /admin/password/tempPassword.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/tempPassword.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/tempPasswordConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-	<!-- navigation rules for /admin/password/resetNukesPass.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/resetNukesPass.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/resetNukesPassConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-	<!-- navigation rules for /admin/password/startLostPassword.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/startLostPassword.xhtml</from-view-id>				
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/secretQuestion.xhtml</to-view-id>			
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>resendActivation</from-outcome>
-			<to-view-id>/admin/activation/resendActivationConf.xhtml</to-view-id>			
-		</navigation-case>				
-		<navigation-case>
-			<from-outcome>close</from-outcome>
-			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	<!-- navigation rules for /admin/password/secretQuestion.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/secretQuestion.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-</faces-config>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/user-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+
+<faces-config>	
+	<!-- general application configuration -->
+	<application>
+	    <!-- jbossportal-facelets integration -->
+	    <!--property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
+	    <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler-->
+	    
+	    <!-- standalone facelets integration -->
+    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>     	    	
+    </application>
+    
+    <!--lifecycle>
+    	<phase-listener>org.jboss.website.jsf.listeners.ActionErrorHandler</phase-listener>
+    </lifecycle-->
+    
+    <!--  custom validator registrations -->
+	<validator>
+		<validator-id>org.jboss.website.jsf.validator.Email</validator-id>
+		<validator-class>org.jboss.website.jsf.validator.EmailValidator</validator-class>
+	</validator>
+	<validator>
+		<validator-id>org.jboss.website.jsf.validator.Password</validator-id>
+		<validator-class>org.jboss.website.jsf.validator.PasswordValidator</validator-class>
+	</validator>
+    
+    <!--  generic navigation rules, irrespective of the (from-view-id) -->
+	<!--navigation-rule>		
+		<navigation-case>
+			<from-outcome>noauth</from-outcome>
+			<to-view-id>/admin/noauth.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule-->
+
+	<!-- managed bean for user profile usecases (registration,edit,view etc) -->
+	<managed-bean>
+		<managed-bean-name>profileValidator</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ProfileValidator</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>registrar</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.Registrar</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>	
+	<managed-bean>
+		<managed-bean-name>editProfile</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.EditProfileController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>editMyProfile</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.EditMyProfileController</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>myPassword</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ChangeMyPasswordController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>viewProfile</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ViewProfileController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>		
+			
+	<!-- navigation rules for /admin/profile/checkage.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/checkage.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>register</from-outcome>
+			<to-view-id>/admin/profile/register.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>underage</from-outcome>
+			<to-view-id>/admin/profile/underage.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/register.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/register.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/profile/confirmation.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/view.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/view.xhtml</from-view-id>										
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/index.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+				
+	<!-- navigation rules for /admin/profile/edit.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/edit.xhtml</from-view-id>								
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/profile/view.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>cancel</from-outcome>
+			<to-view-id>/admin/profile/view.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/editMyProfile.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/editMyProfile.xhtml</from-view-id>								
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/index.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>cancel</from-outcome>
+			<to-view-id>/admin/index.xhtml</to-view-id>
+		</navigation-case>						
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/changeMyPassword.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/changeMyPassword.xhtml</from-view-id>								
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/profile/editMyProfile.xhtml</to-view-id>
+		</navigation-case>						
+	</navigation-rule>
+	
+					
+	<!--  user search related usecases -->
+	<managed-bean>
+		<managed-bean-name>search</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.SearchController</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+	<navigation-rule>
+		<from-view-id>/admin/search/index.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>display</from-outcome>
+			<to-view-id>/admin/search/results.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/search/results.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>display</from-outcome>
+			<to-view-id>/admin/search/results.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	
+	<!--  user account activation related usecases -->
+	<managed-bean>
+		<managed-bean-name>activation</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.AccountActivationController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	
+	<!-- navigation rules for /admin/activation/resendActivationConf.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/activation/resendActivationConf.xhtml</from-view-id>		
+		<!--  open means start of this usecase of reporting this issue to the Administrator -->
+		<navigation-case>
+			<from-outcome>open</from-outcome>
+			<to-view-id>/admin/activation/contactAdmin.xhtml</to-view-id>
+		</navigation-case>			
+	</navigation-rule>
+	
+		
+	<!-- navigation rules for /admin/activation/contactAdmin.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/activation/contactAdmin.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>confirm</from-outcome>
+			<to-view-id>/admin/activation/contactAdminConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>	
+	
+	<!--  user password management related usecases -->
+	<managed-bean>
+		<managed-bean-name>reset</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ResetPasswordController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>resetNukesPass</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ResetNukesPasswordController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>lostPassword</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.LostPasswordController</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+	<!-- navigation rules for /admin/password/tempPassword.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/tempPassword.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/tempPasswordConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+	<!-- navigation rules for /admin/password/resetNukesPass.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/resetNukesPass.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/resetNukesPassConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+	<!-- navigation rules for /admin/password/startLostPassword.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/startLostPassword.xhtml</from-view-id>				
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/secretQuestion.xhtml</to-view-id>			
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>resendActivation</from-outcome>
+			<to-view-id>/admin/activation/resendActivationConf.xhtml</to-view-id>			
+		</navigation-case>				
+		<navigation-case>
+			<from-outcome>close</from-outcome>
+			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<!-- navigation rules for /admin/password/secretQuestion.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/secretQuestion.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+</faces-config>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<!--
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
--->
-<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/web-app_2_4.xsd" 
-version="2.4">
-     
-    <!-- Seam -->  
-    <!-- 
-    <listener>
-        <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
-    </listener>
-    
-    <filter>
-        <filter-name>Seam Exception Filter</filter-name>
-        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>Seam Exception Filter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping>
-    -->
-    
-    <!-- MyFaces -->
-    <listener>
-      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-   </listener>
-   
-   <context-param>
-        <param-name>javax.faces.CONFIG_FILES</param-name>
-        <param-value>
-            /WEB-INF/user-config.xml
-        </param-value>
-        <description>
-            Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-        </description>
-   </context-param>
-   
-       
-   <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-        <description>
-            State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.2
-        </description>
-    </context-param> 
-    
-    <!-- Special Debug Output for Development -->
-   <context-param>
-    <param-name>facelets.DEVELOPMENT</param-name>
-    <param-value>true</param-value>
-   </context-param>
-   
-   <!-- facelets integration -->
-   <!-- Use Documents Saved as *.xhtml -->	
-   <context-param>
-    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-    <param-value>.xhtml</param-value>
-   </context-param> 
-   
-   <context-param>
-      <param-name>facelets.LIBRARIES</param-name>
-      <param-value>/WEB-INF/tomahawk.taglib.xml;/WEB-INF/jbossfacelets.taglib.xml;/WEB-INF/security.taglib.xml</param-value>
-   </context-param>   
-       
-   <!-- Faces Servlet -->   
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <!-- Activation Link Servlet -->   
-    <servlet>
-        <servlet-name>ActivationLinkProcessor</servlet-name>
-        <servlet-class>org.jboss.website.user.ui.ActivationLinkProcessor</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-   
-    <!-- Faces Servlet Mapping -->
-    <!-- extension mapping -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-    <!-- extension mapping -->
-    <servlet-mapping>
-        <servlet-name>ActivationLinkProcessor</servlet-name>
-        <url-pattern>/admin/activation/activate</url-pattern>
-    </servlet-mapping>
-
-	<!-- specify taglibs -->
-	                   
-   <!-- secure the jsps that make up the ui components of this jsf application -->
-    <security-constraint>
-   		<display-name>constraints for all jsps</display-name>
-   		<web-resource-collection>
-   			<web-resource-name>protected all jsps</web-resource-name>
-   			<url-pattern>*.jsp</url-pattern>   			
-   		</web-resource-collection>
-   		<auth-constraint>
-   			<description>No roles so no direct access</description>
-   		</auth-constraint>
-    </security-constraint>
-    <!-- secure the facelet views that make up the ui components of this jsf application -->
-    <security-constraint>
-   		<display-name>constraints for all facelets</display-name>
-   		<web-resource-collection>
-   			<web-resource-name>protected all facelets</web-resource-name>
-   			<url-pattern>*.xhtml</url-pattern>   			
-   		</web-resource-collection>
-   		<auth-constraint>
-   			<description>No roles so no direct access</description>
-   		</auth-constraint>
-    </security-constraint>
-    
-    <!-- integrating BASIC AUTH for the standalone JSF version -->
-    <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>Authenticated</web-resource-name>
-         <description></description>
-         <url-pattern>/admin/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-         <role-name>Authenticated</role-name>
-      </auth-constraint>
-   </security-constraint> 
-   
-   <!-- authentication type configuration -->     
-   <login-config>
-      <auth-method>BASIC</auth-method>
-      <realm-name>JBoss User Manager</realm-name>
-   </login-config>
-   <security-role>
-      <role-name>Authenticated</role-name>
-   </security-role>
-   
-</web-app>
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/WEB-INF/web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,147 @@
+<?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/web-app_2_4.xsd" 
+version="2.4">
+     
+    <!-- Seam -->  
+    <!-- 
+    <listener>
+        <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+    </listener>
+    
+    <filter>
+        <filter-name>Seam Exception Filter</filter-name>
+        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>Seam Exception Filter</filter-name>
+        <url-pattern>*.jsf</url-pattern>
+    </filter-mapping>
+    -->
+    
+    <!-- MyFaces -->
+    <listener>
+      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+   </listener>
+   
+   <context-param>
+        <param-name>javax.faces.CONFIG_FILES</param-name>
+        <param-value>
+            /WEB-INF/user-config.xml
+        </param-value>
+        <description>
+            Comma separated list of URIs of (additional) faces config files.
+            (e.g. /WEB-INF/my-config.xml)
+            See JSF 1.0 PRD2, 10.3.2
+        </description>
+   </context-param>
+   
+       
+   <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+        <description>
+            State saving method: "client" or "server" (= default)
+            See JSF Specification 2.5.2
+        </description>
+    </context-param> 
+    
+    <!-- Special Debug Output for Development -->
+   <context-param>
+    <param-name>facelets.DEVELOPMENT</param-name>
+    <param-value>true</param-value>
+   </context-param>
+   
+   <!-- facelets integration -->
+   <!-- Use Documents Saved as *.xhtml -->	
+   <context-param>
+    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+    <param-value>.xhtml</param-value>
+   </context-param> 
+   
+   <context-param>
+      <param-name>facelets.LIBRARIES</param-name>
+      <param-value>/WEB-INF/tomahawk.taglib.xml;/WEB-INF/jbossfacelets.taglib.xml;/WEB-INF/security.taglib.xml</param-value>
+   </context-param>   
+       
+   <!-- Faces Servlet -->   
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    
+    <!-- Activation Link Servlet -->   
+    <servlet>
+        <servlet-name>ActivationLinkProcessor</servlet-name>
+        <servlet-class>org.jboss.website.user.ui.ActivationLinkProcessor</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+   
+    <!-- Faces Servlet Mapping -->
+    <!-- extension mapping -->
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
+    <!-- extension mapping -->
+    <servlet-mapping>
+        <servlet-name>ActivationLinkProcessor</servlet-name>
+        <url-pattern>/admin/activation/activate</url-pattern>
+    </servlet-mapping>
+
+	<!-- specify taglibs -->
+	                   
+   <!-- secure the jsps that make up the ui components of this jsf application -->
+    <security-constraint>
+   		<display-name>constraints for all jsps</display-name>
+   		<web-resource-collection>
+   			<web-resource-name>protected all jsps</web-resource-name>
+   			<url-pattern>*.jsp</url-pattern>   			
+   		</web-resource-collection>
+   		<auth-constraint>
+   			<description>No roles so no direct access</description>
+   		</auth-constraint>
+    </security-constraint>
+    <!-- secure the facelet views that make up the ui components of this jsf application -->
+    <security-constraint>
+   		<display-name>constraints for all facelets</display-name>
+   		<web-resource-collection>
+   			<web-resource-name>protected all facelets</web-resource-name>
+   			<url-pattern>*.xhtml</url-pattern>   			
+   		</web-resource-collection>
+   		<auth-constraint>
+   			<description>No roles so no direct access</description>
+   		</auth-constraint>
+    </security-constraint>
+    
+    <!-- integrating BASIC AUTH for the standalone JSF version -->
+    <security-constraint>
+      <web-resource-collection>
+         <web-resource-name>Authenticated</web-resource-name>
+         <description></description>
+         <url-pattern>/admin/*</url-pattern>
+      </web-resource-collection>
+      <auth-constraint>
+         <role-name>Authenticated</role-name>
+      </auth-constraint>
+   </security-constraint> 
+   
+   <!-- authentication type configuration -->     
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBoss User Manager</realm-name>
+   </login-config>
+   <security-role>
+      <role-name>Authenticated</role-name>
+   </security-role>
+   
+</web-app>
+

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/conf)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
-security domain used by the security-spec test case
--->
-<policy>
-    <application-policy name="user">       
-       <authentication>
-         <login-module code="org.jboss.security.idm.UsernameAndPasswordLoginModule" flag="sufficient">
-	             <module-option name="unauthenticatedIdentity">guest</module-option>                        
-	             <module-option name="password-stacking">useFirstPass</module-option>           
-	             <module-option name="hashAlgorithm">MD5</module-option>
-	             <module-option name="hashEncoding">HEX</module-option>             
-	             <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
-         </login-module>         
-      </authentication>
-    </application-policy>
-</policy>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/conf/login-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
+security domain used by the security-spec test case
+-->
+<policy>
+    <application-policy name="user">       
+       <authentication>
+         <login-module code="org.jboss.security.idm.UsernameAndPasswordLoginModule" flag="sufficient">
+	             <module-option name="unauthenticatedIdentity">guest</module-option>                        
+	             <module-option name="password-stacking">useFirstPass</module-option>           
+	             <module-option name="hashAlgorithm">MD5</module-option>
+	             <module-option name="hashEncoding">HEX</module-option>             
+	             <module-option name="authenticatedRoles">Authenticated,RegisteredUsers</module-option>
+         </login-module>         
+      </authentication>
+    </application-policy>
+</policy>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-    <!-- JAAS module setup -->		
-	<mbean
-      code="org.jboss.security.auth.login.DynamicLoginConfig"
-      name="usermanagement:service=JAASLoginModule">
-      <depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
-      <depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-      <attribute name="AuthConfig">conf/login-config.xml</attribute>
-   </mbean>
-   
-   <!-- authorization security service -->
-	<mbean code="org.jboss.security.acl.AclKernelFactory" 
-	name="org.jboss.security.acl.AclKernelFactory:service=aclKernelFactory"
-	xmbean-dd=""
-	>
-	    <attribute name="aclKernel">org.jboss.security.acl.JBossAclKernel</attribute>
-		<xmbean>
-			<class>org.jboss.security.acl.AclKernelFactory</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.security.acl.AclKernelFactory</name>
-   			</constructor>
-			<attribute access="read-write" getMethod="getAclKernel" setMethod="setAclKernel">
-				     <name>aclKernel</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="org.jboss.security.acl.JBossAclKernel"/>
-					 </descriptors>
-		    </attribute>	  
-		    <operation>
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation>
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		</xmbean>
-	</mbean>
-
-    <!-- configute the site Startup service -->	
-	<mbean name="jbwebsite:service=Startup"	
-	code="org.jboss.website.utils.Startup"
-	xmbean-dd=""
-	> 
-	    <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>   
-		<xmbean>
-			<class>org.jboss.website.utils.Startup</class>
-			<constructor>
-      				<description>The no-arg constructor</description>
-      				<name>org.jboss.website.utils.Startup</name>
-   			</constructor>			
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>		    
-		</xmbean>
-	</mbean>
-
-
-	<!-- Resource Factory service -->
-	<mbean name="jbwebsite:service=Resources"	
-	code="org.jboss.website.utils.JarResources"
-	xmbean-dd=""
-	>
-	    <attribute name="resources">org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages</attribute>	    
-		<xmbean>
-			<class>org.jboss.website.utils.JarResources</class>
-			<attribute access="read-write" getMethod="getResources" setMethod="setResources">
-				     <name>resources</name>
-					 <type>java.lang.String</type>
-					 <descriptors>
-					 	<default value="org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages"/>
-					 </descriptors>
-		    </attribute>
-		    <operation impact="ACTION_INFO">
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get Label from a bundle</description>
-		    	<name>getString</name>
-		    	<parameter>
-			      <description>Bundle Name</description>
-			      <name>bundleName</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>Key</description>
-			      <name>key</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>
-		    <operation impact="ACTION_INFO">
-		    	<description>Get Label from a bundle</description>
-		    	<name>getString</name>
-		    	<parameter>
-			      <description>Bundle Name</description>
-			      <name>bundleName</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>Key</description>
-			      <name>key</name>
-			      <type>java.lang.String</type>
-			    </parameter>
-			    <parameter>
-			      <description>input</description>
-			      <name>input</name>
-			      <type>[Ljava.lang.Object;</type>
-			    </parameter>
-    			<return-type>java.lang.String</return-type>		    	
-		    </operation>		    
-		</xmbean>
-	</mbean>	
-</server>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/jboss-service.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+    <!-- JAAS module setup -->		
+	<mbean
+      code="org.jboss.security.auth.login.DynamicLoginConfig"
+      name="usermanagement:service=JAASLoginModule">
+      <depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
+      <depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+      <attribute name="AuthConfig">conf/login-config.xml</attribute>
+   </mbean>
+   
+   <!-- authorization security service -->
+	<mbean code="org.jboss.security.acl.AclKernelFactory" 
+	name="org.jboss.security.acl.AclKernelFactory:service=aclKernelFactory"
+	xmbean-dd=""
+	>
+	    <attribute name="aclKernel">org.jboss.security.acl.JBossAclKernel</attribute>
+		<xmbean>
+			<class>org.jboss.security.acl.AclKernelFactory</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.security.acl.AclKernelFactory</name>
+   			</constructor>
+			<attribute access="read-write" getMethod="getAclKernel" setMethod="setAclKernel">
+				     <name>aclKernel</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="org.jboss.security.acl.JBossAclKernel"/>
+					 </descriptors>
+		    </attribute>	  
+		    <operation>
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation>
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		</xmbean>
+	</mbean>
+
+    <!-- configute the site Startup service -->	
+	<mbean name="jbwebsite:service=Startup"	
+	code="org.jboss.website.utils.Startup"
+	xmbean-dd=""
+	> 
+	    <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>   
+		<xmbean>
+			<class>org.jboss.website.utils.Startup</class>
+			<constructor>
+      				<description>The no-arg constructor</description>
+      				<name>org.jboss.website.utils.Startup</name>
+   			</constructor>			
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>		    
+		</xmbean>
+	</mbean>
+
+
+	<!-- Resource Factory service -->
+	<mbean name="jbwebsite:service=Resources"	
+	code="org.jboss.website.utils.JarResources"
+	xmbean-dd=""
+	>
+	    <attribute name="resources">org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages</attribute>	    
+		<xmbean>
+			<class>org.jboss.website.utils.JarResources</class>
+			<attribute access="read-write" getMethod="getResources" setMethod="setResources">
+				     <name>resources</name>
+					 <type>java.lang.String</type>
+					 <descriptors>
+					 	<default value="org.jboss.website.messages,org.jboss.website.jsf.validator.messages,org.jboss.website.user.ui.messages"/>
+					 </descriptors>
+		    </attribute>
+		    <operation impact="ACTION_INFO">
+		    	<description>The start lifecycle operation</description>
+		    	<name>start</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>The stop lifecycle operation</description>
+		    	<name>stop</name>
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get Label from a bundle</description>
+		    	<name>getString</name>
+		    	<parameter>
+			      <description>Bundle Name</description>
+			      <name>bundleName</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>Key</description>
+			      <name>key</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>
+		    <operation impact="ACTION_INFO">
+		    	<description>Get Label from a bundle</description>
+		    	<name>getString</name>
+		    	<parameter>
+			      <description>Bundle Name</description>
+			      <name>bundleName</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>Key</description>
+			      <name>key</name>
+			      <type>java.lang.String</type>
+			    </parameter>
+			    <parameter>
+			      <description>input</description>
+			      <name>input</name>
+			      <type>[Ljava.lang.Object;</type>
+			    </parameter>
+    			<return-type>java.lang.String</return-type>		    	
+		    </operation>		    
+		</xmbean>
+	</mbean>	
+</server>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,404 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--  make sure all class values are fully qualified names of concrete classes. Interfaces are not supported at this point -->
-<!--  think of the extra-info tag in the permission tag as parameters to the custom Enforcer, Default Enforcer ignores these, extra-info tags are not required -->
-<!--  some rules regarding the relationships between the various concepts. These are subject to change as this framework evolves -->
-
-<!--
-	the functionId - id attribute within the function tag should be unique across the system
-	
-	A resource can be associated with multiple functions within the same module, but a resource cannot be associated with multiple modules
-	
-	Module defines the overall component that needs protection within the system, Function defines various protected functions within a Module, and
-	Resources are system level objects (java methods, user interface fragments etc) that need to be accessed to successfully perform a function 
-	within a module 
-	
-	Each role contains a set of permissions. Each permission/no-permission points to a function in the system that this role has/doesnot have access to.
-	
-	An Enforcer is the object that actually performs the access control logic. The framework comes bundled with a DefaultEnforcer which should take care of 90% 
-    of ACL cases for an application. Applications can plug-in their own Enforcer that can perform this logic based on the runtime values, extra-parameter
-    values etc. Having the Enforcer perform the access control logic keeps any ACL checking code to be hard coded within the business logic of the
-    application. This leads to better flexibility from a security perspective of the system 
-    
-    List of system resources supported:
-    1) Java Class Methods - type=method
-    2) UI Fragments within a Page - type=fragment
- -->
-
-<acl>	
-	<!--  protected functions of user module -->
-	<module id="user" name="User Module">
-		<!-- user management -->			 
-		<function id="userManagement" name="UserManagement">
-			<resource type="fragment">				
-				<id>acl://userManagement</id>
-			</resource>
-		</function>
-		<!--  search users -->		
-		<function id="searchUsers" name="Search Registered Users">
-			<resource type="fragment">				
-				<id>acl://searchUsers</id>
-			</resource>
-			<resource type="method">				
-				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
-				<method>searchUsers</method>
-				<params>java.lang.String,int</params>				
-			</resource>
-		</function>	    		
-		<!--  user registration -->
-	    <function id="createUser" name="Register User">			
-	    	<resource type="fragment">				
-				<id>acl://createUser</id>
-			</resource>
-			<resource type="method">				
-				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
-				<method>register</method>
-				<params>org.jboss.website.user.bo.UserBean</params>				
-			</resource>
-		</function>					
-		<!-- edit another user's profile -->			 
-		<function id="editUserProfile" name="Ability to edit another user's profile">
-			<resource type="fragment">				
-				<id>acl://editUserProfile</id>
-			</resource>
-			<resource type="method">				
-				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
-				<method>saveProfile</method>
-				<params>org.jboss.website.user.bo.UserBean</params>				
-			</resource>
-		</function>
-		<!-- activate/inactivate a user account -->			 
-		<function id="changeActiveStatus" name="Ability to activate/inactivate a user account">
-			<resource type="fragment">				
-				<id>acl://changeActiveStatus</id>
-			</resource>
-			<resource type="method">				
-				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
-				<method>changeActiveStatus</method>
-				<params>org.jboss.website.user.bo.UserBean</params>				
-			</resource>
-		</function>
-		<!-- send password reset email -->			 
-		<function id="sendResetPasswordEmail" name="Ability to send the password reset email to the end user">
-			<resource type="fragment">				
-				<id>acl://sendResetPasswordEmail</id>
-			</resource>
-			<resource type="method">				
-				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
-				<method>sendResetPasswordEmail</method>
-				<params>org.jboss.website.user.bo.UserBean</params>				
-			</resource>
-		</function>		
-	</module>
-
-        <!-- Forums Admin Tool usecases  -->
-	<module id="adminTool" name="AdminTool">						
-		<function id="accessAdminTool" name="Access Admin Tool">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://accessAdminTool</id>
-			</resource>
-		</function>
-	
-		<function id="viewCategory" name="View Category">
-			<!-- ui protection -->
-			<resource type="fragment" criteriaId="viewCategory://ui">
-				<id>acl://viewCategory</id>
-			</resource>
-		</function>
-		
-		<function id="addCategory" name="Add Category">
-			<!-- ui protection -->
-			<resource type="fragment">				
-				<id>acl://addCategory</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>addCategory</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-		</function>
-		
-		<function id="editCategory" name="Edit Category">			
-			<!-- ui protection -->
-			<resource type="fragment">				
-				<id>acl://editCategory</id>
-			</resource>	
-			<!-- action protection -->
-			<resource type="jsfAction" criteriaId="editCategory://action">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>editCategory</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-			<implies>addCategory</implies>			
-		</function>
-			
-		<function id="deleteCategory" name="Delete Category">
-			<!-- ui protection -->
-			<resource type="fragment">				
-				<id>acl://deleteCategory</id>
-			</resource>
-			<!-- action protection -->			
-			<resource type="jsfAction" criteriaId="deleteCategory://action">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>deleteCategory</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-			<implies>addCategory</implies>
-			<implies>editCategory</implies>
-		</function>
-		
-		<function id="viewForum" name="View Forum">
-			<!-- ui protection -->
-			<resource type="fragment" criteriaId="viewForum://ui">
-				<id>acl://viewForum</id>
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-		</function>
-		 
-		<function id="addForum" name="Add Forum">
-			<!-- ui protection -->
-			<resource type="fragment">				
-				<id>acl://addForum</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>addForum</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-			<implies>viewForum</implies>
-		</function>
-		
-		<function id="editForum" name="Edit Forum">
-			<!-- ui protection -->
-			<resource type="fragment">				
-				<id>acl://editForum</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction" criteriaId="editForum://action">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>editForum</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-			<implies>viewForum</implies>
-			<implies>addForum</implies>
-		</function>
-		 		  
-		<function id="deleteForum" name="Delete Forum">
-			<!-- ui protection -->
-			<resource type="fragment">				
-				<id>acl://deleteForum</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction" criteriaId="deleteForum://action">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>deleteForum</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-			<implies>viewForum</implies>
-			<implies>addForum</implies>
-			<implies>editForum</implies>
-		</function>  
-		<function id="lockForum" name="Ability to Lock forums">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://lockForums</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>lockForum</method>				
-			</resource>
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
-				<method>unlockForum</method>				
-			</resource>
-			<implies>accessAdminTool</implies>
-			<implies>viewCategory</implies>
-			<implies>viewForum</implies>
-			<implies>editForum</implies>
-		</function>	
-
-	</module>
-	
-	<!-- Message Board usecases -->
-	<module id="messageBoard" name="Message Board">
-		<!-- messageBoard navigation related -->
-		<function id="readCategory" name="Read Category">
-			<!-- ui protection -->
-			<resource type="fragment" criteriaId="readCategory://ui">
-				<id>acl://readCategory</id>
-			</resource>
-		</function>		
-		<function id="readForum" name="Read Forum">
-			<!-- ui protection -->
-			<resource type="fragment" criteriaId="readForum://ui">
-				<id>acl://readForum</id>
-			</resource>
-			<implies>readCategory</implies>
-		</function>
-	
-		<!-- posting related -->
-		<function id="post" name="Post a Message">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://newTopic</id>
-			</resource>
-			<resource type="fragment">
-				<id>acl://reply</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.NewTopic</class>
-				<method>execute</method>				
-			</resource>
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.ReplyTopic</class>
-				<method>execute</method>				
-			</resource>			
-		</function>						
-		<function id="editPost" name="Edit a Post">
-			<!-- ui protection -->
-			<resource type="fragment" criteriaId="editPost://ui">
-				<id>acl://editPost</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction" criteriaId="editPost://action">				
-				<class>org.jboss.portlet.forums.ui.action.EditPost</class>
-				<method>execute</method>				
-			</resource>			
-			<implies>post</implies>
-		</function>		
-		<function id="deletePost" name="Delete a Post">			
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://deletePost</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.DeletePost</class>
-				<method>confirmDelete</method>				
-			</resource>			
-			<implies>post</implies>
-			<implies>editPost</implies>
-		</function>
-		
-		<!-- post attachment related -->
-		<function id="managePostAttachments" name="Manage Post Attachments">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://managePostAttachments</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.PostAction</class>
-				<method>addAttachment</method>				
-			</resource>
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.PostAction</class>
-				<method>deleteAttachment</method>				
-			</resource>
-		</function>						
-		
-		<!-- post poll related -->
-		<function id="votePoll" name="Vote for a Poll">			
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://votePoll</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.PollController</class>
-				<method>vote</method>				
-			</resource>
-		</function>								
-		<function id="managePoll" name="Manage a Poll">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://managePoll</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.PostAction</class>
-				<method>deleteOption</method>				
-			</resource>
-			<implies>votePoll</implies>
-		</function>				
-	</module>		
-	
-	<!-- Moderator Tool usecases -->	
-	<module id="moderatorTool" name="Moderator Tool">
-		<function id="moderateForum" name="Ability to Access the Moderator Tool">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://moderateForum</id>
-			</resource>
-		</function>
-		<function id="deleteTopics" name="Ability to Delete Topics in the Forum">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://deleteTopics</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
-				<method>deleteTopic</method>				
-			</resource>
-			<implies>moderateForum</implies>
-		</function>
-		<function id="moveTopics" name="Ability to Move Topics in the Forum">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://moveTopics</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
-				<method>moveTopic</method>				
-			</resource>
-			<implies>moderateForum</implies>
-		</function>
-		<function id="lockTopics" name="Ability to Lock Topics in the Forum">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://lockTopics</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
-				<method>lockTopic</method>				
-			</resource>
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
-				<method>unlockTopic</method>				
-			</resource>
-			<implies>moderateForum</implies>
-		</function>		
-		<!-- splitting a topic -->
-		<function id="splitTopic" name="Ability to Split a Topic in the Forum">
-			<!-- ui protection -->
-			<resource type="fragment">
-				<id>acl://splitTopic</id>
-			</resource>
-			<!-- action protection -->
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.SplitTopic</class>
-				<method>splitPosts</method>				
-			</resource>
-			<resource type="jsfAction">				
-				<class>org.jboss.portlet.forums.ui.action.SplitTopic</class>
-				<method>splitAfter</method>				
-			</resource>
-			<implies>moderateForum</implies>
-		</function>
-	</module>	
-</acl>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-mapping.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,404 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--  make sure all class values are fully qualified names of concrete classes. Interfaces are not supported at this point -->
+<!--  think of the extra-info tag in the permission tag as parameters to the custom Enforcer, Default Enforcer ignores these, extra-info tags are not required -->
+<!--  some rules regarding the relationships between the various concepts. These are subject to change as this framework evolves -->
+
+<!--
+	the functionId - id attribute within the function tag should be unique across the system
+	
+	A resource can be associated with multiple functions within the same module, but a resource cannot be associated with multiple modules
+	
+	Module defines the overall component that needs protection within the system, Function defines various protected functions within a Module, and
+	Resources are system level objects (java methods, user interface fragments etc) that need to be accessed to successfully perform a function 
+	within a module 
+	
+	Each role contains a set of permissions. Each permission/no-permission points to a function in the system that this role has/doesnot have access to.
+	
+	An Enforcer is the object that actually performs the access control logic. The framework comes bundled with a DefaultEnforcer which should take care of 90% 
+    of ACL cases for an application. Applications can plug-in their own Enforcer that can perform this logic based on the runtime values, extra-parameter
+    values etc. Having the Enforcer perform the access control logic keeps any ACL checking code to be hard coded within the business logic of the
+    application. This leads to better flexibility from a security perspective of the system 
+    
+    List of system resources supported:
+    1) Java Class Methods - type=method
+    2) UI Fragments within a Page - type=fragment
+ -->
+
+<acl>	
+	<!--  protected functions of user module -->
+	<module id="user" name="User Module">
+		<!-- user management -->			 
+		<function id="userManagement" name="UserManagement">
+			<resource type="fragment">				
+				<id>acl://userManagement</id>
+			</resource>
+		</function>
+		<!--  search users -->		
+		<function id="searchUsers" name="Search Registered Users">
+			<resource type="fragment">				
+				<id>acl://searchUsers</id>
+			</resource>
+			<resource type="method">				
+				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
+				<method>searchUsers</method>
+				<params>java.lang.String,int</params>				
+			</resource>
+		</function>	    		
+		<!--  user registration -->
+	    <function id="createUser" name="Register User">			
+	    	<resource type="fragment">				
+				<id>acl://createUser</id>
+			</resource>
+			<resource type="method">				
+				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
+				<method>register</method>
+				<params>org.jboss.website.user.bo.UserBean</params>				
+			</resource>
+		</function>					
+		<!-- edit another user's profile -->			 
+		<function id="editUserProfile" name="Ability to edit another user's profile">
+			<resource type="fragment">				
+				<id>acl://editUserProfile</id>
+			</resource>
+			<resource type="method">				
+				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
+				<method>saveProfile</method>
+				<params>org.jboss.website.user.bo.UserBean</params>				
+			</resource>
+		</function>
+		<!-- activate/inactivate a user account -->			 
+		<function id="changeActiveStatus" name="Ability to activate/inactivate a user account">
+			<resource type="fragment">				
+				<id>acl://changeActiveStatus</id>
+			</resource>
+			<resource type="method">				
+				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
+				<method>changeActiveStatus</method>
+				<params>org.jboss.website.user.bo.UserBean</params>				
+			</resource>
+		</function>
+		<!-- send password reset email -->			 
+		<function id="sendResetPasswordEmail" name="Ability to send the password reset email to the end user">
+			<resource type="fragment">				
+				<id>acl://sendResetPasswordEmail</id>
+			</resource>
+			<resource type="method">				
+				<class>org.jboss.website.user.ejb.UserManagerImpl</class>
+				<method>sendResetPasswordEmail</method>
+				<params>org.jboss.website.user.bo.UserBean</params>				
+			</resource>
+		</function>		
+	</module>
+
+        <!-- Forums Admin Tool usecases  -->
+	<module id="adminTool" name="AdminTool">						
+		<function id="accessAdminTool" name="Access Admin Tool">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://accessAdminTool</id>
+			</resource>
+		</function>
+	
+		<function id="viewCategory" name="View Category">
+			<!-- ui protection -->
+			<resource type="fragment" criteriaId="viewCategory://ui">
+				<id>acl://viewCategory</id>
+			</resource>
+		</function>
+		
+		<function id="addCategory" name="Add Category">
+			<!-- ui protection -->
+			<resource type="fragment">				
+				<id>acl://addCategory</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>addCategory</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+		</function>
+		
+		<function id="editCategory" name="Edit Category">			
+			<!-- ui protection -->
+			<resource type="fragment">				
+				<id>acl://editCategory</id>
+			</resource>	
+			<!-- action protection -->
+			<resource type="jsfAction" criteriaId="editCategory://action">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>editCategory</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+			<implies>addCategory</implies>			
+		</function>
+			
+		<function id="deleteCategory" name="Delete Category">
+			<!-- ui protection -->
+			<resource type="fragment">				
+				<id>acl://deleteCategory</id>
+			</resource>
+			<!-- action protection -->			
+			<resource type="jsfAction" criteriaId="deleteCategory://action">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>deleteCategory</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+			<implies>addCategory</implies>
+			<implies>editCategory</implies>
+		</function>
+		
+		<function id="viewForum" name="View Forum">
+			<!-- ui protection -->
+			<resource type="fragment" criteriaId="viewForum://ui">
+				<id>acl://viewForum</id>
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+		</function>
+		 
+		<function id="addForum" name="Add Forum">
+			<!-- ui protection -->
+			<resource type="fragment">				
+				<id>acl://addForum</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>addForum</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+			<implies>viewForum</implies>
+		</function>
+		
+		<function id="editForum" name="Edit Forum">
+			<!-- ui protection -->
+			<resource type="fragment">				
+				<id>acl://editForum</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction" criteriaId="editForum://action">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>editForum</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+			<implies>viewForum</implies>
+			<implies>addForum</implies>
+		</function>
+		 		  
+		<function id="deleteForum" name="Delete Forum">
+			<!-- ui protection -->
+			<resource type="fragment">				
+				<id>acl://deleteForum</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction" criteriaId="deleteForum://action">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>deleteForum</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+			<implies>viewForum</implies>
+			<implies>addForum</implies>
+			<implies>editForum</implies>
+		</function>  
+		<function id="lockForum" name="Ability to Lock forums">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://lockForums</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>lockForum</method>				
+			</resource>
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.AdminController</class>
+				<method>unlockForum</method>				
+			</resource>
+			<implies>accessAdminTool</implies>
+			<implies>viewCategory</implies>
+			<implies>viewForum</implies>
+			<implies>editForum</implies>
+		</function>	
+
+	</module>
+	
+	<!-- Message Board usecases -->
+	<module id="messageBoard" name="Message Board">
+		<!-- messageBoard navigation related -->
+		<function id="readCategory" name="Read Category">
+			<!-- ui protection -->
+			<resource type="fragment" criteriaId="readCategory://ui">
+				<id>acl://readCategory</id>
+			</resource>
+		</function>		
+		<function id="readForum" name="Read Forum">
+			<!-- ui protection -->
+			<resource type="fragment" criteriaId="readForum://ui">
+				<id>acl://readForum</id>
+			</resource>
+			<implies>readCategory</implies>
+		</function>
+	
+		<!-- posting related -->
+		<function id="post" name="Post a Message">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://newTopic</id>
+			</resource>
+			<resource type="fragment">
+				<id>acl://reply</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.NewTopic</class>
+				<method>execute</method>				
+			</resource>
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.ReplyTopic</class>
+				<method>execute</method>				
+			</resource>			
+		</function>						
+		<function id="editPost" name="Edit a Post">
+			<!-- ui protection -->
+			<resource type="fragment" criteriaId="editPost://ui">
+				<id>acl://editPost</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction" criteriaId="editPost://action">				
+				<class>org.jboss.portlet.forums.ui.action.EditPost</class>
+				<method>execute</method>				
+			</resource>			
+			<implies>post</implies>
+		</function>		
+		<function id="deletePost" name="Delete a Post">			
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://deletePost</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.DeletePost</class>
+				<method>confirmDelete</method>				
+			</resource>			
+			<implies>post</implies>
+			<implies>editPost</implies>
+		</function>
+		
+		<!-- post attachment related -->
+		<function id="managePostAttachments" name="Manage Post Attachments">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://managePostAttachments</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.PostAction</class>
+				<method>addAttachment</method>				
+			</resource>
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.PostAction</class>
+				<method>deleteAttachment</method>				
+			</resource>
+		</function>						
+		
+		<!-- post poll related -->
+		<function id="votePoll" name="Vote for a Poll">			
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://votePoll</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.PollController</class>
+				<method>vote</method>				
+			</resource>
+		</function>								
+		<function id="managePoll" name="Manage a Poll">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://managePoll</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.PostAction</class>
+				<method>deleteOption</method>				
+			</resource>
+			<implies>votePoll</implies>
+		</function>				
+	</module>		
+	
+	<!-- Moderator Tool usecases -->	
+	<module id="moderatorTool" name="Moderator Tool">
+		<function id="moderateForum" name="Ability to Access the Moderator Tool">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://moderateForum</id>
+			</resource>
+		</function>
+		<function id="deleteTopics" name="Ability to Delete Topics in the Forum">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://deleteTopics</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
+				<method>deleteTopic</method>				
+			</resource>
+			<implies>moderateForum</implies>
+		</function>
+		<function id="moveTopics" name="Ability to Move Topics in the Forum">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://moveTopics</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
+				<method>moveTopic</method>				
+			</resource>
+			<implies>moderateForum</implies>
+		</function>
+		<function id="lockTopics" name="Ability to Lock Topics in the Forum">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://lockTopics</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
+				<method>lockTopic</method>				
+			</resource>
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.ModeratorAction</class>
+				<method>unlockTopic</method>				
+			</resource>
+			<implies>moderateForum</implies>
+		</function>		
+		<!-- splitting a topic -->
+		<function id="splitTopic" name="Ability to Split a Topic in the Forum">
+			<!-- ui protection -->
+			<resource type="fragment">
+				<id>acl://splitTopic</id>
+			</resource>
+			<!-- action protection -->
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.SplitTopic</class>
+				<method>splitPosts</method>				
+			</resource>
+			<resource type="jsfAction">				
+				<class>org.jboss.portlet.forums.ui.action.SplitTopic</class>
+				<method>splitAfter</method>				
+			</resource>
+			<implies>moderateForum</implies>
+		</function>
+	</module>	
+</acl>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<acl>
-	<!--  
-		built-in roles 
-	-->		
-	<!--  Anonymous represents any non-authenticated user -->
-	<role name="Anonymous" id="anonymous">		    								
-		<permission action="createUser"/>
-
-		<!-- Forums Admin Tool permissions -->
-		
-		
-		<!-- Message Board permissions -->
-		<!-- giving anonymous users permission to view only the Unit Testing Category of Forums -->
-		<!--permission action="readCategory">
-			<criteria for="readCategory://ui">param[0].title.toLowerCase().startsWith('unit testing')</criteria>
-		</permission-->	
-		<permission action="readForum"/>
-		
-		
-		<!-- Moderator Tool permissions -->					
-	</role>
-		
-	<!--  this role represents a regular registered user on the site -->	
-	<role name="User" id="user">	     
-	    <permission action="userManagement"/> 
-
-            <!-- Forums Admin Tool permissions -->		
-		
-		<!-- Message Board permissions -->		
-		<permission action="readForum"/>
-		<permission action="post"/>
-		<!-- permission to edit only my own posts -->
-		<permission action="editPost">
-			<criteria for="editPost://ui">param[0].poster.user.userName.equals(identity.identity.userName)</criteria>
-			<criteria for="editPost://action">target.post.poster.user.userName.equals(identity.identity.userName)</criteria>
-		</permission>
-		
-		
-		<!-- Moderator Tool permissions -->              	                                 
-	</role>
-				
-	<!--  Admin represents users that have Administrative privileges on the site -->		
-	<role name="Admin" id="admin">	    	    	    			    		
-	    <no-permission action="createUser"/>
-	    	    	    	    
-	    <!--  generic for all other modules -->	
-	    <permission action="all"/>
-	</role>	
-	
-	<!--  this is done for programmatic access by system level components...this access is not in the context of any particular user -->
-	<role name="system" id="system">
-		<permission action="all"/>
-	</role>		
-	<!--  
-		custom roles 
-	-->														
-</acl>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<acl>
+	<!--  
+		built-in roles 
+	-->		
+	<!--  Anonymous represents any non-authenticated user -->
+	<role name="Anonymous" id="anonymous">		    								
+		<permission action="createUser"/>
+
+		<!-- Forums Admin Tool permissions -->
+		
+		
+		<!-- Message Board permissions -->
+		<!-- giving anonymous users permission to view only the Unit Testing Category of Forums -->
+		<!--permission action="readCategory">
+			<criteria for="readCategory://ui">param[0].title.toLowerCase().startsWith('unit testing')</criteria>
+		</permission-->	
+		<permission action="readForum"/>
+		
+		
+		<!-- Moderator Tool permissions -->					
+	</role>
+		
+	<!--  this role represents a regular registered user on the site -->	
+	<role name="User" id="user">	     
+	    <permission action="userManagement"/> 
+
+            <!-- Forums Admin Tool permissions -->		
+		
+		<!-- Message Board permissions -->		
+		<permission action="readForum"/>
+		<permission action="post"/>
+		<!-- permission to edit only my own posts -->
+		<permission action="editPost">
+			<criteria for="editPost://ui">param[0].poster.user.userName.equals(identity.identity.userName)</criteria>
+			<criteria for="editPost://action">target.post.poster.user.userName.equals(identity.identity.userName)</criteria>
+		</permission>
+		
+		
+		<!-- Moderator Tool permissions -->              	                                 
+	</role>
+				
+	<!--  Admin represents users that have Administrative privileges on the site -->		
+	<role name="Admin" id="admin">	    	    	    			    		
+	    <no-permission action="createUser"/>
+	    	    	    	    
+	    <!--  generic for all other modules -->	
+	    <permission action="all"/>
+	</role>	
+	
+	<!--  this is done for programmatic access by system level components...this access is not in the context of any particular user -->
+	<role name="system" id="system">
+		<permission action="all"/>
+	</role>		
+	<!--  
+		custom roles 
+	-->														
+</acl>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,74 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<body>
-
-<div class="brand_DOTCOM" id="container">
-		<!-- TopMenu -->
-		<div id="login_topMenu">
-		<span class="handle"><!-- LOGO -->
-		<div id="TopLogo">
-		  <img src="/jbosswebsite/siteTheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" />
-		</div>
-		</span></div>
-
-
-<div id="portal-container">
-   <div id="sizer">
-      <div id="expander">               
-         <table border="0" cellpadding="0" cellspacing="0" id="header-container">
-            <tr>
-               <td align="center" valign="top" id="header"><div id="spacer">&nbsp;</div></td>
-            </tr>            
-         </table>
-                           
-         <div id="content-container">
-            <div id="login-container">
-			 <%if(request.getAttribute("succeeded")!=null){%>
-             <fieldset>
-             <legend>Account Activation</legend>
-              <form>
-               		Your account has been successfully activated<br/>               		
-               		<input type="button" id="okButtom" name="ok" value="OK" onclick="javascript:window.location.href='/index';"/>
-              </form>
-             </fieldset>
-			 <%}else{%>
-			 	<%if(request.getAttribute("error")!=null){%>
-			 	<fieldset>
-             		<legend>Account Activation</legend>
-              		<form>
-               			There was a problem with your <b>Account Activation</b>. <br/><br/> 
-						The following error occurred : <b><%=request.getAttribute("error")%></b><br/>               		
-               			<input type="button" id="retry" name="retry" value="Retry" onclick="javascript:window.location.href='<%=request.getAttribute("activationLink")%>';"/>
-             		</form>
-             	</fieldset>
-			 	<%}else{%>			 	
-			 	<fieldset>
-             		<legend>Account Activation</legend>
-              		<form>
-               			There was a problem with your <b>Account Activation</b>. <br/><br/> 
-						Please make sure you are using the proper link <b>emailed</b> to you as part
-                    	of your <b>Registration</b> process<br/>               		
-               			<input type="button" id="homeButtom" name="home" value="Home" onclick="javascript:window.location.href='/index';"/>
-             		</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>
-
-
-</div>
-</body>
-
-</html>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/activate.jsp	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+
+<body>
+
+<div class="brand_DOTCOM" id="container">
+		<!-- TopMenu -->
+		<div id="login_topMenu">
+		<span class="handle"><!-- LOGO -->
+		<div id="TopLogo">
+		  <img src="/jbosswebsite/siteTheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" />
+		</div>
+		</span></div>
+
+
+<div id="portal-container">
+   <div id="sizer">
+      <div id="expander">               
+         <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+            <tr>
+               <td align="center" valign="top" id="header"><div id="spacer">&nbsp;</div></td>
+            </tr>            
+         </table>
+                           
+         <div id="content-container">
+            <div id="login-container">
+			 <%if(request.getAttribute("succeeded")!=null){%>
+             <fieldset>
+             <legend>Account Activation</legend>
+              <form>
+               		Your account has been successfully activated<br/>               		
+               		<input type="button" id="okButtom" name="ok" value="OK" onclick="javascript:window.location.href='/index';"/>
+              </form>
+             </fieldset>
+			 <%}else{%>
+			 	<%if(request.getAttribute("error")!=null){%>
+			 	<fieldset>
+             		<legend>Account Activation</legend>
+              		<form>
+               			There was a problem with your <b>Account Activation</b>. <br/><br/> 
+						The following error occurred : <b><%=request.getAttribute("error")%></b><br/>               		
+               			<input type="button" id="retry" name="retry" value="Retry" onclick="javascript:window.location.href='<%=request.getAttribute("activationLink")%>';"/>
+             		</form>
+             	</fieldset>
+			 	<%}else{%>			 	
+			 	<fieldset>
+             		<legend>Account Activation</legend>
+              		<form>
+               			There was a problem with your <b>Account Activation</b>. <br/><br/> 
+						Please make sure you are using the proper link <b>emailed</b> to you as part
+                    	of your <b>Registration</b> process<br/>               		
+               			<input type="button" id="homeButtom" name="home" value="Home" onclick="javascript:window.location.href='/index';"/>
+             		</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>
+
+
+</div>
+</body>
+
+</html>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<jboss-web>   
-   <context-root>user</context-root> 
-   <security-domain>java:jaas/user</security-domain>  
-</jboss-web>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jboss-web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<jboss-web>   
+   <context-root>user</context-root> 
+   <security-domain>java:jaas/user</security-domain>  
+</jboss-web>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-	<namespace>http://www.jboss.com/jbossfacelets</namespace>
-	<!-- 
-		 function generates an outputLink that works seamlessly within portal and standalone environment 
-	     to be used for generating "GET" requests that can be bookmarked
-	     (java.lang.String = targetURL, boolean = "true" if this is an actionURL "false" if it is a renderURL)
-	-->
-	<function>
-  		<function-name>outputLink</function-name>
-  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
-  		<function-signature>java.lang.String outputLink(java.lang.String,boolean)</function-signature>
-	</function>
-	<!-- 
-		 function generates an goBackLink that works seamlessly within portal and standalone environment 
-	     this function tries to create a backLink based on the user's "Referer" header and "GET" status. If
-	     its a "Post" and/or no "Referer" is found, the standard browser based javascript history.back() is generated	     
-	-->
-	<function>
-  		<function-name>goBackLink</function-name>
-  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
-  		<function-signature>java.lang.String goBackLink()</function-signature>
-	</function>
-	<!-- 
-		 function generates the contextPath of the application
-	-->
-	<function>
-  		<function-name>contextPath</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>java.lang.String getContextPath()</function-signature>
-	</function>
-	<!-- 
-		 function retrieves a generic error message if one is found.
-		 return null if nothing is found
-	-->
-	<function>
-  		<function-name>errorMsg</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>java.lang.String getErrorMsg()</function-signature>
-	</function>
-	<!-- 
-		 function returns if access denied exception occurred
-	-->
-	<function>
-  		<function-name>isAccessDenied</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>boolean isAccessDenied()</function-signature>
-	</function>
-	<!-- 
-		 function to get constant declarations
-	-->
-	<!--function>
-  		<function-name>constantInt</function-name>
-  		<function-class>org.jboss.portlet.forums.ui.ConstantsHelper</function-class>
-  		<function-signature>int getConstantInt(java.lang.String)</function-signature>
-	</function-->	
-	
-	<!-- 
-		function that decides if this is running in a portal environment or not
-	 -->
-	 <function>
-  		<function-name>isRunningInPortal</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>boolean isRunningInPortal()</function-signature>
-	</function>
-	<!-- 
-		 function returns if access denied exception occurred
-	-->
-	<function>
-  		<function-name>isAnonymous</function-name>
-  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
-  		<function-signature>boolean isAnonymous()</function-signature>
-	</function>	
-</facelet-taglib>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/jbossfacelets.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
+<facelet-taglib>
+	<namespace>http://www.jboss.com/jbossfacelets</namespace>
+	<!-- 
+		 function generates an outputLink that works seamlessly within portal and standalone environment 
+	     to be used for generating "GET" requests that can be bookmarked
+	     (java.lang.String = targetURL, boolean = "true" if this is an actionURL "false" if it is a renderURL)
+	-->
+	<function>
+  		<function-name>outputLink</function-name>
+  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
+  		<function-signature>java.lang.String outputLink(java.lang.String,boolean)</function-signature>
+	</function>
+	<!-- 
+		 function generates an goBackLink that works seamlessly within portal and standalone environment 
+	     this function tries to create a backLink based on the user's "Referer" header and "GET" status. If
+	     its a "Post" and/or no "Referer" is found, the standard browser based javascript history.back() is generated	     
+	-->
+	<function>
+  		<function-name>goBackLink</function-name>
+  		<function-class>org.jboss.website.jsf.utils.PortalUtil</function-class>
+  		<function-signature>java.lang.String goBackLink()</function-signature>
+	</function>
+	<!-- 
+		 function generates the contextPath of the application
+	-->
+	<function>
+  		<function-name>contextPath</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>java.lang.String getContextPath()</function-signature>
+	</function>
+	<!-- 
+		 function retrieves a generic error message if one is found.
+		 return null if nothing is found
+	-->
+	<function>
+  		<function-name>errorMsg</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>java.lang.String getErrorMsg()</function-signature>
+	</function>
+	<!-- 
+		 function returns if access denied exception occurred
+	-->
+	<function>
+  		<function-name>isAccessDenied</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>boolean isAccessDenied()</function-signature>
+	</function>
+	<!-- 
+		 function to get constant declarations
+	-->
+	<!--function>
+  		<function-name>constantInt</function-name>
+  		<function-class>org.jboss.portlet.forums.ui.ConstantsHelper</function-class>
+  		<function-signature>int getConstantInt(java.lang.String)</function-signature>
+	</function-->	
+	
+	<!-- 
+		function that decides if this is running in a portal environment or not
+	 -->
+	 <function>
+  		<function-name>isRunningInPortal</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>boolean isRunningInPortal()</function-signature>
+	</function>
+	<!-- 
+		 function returns if access denied exception occurred
+	-->
+	<function>
+  		<function-name>isAnonymous</function-name>
+  		<function-class>org.jboss.website.jsf.utils.JSFUtil</function-class>
+  		<function-signature>boolean isAnonymous()</function-signature>
+	</function>	
+</facelet-taglib>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,21 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<instances>
-   <deployment>
-	   <instance>
-	      <instance-id>UserRegistrationInstance</instance-id>
-	      <portlet-ref>UserRegistration</portlet-ref>
-	   </instance> 
-   </deployment>
-   <deployment>
-	   <instance>
-	      <instance-id>UserControlPanelInstance</instance-id>
-	      <portlet-ref>UserControlPanel</portlet-ref>
-	   </instance> 
-   </deployment>     
-   <deployment>
-	   <instance>
-	      <instance-id>UserActivationControllerInstance</instance-id>
-	      <portlet-ref>UserActivationController</portlet-ref>
-	   </instance> 
-   </deployment>     
-</instances>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet-instances.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,21 @@
+<?xml version="1.0" standalone="yes"?>
+<instances>
+   <deployment>
+	   <instance>
+	      <instance-id>UserRegistrationInstance</instance-id>
+	      <portlet-ref>UserRegistration</portlet-ref>
+	   </instance> 
+   </deployment>
+   <deployment>
+	   <instance>
+	      <instance-id>UserControlPanelInstance</instance-id>
+	      <portlet-ref>UserControlPanel</portlet-ref>
+	   </instance> 
+   </deployment>     
+   <deployment>
+	   <instance>
+	      <instance-id>UserActivationControllerInstance</instance-id>
+	      <portlet-ref>UserActivationController</portlet-ref>
+	   </instance> 
+   </deployment>     
+</instances>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
-	version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-	<portlet>
-        	<description>User Registration</description>
-		
-        	<portlet-name>UserRegistration</portlet-name>
-		
-        	<display-name>User Registration Portlet</display-name>
-		
-            <portlet-class>org.jboss.website.user.ui.UserManagerJSFPortlet</portlet-class>
-
-            <init-param>
-         		<name>default-view</name>
-         		<value>/admin/profile/checkage.xhtml</value>
-      		</init-param>
-
-        	<expiration-cache>-1</expiration-cache>
-		        
-        	<supports>
-        		 <mime-type>text/html</mime-type>
-        		 <portlet-mode>VIEW</portlet-mode>
-      		</supports>
-			
-			<portlet-info>
-				<title>JBoss.org Registration</title>				
-			</portlet-info>
-	</portlet>				
-	<portlet>
-        	<description>User Control Panel</description>
-		
-        	<portlet-name>UserControlPanel</portlet-name>
-		
-        	<display-name>User Control Panel</display-name>
-		
-            <portlet-class>org.jboss.website.user.ui.UserManagerJSFPortlet</portlet-class>
-
-            <init-param>
-         		<name>default-view</name>
-         		<value>/admin/index.xhtml</value>
-      		</init-param>
-
-        	<expiration-cache>-1</expiration-cache>
-		        
-        	<supports>
-        		 <mime-type>text/html</mime-type>
-        		 <portlet-mode>VIEW</portlet-mode>
-      		</supports>
-			
-			<portlet-info>
-				<title>User Control Panel</title>				
-			</portlet-info>
-	</portlet>	
-	<portlet>
-        	<description>User Activation Controller</description>
-		
-        	<portlet-name>UserActivationController</portlet-name>
-		
-        	<display-name>User Activation Controller</display-name>
-		
-            <portlet-class>org.jboss.website.user.ui.UserManagerJSFPortlet</portlet-class>
-
-            <init-param>
-         		<name>default-view</name>
-         		<value>/admin/activation/resendActivationConf.xhtml</value>
-      		</init-param>
-
-        	<expiration-cache>-1</expiration-cache>
-		        
-        	<supports>
-        		 <mime-type>text/html</mime-type>
-        		 <portlet-mode>VIEW</portlet-mode>
-      		</supports>
-			
-			<portlet-info>
-				<title>User Activation Controller</title>				
-			</portlet-info>
-	</portlet>	
- </portlet-app>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/portlet.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+	version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+	<portlet>
+        	<description>User Registration</description>
+		
+        	<portlet-name>UserRegistration</portlet-name>
+		
+        	<display-name>User Registration Portlet</display-name>
+		
+            <portlet-class>org.jboss.website.user.ui.UserManagerJSFPortlet</portlet-class>
+
+            <init-param>
+         		<name>default-view</name>
+         		<value>/admin/profile/checkage.xhtml</value>
+      		</init-param>
+
+        	<expiration-cache>-1</expiration-cache>
+		        
+        	<supports>
+        		 <mime-type>text/html</mime-type>
+        		 <portlet-mode>VIEW</portlet-mode>
+      		</supports>
+			
+			<portlet-info>
+				<title>JBoss.org Registration</title>				
+			</portlet-info>
+	</portlet>				
+	<portlet>
+        	<description>User Control Panel</description>
+		
+        	<portlet-name>UserControlPanel</portlet-name>
+		
+        	<display-name>User Control Panel</display-name>
+		
+            <portlet-class>org.jboss.website.user.ui.UserManagerJSFPortlet</portlet-class>
+
+            <init-param>
+         		<name>default-view</name>
+         		<value>/admin/index.xhtml</value>
+      		</init-param>
+
+        	<expiration-cache>-1</expiration-cache>
+		        
+        	<supports>
+        		 <mime-type>text/html</mime-type>
+        		 <portlet-mode>VIEW</portlet-mode>
+      		</supports>
+			
+			<portlet-info>
+				<title>User Control Panel</title>				
+			</portlet-info>
+	</portlet>	
+	<portlet>
+        	<description>User Activation Controller</description>
+		
+        	<portlet-name>UserActivationController</portlet-name>
+		
+        	<display-name>User Activation Controller</display-name>
+		
+            <portlet-class>org.jboss.website.user.ui.UserManagerJSFPortlet</portlet-class>
+
+            <init-param>
+         		<name>default-view</name>
+         		<value>/admin/activation/resendActivationConf.xhtml</value>
+      		</init-param>
+
+        	<expiration-cache>-1</expiration-cache>
+		        
+        	<supports>
+        		 <mime-type>text/html</mime-type>
+        		 <portlet-mode>VIEW</portlet-mode>
+      		</supports>
+			
+			<portlet-info>
+				<title>User Activation Controller</title>				
+			</portlet-info>
+	</portlet>	
+ </portlet-app>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-	<!-- 
-  	JBoss, the OpenSource J2EE webOS
-  	Distributable under LGPL license.
-  	See terms of license at gnu.org. 
- 	-->
-	<namespace>http://www.jboss.com/security/website</namespace>  
-	<tag>
-		<tag-name>isAllowed</tag-name>
-		<handler-class>org.jboss.website.security.impl.ACLTagHandler</handler-class>
-	</tag>   	      	        
-</facelet-taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/security.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
+<facelet-taglib>
+	<!-- 
+  	JBoss, the OpenSource J2EE webOS
+  	Distributable under LGPL license.
+  	See terms of license at gnu.org. 
+ 	-->
+	<namespace>http://www.jboss.com/security/website</namespace>  
+	<tag>
+		<tag-name>isAllowed</tag-name>
+		<handler-class>org.jboss.website.security.impl.ACLTagHandler</handler-class>
+	</tag>   	      	        
+</facelet-taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,181 +0,0 @@
-<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"
-  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>forge</shortname>
-   <info>Forge tags</info>
-   
-   <tag>
-      <name>pageURL</name>
-      <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass>
-      <attribute>
-         <name>page</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>form</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-		<name>tagmeButton</name>
-		<tagclass>org.jboss.forge.common.taglib.TagMeTag</tagclass>
-		<attribute>
-	         <name>div</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-      	</attribute>
-      	<attribute>
-	         <name>service</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-      	<attribute>
-	         <name>user</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-      	<attribute>
-	         <name>path</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-	    <attribute>
-	         <name>id</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-	    <attribute>
-	         <name>website</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-   </tag>
-   
-   <tag>
-      <name>param</name>
-      <tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass>
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>wikiURL</name>
-      <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
-      <attribute>
-         <name>page</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>freezoneURL</name>
-      <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
-      <attribute>
-         <name>page</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>projectURL</name>
-      <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
-      <attribute>
-         <name>project</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>page</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>form</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   
-   <tag>
-      <name>selectedProject</name>
-      <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass>
-   </tag>
-   
-   <tag>
-      <name>imagePath</name>
-      <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass>
-      <attribute>
-         <name>src</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>project</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>attrValue</name>
-      <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass>
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>attrIf</name>
-      <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass>
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-    <tag>
-      <name>ifEmpty</name>
-      <tagclass>org.jboss.forge.common.taglib.IfEmptyTag</tagclass>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-    <tag>
-      <name>ifNotEmpty</name>
-      <tagclass>org.jboss.forge.common.taglib.IfNotEmptyTag</tagclass>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-</taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/forge.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,181 @@
+<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"
+  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>forge</shortname>
+   <info>Forge tags</info>
+   
+   <tag>
+      <name>pageURL</name>
+      <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass>
+      <attribute>
+         <name>page</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>form</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+		<name>tagmeButton</name>
+		<tagclass>org.jboss.forge.common.taglib.TagMeTag</tagclass>
+		<attribute>
+	         <name>div</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+      	</attribute>
+      	<attribute>
+	         <name>service</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+      	<attribute>
+	         <name>user</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+      	<attribute>
+	         <name>path</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	         <name>id</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	         <name>website</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+   </tag>
+   
+   <tag>
+      <name>param</name>
+      <tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass>
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>wikiURL</name>
+      <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
+      <attribute>
+         <name>page</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>freezoneURL</name>
+      <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+      <attribute>
+         <name>page</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>projectURL</name>
+      <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
+      <attribute>
+         <name>project</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>page</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>form</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   
+   <tag>
+      <name>selectedProject</name>
+      <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass>
+   </tag>
+   
+   <tag>
+      <name>imagePath</name>
+      <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass>
+      <attribute>
+         <name>src</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>project</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>attrValue</name>
+      <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass>
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>attrIf</name>
+      <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass>
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+    <tag>
+      <name>ifEmpty</name>
+      <tagclass>org.jboss.forge.common.taglib.IfEmptyTag</tagclass>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+    <tag>
+      <name>ifNotEmpty</name>
+      <tagclass>org.jboss.forge.common.taglib.IfNotEmptyTag</tagclass>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+</taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,54 +0,0 @@
-<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"
-  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>jbossjsf</shortname>
-   <uri>http://www.jboss.com/jsf/website</uri>
-   <info>JBoss JSF tags</info>
-   
-   <tag>
-      <name>iterator</name>
-      <tag-class>org.jboss.website.jsf.tags.IteratorTag</tag-class>
-      <tei-class>org.jboss.website.jsf.tags.IteratorTEI</tei-class>
-      <body-content>JSP</body-content>
-      <attribute>
-         <name>items</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>var</name>
-         <required>true</required>
-         <rtexprvalue>false</rtexprvalue>
-      </attribute>            
-   </tag>
-   
-   <tag>
-      <name>setValue</name>
-      <tag-class>org.jboss.website.jsf.tags.SetValueTag</tag-class>      
-      <body-content>empty</body-content>
-      <attribute>
-         <name>target</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>property</name>
-         <required>true</required>
-         <rtexprvalue>false</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>            
-   </tag>
-      
-</taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/jbossjsf.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,54 @@
+<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"
+  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>jbossjsf</shortname>
+   <uri>http://www.jboss.com/jsf/website</uri>
+   <info>JBoss JSF tags</info>
+   
+   <tag>
+      <name>iterator</name>
+      <tag-class>org.jboss.website.jsf.tags.IteratorTag</tag-class>
+      <tei-class>org.jboss.website.jsf.tags.IteratorTEI</tei-class>
+      <body-content>JSP</body-content>
+      <attribute>
+         <name>items</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>var</name>
+         <required>true</required>
+         <rtexprvalue>false</rtexprvalue>
+      </attribute>            
+   </tag>
+   
+   <tag>
+      <name>setValue</name>
+      <tag-class>org.jboss.website.jsf.tags.SetValueTag</tag-class>      
+      <body-content>empty</body-content>
+      <attribute>
+         <name>target</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>property</name>
+         <required>true</required>
+         <rtexprvalue>false</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>            
+   </tag>
+      
+</taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,35 +0,0 @@
-<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"
-  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>security</shortname>
-   <uri>http://www.jboss.com/security/website</uri>
-   <info>JBoss WebSite Security related tags</info>
-   
-   <tag>
-      <name>isAllowed</name>
-      <tag-class>org.jboss.website.security.impl.ACLTag</tag-class>      
-      <body-content>JSP</body-content>
-      <attribute>
-         <name>fragmentId</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <!-- this is a comma-separated list of runtime input information to be used to determine if access should be
-      granted to render the protected fragment -->
-      <attribute>
-         <name>runtimeInfo</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>                  
-   </tag>
-   
-      
-</taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/security.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,35 @@
+<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"
+  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>security</shortname>
+   <uri>http://www.jboss.com/security/website</uri>
+   <info>JBoss WebSite Security related tags</info>
+   
+   <tag>
+      <name>isAllowed</name>
+      <tag-class>org.jboss.website.security.impl.ACLTag</tag-class>      
+      <body-content>JSP</body-content>
+      <attribute>
+         <name>fragmentId</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <!-- this is a comma-separated list of runtime input information to be used to determine if access should be
+      granted to render the protected fragment -->
+      <attribute>
+         <name>runtimeInfo</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>                  
+   </tag>
+   
+      
+</taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
-  <tlibversion>1.0</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>i18n</shortname>
-  <uri>http://jakarta.apache.org/taglibs/i18n-1.0</uri>
-  <info>
-The i18n custom tag library contains tags that help manage the complexity of creating internationalized web applications. These tags provide similar (though not identical) functionality to the internationalization available in the struts framework, but do not require adopting the entire struts framework.
-
-"i18n" is a common abbreviation for internationalization, because there are 18
-letters between the first "i" and the last "n".
-
-For more information on internationalization with Java, the java.sun.com site
-contains a good 
-tutorial written by Dale Green.
-</info>
-  <tag>
-    <name>bundle</name>
-    <tagclass>org.apache.taglibs.i18n.BundleTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.BundleTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>baseName</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>changeResponseLocale</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>scope</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>localeAttribute</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>localeRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>debug</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>message</name>
-    <tagclass>org.apache.taglibs.i18n.MessageTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.MessageTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>key</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>args</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundleRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>debug</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>messageArg</name>
-    <tagclass>org.apache.taglibs.i18n.MessageArgumentTag</tagclass>
-    <bodycontent>empty</bodycontent>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>ifdef</name>
-    <tagclass>org.apache.taglibs.i18n.IfdefTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>key</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundleRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>ifndef</name>
-    <tagclass>org.apache.taglibs.i18n.IfndefTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>key</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>bundleRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>locale</name>
-    <tagclass>org.apache.taglibs.i18n.LocaleTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.LocaleTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>localeRef</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>language</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>country</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>variant</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatString</name>
-    <tagclass>org.apache.taglibs.i18n.FormatStringTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatStringTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatNumber</name>
-    <tagclass>org.apache.taglibs.i18n.FormatNumberTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatNumberTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>pattern</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatCurrency</name>
-    <tagclass>org.apache.taglibs.i18n.FormatCurrencyTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatCurrencyTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatPercent</name>
-    <tagclass>org.apache.taglibs.i18n.FormatPercentTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatPercentTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatDateTime</name>
-    <tagclass>org.apache.taglibs.i18n.FormatDateTimeTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatDateTimeTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>dateStyle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>timeStyle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatDate</name>
-    <tagclass>org.apache.taglibs.i18n.FormatDateTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatDateTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>pattern</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>style</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-  <tag>
-    <name>formatTime</name>
-    <tagclass>org.apache.taglibs.i18n.FormatTimeTag</tagclass>
-    <teiclass>org.apache.taglibs.i18n.FormatTimeTEI</teiclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>locale</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>style</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>defaultText</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-</taglib>
-
-
-
-
-
-
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tld/taglibs-i18n.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+  <tlibversion>1.0</tlibversion>
+  <jspversion>1.1</jspversion>
+  <shortname>i18n</shortname>
+  <uri>http://jakarta.apache.org/taglibs/i18n-1.0</uri>
+  <info>
+The i18n custom tag library contains tags that help manage the complexity of creating internationalized web applications. These tags provide similar (though not identical) functionality to the internationalization available in the struts framework, but do not require adopting the entire struts framework.
+
+"i18n" is a common abbreviation for internationalization, because there are 18
+letters between the first "i" and the last "n".
+
+For more information on internationalization with Java, the java.sun.com site
+contains a good 
+tutorial written by Dale Green.
+</info>
+  <tag>
+    <name>bundle</name>
+    <tagclass>org.apache.taglibs.i18n.BundleTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.BundleTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>baseName</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>changeResponseLocale</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>scope</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>localeAttribute</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>localeRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>debug</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>message</name>
+    <tagclass>org.apache.taglibs.i18n.MessageTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.MessageTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>key</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>args</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundleRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>debug</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>messageArg</name>
+    <tagclass>org.apache.taglibs.i18n.MessageArgumentTag</tagclass>
+    <bodycontent>empty</bodycontent>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>ifdef</name>
+    <tagclass>org.apache.taglibs.i18n.IfdefTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>key</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundleRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>ifndef</name>
+    <tagclass>org.apache.taglibs.i18n.IfndefTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>key</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>bundleRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>locale</name>
+    <tagclass>org.apache.taglibs.i18n.LocaleTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.LocaleTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>localeRef</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>language</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>country</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>variant</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatString</name>
+    <tagclass>org.apache.taglibs.i18n.FormatStringTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatStringTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatNumber</name>
+    <tagclass>org.apache.taglibs.i18n.FormatNumberTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatNumberTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>pattern</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatCurrency</name>
+    <tagclass>org.apache.taglibs.i18n.FormatCurrencyTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatCurrencyTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatPercent</name>
+    <tagclass>org.apache.taglibs.i18n.FormatPercentTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatPercentTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatDateTime</name>
+    <tagclass>org.apache.taglibs.i18n.FormatDateTimeTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatDateTimeTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>dateStyle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>timeStyle</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatDate</name>
+    <tagclass>org.apache.taglibs.i18n.FormatDateTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatDateTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>pattern</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>style</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>formatTime</name>
+    <tagclass>org.apache.taglibs.i18n.FormatTimeTag</tagclass>
+    <teiclass>org.apache.taglibs.i18n.FormatTimeTEI</teiclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>locale</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>style</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>defaultText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+</taglib>
+
+
+
+
+
+
+

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,444 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-    <!-- author: thomas.jachmann at mindmatters.de -->
-    <namespace>http://myfaces.apache.org/tomahawk</namespace>
-    <tag>
-        <tag-name>commandButton</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandButton</component-type>
-            <renderer-type>org.apache.myfaces.Button</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandLink</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandLink</component-type>
-            <renderer-type>org.apache.myfaces.Link</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>dataTable</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlDataTable</component-type>
-            <renderer-type>org.apache.myfaces.Table</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputHidden</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputHidden</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputSecret</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputSecret</component-type>
-            <renderer-type>org.apache.myfaces.Secret</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputText</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputText</component-type>
-            <renderer-type>org.apache.myfaces.Text</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputHelpText</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputTextHelp</component-type>
-            <renderer-type>org.apache.myfaces.TextHelp</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputTextarea</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputTextarea</component-type>
-            <renderer-type>org.apache.myfaces.Textarea</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>graphicImage</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlGraphicImage</component-type>
-            <renderer-type>org.apache.myfaces.Image</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>message</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlMessage</component-type>
-            <renderer-type>org.apache.myfaces.Message</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>messages</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlMessages</component-type>
-            <renderer-type>org.apache.myfaces.Messages</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>outputLabel</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlOutputLabel</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>outputText</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlOutputText</component-type>
-            <renderer-type>org.apache.myfaces.Text</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelGrid</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelGrid</component-type>
-            <renderer-type>org.apache.myfaces.Grid</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelGroup</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelGroup</component-type>
-            <renderer-type>org.apache.myfaces.Group</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneMenu</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectOneMenu</component-type>
-            <renderer-type>org.apache.myfaces.Menu</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectManyMenu</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectManyMenu</component-type>
-            <renderer-type>org.apache.myfaces.Menu</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneRadio</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectOneRadio</component-type>
-            <renderer-type>org.apache.myfaces.Radio</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectBooleanCheckbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectBooleanCheckbox</component-type>
-            <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectManyCheckbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectManyCheckbox</component-type>
-            <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneListbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectOneListbox</component-type>
-            <renderer-type>org.apache.myfaces.Listbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectManyListbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectManyListbox</component-type>
-            <renderer-type>org.apache.myfaces.Listbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputCalendar</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputCalendar</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>jsValueChangeListener</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.JsValueChangeListener</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>jsValueSet</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlJsValueSet</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>checkbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCheckbox</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandNavigation</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandNavigation</component-type>
-            <renderer-type>org.apache.myfaces.Navigation</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandSortHeader</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandSortHeader</component-type>
-            <renderer-type>org.apache.myfaces.SortHeader</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>dataList</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlDataList</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>dataScroller</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlDataScroller</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputDate</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputDate</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputFileUpload</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputFileUpload</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputHtml</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.InputHtml</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>navigationMenuItem</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.NavigationMenuItem</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>navigationMenuItems</tag-name>
-        <component>
-            <component-type>javax.faces.SelectItems</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>jscookMenu</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.JSCookMenu</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelLayout</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelLayout</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelNavigation</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelNavigation</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelTab</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelTab</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelTabbedPane</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelTabbedPane</component-type>
-        </component>
-    </tag>
-    <!-- deactivated since there's no component! tag>
-    <tag-name>tabChangeListener</tag-name>
-    <component>
-    <component-type></component-type>
-    </component>
-    </tag-->
-    <tag>
-        <tag-name>collapsiblePanel</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCollapsiblePanel</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneCountry</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.SelectOneCountry</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneLanguage</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.SelectOneLanguage</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>stylesheet</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.Stylesheet</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>div</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.Div</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>htmlTag</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTag</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>radio</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlRadio</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>tree</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTree</component-type>
-            <renderer-type>org.apache.myfaces.HtmlTree</renderer-type>
-        </component>
-    </tag>
-    <!-- deactivated since there's no component! tag>
-    <tag-name>treeSelectionListener</tag-name>
-    <component>
-    <component-type></component-type>
-    </component>
-    </tag-->
-    <!-- deactivated since there's no component! tag>
-    <tag-name>iconProvider</tag-name>
-    <component>
-    <component-type></component-type>
-    </component>
-    </tag-->
-    <tag>
-        <tag-name>treeColumn</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTreeColumn</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>treeCheckbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTreeCheckbox</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>tree2</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTree2</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelStack</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelStack</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>popup</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPopup</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>newspaperTable</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlNewspaperTable</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>aliasBean</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.AliasBean</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>aliasBeansScope</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.AliasBeansScope</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>buffer</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.Buffer</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>saveState</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.SaveState</component-type>
-        </component>
-    </tag>
-    <!-- deactivated since there's no component! tag>
-    <tag-name>updateActionListener</tag-name>
-    <component>
-    <component-type></component-type>
-    </component>
-    </tag-->
-    <tag>
-        <tag-name>validateCreditCard</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.CreditCard</validator-id>
-        </validator>
-    </tag>
-    <tag>
-        <tag-name>validateEmail</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.Email</validator-id>
-        </validator>
-    </tag>
-    <tag>
-        <tag-name>validateEqual</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.Equal</validator-id>
-        </validator>
-    </tag>
-    <tag>
-        <tag-name>swapImage</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSwapImage</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>columns</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlColumns</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>column</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlColumn</component-type>
-        </component>
-    </tag>
-    <!-- additional validators (note: not in tld, so no code completion) -->
-    <tag>
-        <tag-name>validateRegExpr</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.RegExpr</validator-id>
-        </validator>
-    </tag>
-</facelet-taglib>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/tomahawk.taglib.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,444 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
+<facelet-taglib>
+    <!-- author: thomas.jachmann at mindmatters.de -->
+    <namespace>http://myfaces.apache.org/tomahawk</namespace>
+    <tag>
+        <tag-name>commandButton</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlCommandButton</component-type>
+            <renderer-type>org.apache.myfaces.Button</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>commandLink</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlCommandLink</component-type>
+            <renderer-type>org.apache.myfaces.Link</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>dataTable</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlDataTable</component-type>
+            <renderer-type>org.apache.myfaces.Table</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputHidden</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputHidden</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputSecret</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputSecret</component-type>
+            <renderer-type>org.apache.myfaces.Secret</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputText</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputText</component-type>
+            <renderer-type>org.apache.myfaces.Text</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputHelpText</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputTextHelp</component-type>
+            <renderer-type>org.apache.myfaces.TextHelp</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputTextarea</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputTextarea</component-type>
+            <renderer-type>org.apache.myfaces.Textarea</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>graphicImage</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlGraphicImage</component-type>
+            <renderer-type>org.apache.myfaces.Image</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>message</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlMessage</component-type>
+            <renderer-type>org.apache.myfaces.Message</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>messages</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlMessages</component-type>
+            <renderer-type>org.apache.myfaces.Messages</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>outputLabel</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlOutputLabel</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>outputText</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlOutputText</component-type>
+            <renderer-type>org.apache.myfaces.Text</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelGrid</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelGrid</component-type>
+            <renderer-type>org.apache.myfaces.Grid</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelGroup</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelGroup</component-type>
+            <renderer-type>org.apache.myfaces.Group</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectOneMenu</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectOneMenu</component-type>
+            <renderer-type>org.apache.myfaces.Menu</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectManyMenu</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectManyMenu</component-type>
+            <renderer-type>org.apache.myfaces.Menu</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectOneRadio</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectOneRadio</component-type>
+            <renderer-type>org.apache.myfaces.Radio</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectBooleanCheckbox</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectBooleanCheckbox</component-type>
+            <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectManyCheckbox</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectManyCheckbox</component-type>
+            <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectOneListbox</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectOneListbox</component-type>
+            <renderer-type>org.apache.myfaces.Listbox</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectManyListbox</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSelectManyListbox</component-type>
+            <renderer-type>org.apache.myfaces.Listbox</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputCalendar</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputCalendar</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>jsValueChangeListener</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.JsValueChangeListener</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>jsValueSet</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlJsValueSet</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>checkbox</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlCheckbox</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>commandNavigation</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlCommandNavigation</component-type>
+            <renderer-type>org.apache.myfaces.Navigation</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>commandSortHeader</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlCommandSortHeader</component-type>
+            <renderer-type>org.apache.myfaces.SortHeader</renderer-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>dataList</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlDataList</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>dataScroller</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlDataScroller</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputDate</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputDate</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputFileUpload</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlInputFileUpload</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>inputHtml</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.InputHtml</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>navigationMenuItem</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.NavigationMenuItem</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>navigationMenuItems</tag-name>
+        <component>
+            <component-type>javax.faces.SelectItems</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>jscookMenu</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.JSCookMenu</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelLayout</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelLayout</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelNavigation</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelNavigation</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelTab</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelTab</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelTabbedPane</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelTabbedPane</component-type>
+        </component>
+    </tag>
+    <!-- deactivated since there's no component! tag>
+    <tag-name>tabChangeListener</tag-name>
+    <component>
+    <component-type></component-type>
+    </component>
+    </tag-->
+    <tag>
+        <tag-name>collapsiblePanel</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlCollapsiblePanel</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectOneCountry</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.SelectOneCountry</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>selectOneLanguage</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.SelectOneLanguage</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>stylesheet</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.Stylesheet</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>div</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.Div</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>htmlTag</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlTag</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>radio</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlRadio</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>tree</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlTree</component-type>
+            <renderer-type>org.apache.myfaces.HtmlTree</renderer-type>
+        </component>
+    </tag>
+    <!-- deactivated since there's no component! tag>
+    <tag-name>treeSelectionListener</tag-name>
+    <component>
+    <component-type></component-type>
+    </component>
+    </tag-->
+    <!-- deactivated since there's no component! tag>
+    <tag-name>iconProvider</tag-name>
+    <component>
+    <component-type></component-type>
+    </component>
+    </tag-->
+    <tag>
+        <tag-name>treeColumn</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlTreeColumn</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>treeCheckbox</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlTreeCheckbox</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>tree2</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlTree2</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>panelStack</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPanelStack</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>popup</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlPopup</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>newspaperTable</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlNewspaperTable</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>aliasBean</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.AliasBean</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>aliasBeansScope</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.AliasBeansScope</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>buffer</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.Buffer</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>saveState</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.SaveState</component-type>
+        </component>
+    </tag>
+    <!-- deactivated since there's no component! tag>
+    <tag-name>updateActionListener</tag-name>
+    <component>
+    <component-type></component-type>
+    </component>
+    </tag-->
+    <tag>
+        <tag-name>validateCreditCard</tag-name>
+        <validator>
+            <validator-id>org.apache.myfaces.validator.CreditCard</validator-id>
+        </validator>
+    </tag>
+    <tag>
+        <tag-name>validateEmail</tag-name>
+        <validator>
+            <validator-id>org.apache.myfaces.validator.Email</validator-id>
+        </validator>
+    </tag>
+    <tag>
+        <tag-name>validateEqual</tag-name>
+        <validator>
+            <validator-id>org.apache.myfaces.validator.Equal</validator-id>
+        </validator>
+    </tag>
+    <tag>
+        <tag-name>swapImage</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlSwapImage</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>columns</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlColumns</component-type>
+        </component>
+    </tag>
+    <tag>
+        <tag-name>column</tag-name>
+        <component>
+            <component-type>org.apache.myfaces.HtmlColumn</component-type>
+        </component>
+    </tag>
+    <!-- additional validators (note: not in tld, so no code completion) -->
+    <tag>
+        <tag-name>validateRegExpr</tag-name>
+        <validator>
+            <validator-id>org.apache.myfaces.validator.RegExpr</validator-id>
+        </validator>
+    </tag>
+</facelet-taglib>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,243 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<faces-config>	
-	<!-- general application configuration -->
-	<application>
-	    <!-- jbossportal-facelets integration -->
-	    <property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
-	    <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
-	    
-	    <!-- standalone facelets integration -->
-    	<!--view-handler>com.sun.facelets.FaceletViewHandler</view-handler-->     	    	
-    </application>
-    
-    <!--lifecycle>
-    	<phase-listener>org.jboss.website.jsf.listeners.ActionErrorHandler</phase-listener>
-    </lifecycle-->
-    
-    <!--  custom validator registrations -->
-	<validator>
-		<validator-id>org.jboss.website.jsf.validator.Email</validator-id>
-		<validator-class>org.jboss.website.jsf.validator.EmailValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>org.jboss.website.jsf.validator.Password</validator-id>
-		<validator-class>org.jboss.website.jsf.validator.PasswordValidator</validator-class>
-	</validator>
-    
-    <!--  generic navigation rules, irrespective of the (from-view-id) -->
-	<!--navigation-rule>		
-		<navigation-case>
-			<from-outcome>noauth</from-outcome>
-			<to-view-id>/admin/noauth.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule-->
-
-	<!-- managed bean for user profile usecases (registration,edit,view etc) -->
-	<managed-bean>
-		<managed-bean-name>profileValidator</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ProfileValidator</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>registrar</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.Registrar</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>	
-	<managed-bean>
-		<managed-bean-name>editProfile</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.EditProfileController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>editMyProfile</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.EditMyProfileController</managed-bean-class>
-		<managed-bean-scope>session</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>myPassword</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ChangeMyPasswordController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>viewProfile</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ViewProfileController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>		
-			
-	<!-- navigation rules for /admin/profile/checkage.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/checkage.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>register</from-outcome>
-			<to-view-id>/admin/profile/register.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>underage</from-outcome>
-			<to-view-id>/admin/profile/underage.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/register.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/register.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/profile/confirmation.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/view.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/view.xhtml</from-view-id>										
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-				
-	<!-- navigation rules for /admin/profile/edit.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/edit.xhtml</from-view-id>								
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/profile/view.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>cancel</from-outcome>
-			<to-view-id>/admin/profile/view.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/editMyProfile.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/editMyProfile.xhtml</from-view-id>								
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>cancel</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
-		</navigation-case>						
-	</navigation-rule>
-	
-	<!-- navigation rules for /admin/profile/changeMyPassword.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/profile/changeMyPassword.xhtml</from-view-id>								
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/profile/editMyProfile.xhtml</to-view-id>
-		</navigation-case>						
-	</navigation-rule>
-	
-					
-	<!--  user search related usecases -->
-	<managed-bean>
-		<managed-bean-name>search</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.SearchController</managed-bean-class>
-		<managed-bean-scope>session</managed-bean-scope>
-	</managed-bean>
-	<navigation-rule>
-		<from-view-id>/admin/search/index.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>display</from-outcome>
-			<to-view-id>/admin/search/results.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/admin/search/results.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>display</from-outcome>
-			<to-view-id>/admin/search/results.xhtml</to-view-id>
-		</navigation-case>		
-	</navigation-rule>
-	
-	<!--  user account activation related usecases -->
-	<managed-bean>
-		<managed-bean-name>activation</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.AccountActivationController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	
-	<!-- navigation rules for /admin/activation/resendActivationConf.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/activation/resendActivationConf.xhtml</from-view-id>		
-		<!--  open means start of this usecase of reporting this issue to the Administrator -->
-		<navigation-case>
-			<from-outcome>open</from-outcome>
-			<to-view-id>/admin/activation/contactAdmin.xhtml</to-view-id>
-		</navigation-case>			
-	</navigation-rule>
-	
-		
-	<!-- navigation rules for /admin/activation/contactAdmin.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/activation/contactAdmin.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>confirm</from-outcome>
-			<to-view-id>/admin/activation/contactAdminConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>	
-	
-	<!--  user password management related usecases -->
-	<managed-bean>
-		<managed-bean-name>reset</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ResetPasswordController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>resetNukesPass</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.ResetNukesPasswordController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	<managed-bean>
-		<managed-bean-name>lostPassword</managed-bean-name>
-		<managed-bean-class>org.jboss.website.user.ui.LostPasswordController</managed-bean-class>
-		<managed-bean-scope>session</managed-bean-scope>
-	</managed-bean>
-	<!-- navigation rules for /admin/password/tempPassword.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/tempPassword.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/tempPasswordConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-	<!-- navigation rules for /admin/password/resetNukesPass.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/resetNukesPass.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/resetNukesPassConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-	<!-- navigation rules for /admin/password/startLostPassword.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/startLostPassword.xhtml</from-view-id>				
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/secretQuestion.xhtml</to-view-id>			
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>resendActivation</from-outcome>
-			<to-view-id>/admin/activation/resendActivationConf.xhtml</to-view-id>			
-		</navigation-case>				
-		<navigation-case>
-			<from-outcome>close</from-outcome>
-			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	<!-- navigation rules for /admin/password/secretQuestion.xhtml -->
-	<navigation-rule>
-		<from-view-id>/admin/password/secretQuestion.xhtml</from-view-id>		
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
-		</navigation-case>				
-	</navigation-rule>
-</faces-config>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-config.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+
+<faces-config>	
+	<!-- general application configuration -->
+	<application>
+	    <!-- jbossportal-facelets integration -->
+	    <property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
+	    <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
+	    
+	    <!-- standalone facelets integration -->
+    	<!--view-handler>com.sun.facelets.FaceletViewHandler</view-handler-->     	    	
+    </application>
+    
+    <!--lifecycle>
+    	<phase-listener>org.jboss.website.jsf.listeners.ActionErrorHandler</phase-listener>
+    </lifecycle-->
+    
+    <!--  custom validator registrations -->
+	<validator>
+		<validator-id>org.jboss.website.jsf.validator.Email</validator-id>
+		<validator-class>org.jboss.website.jsf.validator.EmailValidator</validator-class>
+	</validator>
+	<validator>
+		<validator-id>org.jboss.website.jsf.validator.Password</validator-id>
+		<validator-class>org.jboss.website.jsf.validator.PasswordValidator</validator-class>
+	</validator>
+    
+    <!--  generic navigation rules, irrespective of the (from-view-id) -->
+	<!--navigation-rule>		
+		<navigation-case>
+			<from-outcome>noauth</from-outcome>
+			<to-view-id>/admin/noauth.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule-->
+
+	<!-- managed bean for user profile usecases (registration,edit,view etc) -->
+	<managed-bean>
+		<managed-bean-name>profileValidator</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ProfileValidator</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>registrar</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.Registrar</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>	
+	<managed-bean>
+		<managed-bean-name>editProfile</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.EditProfileController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>editMyProfile</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.EditMyProfileController</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>myPassword</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ChangeMyPasswordController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>viewProfile</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ViewProfileController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>		
+			
+	<!-- navigation rules for /admin/profile/checkage.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/checkage.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>register</from-outcome>
+			<to-view-id>/admin/profile/register.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>underage</from-outcome>
+			<to-view-id>/admin/profile/underage.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/register.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/register.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/profile/confirmation.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/view.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/view.xhtml</from-view-id>										
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/index.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+				
+	<!-- navigation rules for /admin/profile/edit.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/edit.xhtml</from-view-id>								
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/profile/view.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>cancel</from-outcome>
+			<to-view-id>/admin/profile/view.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/editMyProfile.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/editMyProfile.xhtml</from-view-id>								
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/index.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>cancel</from-outcome>
+			<to-view-id>/admin/index.xhtml</to-view-id>
+		</navigation-case>						
+	</navigation-rule>
+	
+	<!-- navigation rules for /admin/profile/changeMyPassword.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/profile/changeMyPassword.xhtml</from-view-id>								
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/profile/editMyProfile.xhtml</to-view-id>
+		</navigation-case>						
+	</navigation-rule>
+	
+					
+	<!--  user search related usecases -->
+	<managed-bean>
+		<managed-bean-name>search</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.SearchController</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+	<navigation-rule>
+		<from-view-id>/admin/search/index.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>display</from-outcome>
+			<to-view-id>/admin/search/results.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/search/results.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>display</from-outcome>
+			<to-view-id>/admin/search/results.xhtml</to-view-id>
+		</navigation-case>		
+	</navigation-rule>
+	
+	<!--  user account activation related usecases -->
+	<managed-bean>
+		<managed-bean-name>activation</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.AccountActivationController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	
+	<!-- navigation rules for /admin/activation/resendActivationConf.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/activation/resendActivationConf.xhtml</from-view-id>		
+		<!--  open means start of this usecase of reporting this issue to the Administrator -->
+		<navigation-case>
+			<from-outcome>open</from-outcome>
+			<to-view-id>/admin/activation/contactAdmin.xhtml</to-view-id>
+		</navigation-case>			
+	</navigation-rule>
+	
+		
+	<!-- navigation rules for /admin/activation/contactAdmin.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/activation/contactAdmin.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>confirm</from-outcome>
+			<to-view-id>/admin/activation/contactAdminConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>	
+	
+	<!--  user password management related usecases -->
+	<managed-bean>
+		<managed-bean-name>reset</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ResetPasswordController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>resetNukesPass</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.ResetNukesPasswordController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>lostPassword</managed-bean-name>
+		<managed-bean-class>org.jboss.website.user.ui.LostPasswordController</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+	<!-- navigation rules for /admin/password/tempPassword.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/tempPassword.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/tempPasswordConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+	<!-- navigation rules for /admin/password/resetNukesPass.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/resetNukesPass.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/resetNukesPassConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+	<!-- navigation rules for /admin/password/startLostPassword.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/startLostPassword.xhtml</from-view-id>				
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/secretQuestion.xhtml</to-view-id>			
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>resendActivation</from-outcome>
+			<to-view-id>/admin/activation/resendActivationConf.xhtml</to-view-id>			
+		</navigation-case>				
+		<navigation-case>
+			<from-outcome>close</from-outcome>
+			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<!-- navigation rules for /admin/password/secretQuestion.xhtml -->
+	<navigation-rule>
+		<from-view-id>/admin/password/secretQuestion.xhtml</from-view-id>		
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/admin/password/secretQuestionConf.xhtml</to-view-id>
+		</navigation-case>				
+	</navigation-rule>
+</faces-config>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,29 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<deployments>
-   <deployment>
-      <if-exists>keep</if-exists>
-      <parent-ref>default</parent-ref>
-      <page>
-      	  <page-name>usercp</page-name>
-	      <window>
-	         <window-name>usercp</window-name>
-	         <instance-ref>UserControlPanelInstance</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>register</page-name>
-	      <window>
-	         <window-name>register</window-name>
-	         <instance-ref>UserRegistrationInstance</instance-ref>
-	         <region>center</region>
-	         <height>1</height>
-	      </window>
-      </page>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/user-object.xml.bak	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="yes"?>
+<deployments>
+   <deployment>
+      <if-exists>keep</if-exists>
+      <parent-ref>default</parent-ref>
+      <page>
+      	  <page-name>usercp</page-name>
+	      <window>
+	         <window-name>usercp</window-name>
+	         <instance-ref>UserControlPanelInstance</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>register</page-name>
+	      <window>
+	         <window-name>register</window-name>
+	         <instance-ref>UserRegistrationInstance</instance-ref>
+	         <region>center</region>
+	         <height>1</height>
+	      </window>
+      </page>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
--->
-<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/web-app_2_4.xsd" 
-version="2.4">
-     
-    <!-- Seam -->  
-    <!-- 
-    <listener>
-        <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
-    </listener>
-    
-    <filter>
-        <filter-name>Seam Exception Filter</filter-name>
-        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>Seam Exception Filter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping>
-    -->
-    
-    <!-- MyFaces -->
-    <listener>
-      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-   </listener>
-   
-   <context-param>
-        <param-name>javax.faces.CONFIG_FILES</param-name>
-        <param-value>
-            /WEB-INF/user-config.xml
-        </param-value>
-        <description>
-            Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-        </description>
-   </context-param>
-   
-       
-   <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-        <description>
-            State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.2
-        </description>
-    </context-param> 
-    
-    <!-- Special Debug Output for Development -->
-   <context-param>
-    <param-name>facelets.DEVELOPMENT</param-name>
-    <param-value>true</param-value>
-   </context-param>
-   
-   <!-- facelets integration -->
-   <!-- Use Documents Saved as *.xhtml -->	
-   <context-param>
-    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-    <param-value>.xhtml</param-value>
-   </context-param> 
-   
-   <context-param>
-      <param-name>facelets.LIBRARIES</param-name>
-      <param-value>/WEB-INF/tomahawk.taglib.xml;/WEB-INF/jbossfacelets.taglib.xml;/WEB-INF/security.taglib.xml</param-value>
-   </context-param>   
-       
-   <!-- Faces Servlet -->   
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <!-- Activation Link Servlet -->   
-    <servlet>
-        <servlet-name>ActivationLinkProcessor</servlet-name>
-        <servlet-class>org.jboss.website.user.ui.ActivationLinkProcessor</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-   
-    <!-- Faces Servlet Mapping -->
-    <!-- extension mapping -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-    <!-- extension mapping -->
-    <servlet-mapping>
-        <servlet-name>ActivationLinkProcessor</servlet-name>
-        <url-pattern>/admin/activation/activate</url-pattern>
-    </servlet-mapping>
-
-	<!-- specify taglibs -->
-	                   
-   <!-- secure the jsps that make up the ui components of this jsf application -->
-    <security-constraint>
-   		<display-name>constraints for all jsps</display-name>
-   		<web-resource-collection>
-   			<web-resource-name>protected all jsps</web-resource-name>
-   			<url-pattern>*.jsp</url-pattern>   			
-   		</web-resource-collection>
-   		<auth-constraint>
-   			<description>No roles so no direct access</description>
-   		</auth-constraint>
-    </security-constraint>
-    <!-- secure the facelet views that make up the ui components of this jsf application -->
-    <security-constraint>
-   		<display-name>constraints for all facelets</display-name>
-   		<web-resource-collection>
-   			<web-resource-name>protected all facelets</web-resource-name>
-   			<url-pattern>*.xhtml</url-pattern>   			
-   		</web-resource-collection>
-   		<auth-constraint>
-   			<description>No roles so no direct access</description>
-   		</auth-constraint>
-    </security-constraint>
-    
-    <!-- integrating BASIC AUTH for the standalone JSF version -->
-    <!--security-constraint>
-      <web-resource-collection>
-         <web-resource-name>Authenticated</web-resource-name>
-         <description></description>
-         <url-pattern>/admin/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-         <role-name>Authenticated</role-name>
-      </auth-constraint>
-   </security-constraint>      
-   <login-config>
-      <auth-method>BASIC</auth-method>
-      <realm-name>JBoss User Manager</realm-name>
-   </login-config>
-   <security-role>
-      <role-name>Authenticated</role-name>
-   </security-role-->
-   
-</web-app>
-

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/WEB-INF/web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,145 @@
+<?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/web-app_2_4.xsd" 
+version="2.4">
+     
+    <!-- Seam -->  
+    <!-- 
+    <listener>
+        <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+    </listener>
+    
+    <filter>
+        <filter-name>Seam Exception Filter</filter-name>
+        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>Seam Exception Filter</filter-name>
+        <url-pattern>*.jsf</url-pattern>
+    </filter-mapping>
+    -->
+    
+    <!-- MyFaces -->
+    <listener>
+      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+   </listener>
+   
+   <context-param>
+        <param-name>javax.faces.CONFIG_FILES</param-name>
+        <param-value>
+            /WEB-INF/user-config.xml
+        </param-value>
+        <description>
+            Comma separated list of URIs of (additional) faces config files.
+            (e.g. /WEB-INF/my-config.xml)
+            See JSF 1.0 PRD2, 10.3.2
+        </description>
+   </context-param>
+   
+       
+   <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+        <description>
+            State saving method: "client" or "server" (= default)
+            See JSF Specification 2.5.2
+        </description>
+    </context-param> 
+    
+    <!-- Special Debug Output for Development -->
+   <context-param>
+    <param-name>facelets.DEVELOPMENT</param-name>
+    <param-value>true</param-value>
+   </context-param>
+   
+   <!-- facelets integration -->
+   <!-- Use Documents Saved as *.xhtml -->	
+   <context-param>
+    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+    <param-value>.xhtml</param-value>
+   </context-param> 
+   
+   <context-param>
+      <param-name>facelets.LIBRARIES</param-name>
+      <param-value>/WEB-INF/tomahawk.taglib.xml;/WEB-INF/jbossfacelets.taglib.xml;/WEB-INF/security.taglib.xml</param-value>
+   </context-param>   
+       
+   <!-- Faces Servlet -->   
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    
+    <!-- Activation Link Servlet -->   
+    <servlet>
+        <servlet-name>ActivationLinkProcessor</servlet-name>
+        <servlet-class>org.jboss.website.user.ui.ActivationLinkProcessor</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+   
+    <!-- Faces Servlet Mapping -->
+    <!-- extension mapping -->
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
+    <!-- extension mapping -->
+    <servlet-mapping>
+        <servlet-name>ActivationLinkProcessor</servlet-name>
+        <url-pattern>/admin/activation/activate</url-pattern>
+    </servlet-mapping>
+
+	<!-- specify taglibs -->
+	                   
+   <!-- secure the jsps that make up the ui components of this jsf application -->
+    <security-constraint>
+   		<display-name>constraints for all jsps</display-name>
+   		<web-resource-collection>
+   			<web-resource-name>protected all jsps</web-resource-name>
+   			<url-pattern>*.jsp</url-pattern>   			
+   		</web-resource-collection>
+   		<auth-constraint>
+   			<description>No roles so no direct access</description>
+   		</auth-constraint>
+    </security-constraint>
+    <!-- secure the facelet views that make up the ui components of this jsf application -->
+    <security-constraint>
+   		<display-name>constraints for all facelets</display-name>
+   		<web-resource-collection>
+   			<web-resource-name>protected all facelets</web-resource-name>
+   			<url-pattern>*.xhtml</url-pattern>   			
+   		</web-resource-collection>
+   		<auth-constraint>
+   			<description>No roles so no direct access</description>
+   		</auth-constraint>
+    </security-constraint>
+    
+    <!-- integrating BASIC AUTH for the standalone JSF version -->
+    <!--security-constraint>
+      <web-resource-collection>
+         <web-resource-name>Authenticated</web-resource-name>
+         <description></description>
+         <url-pattern>/admin/*</url-pattern>
+      </web-resource-collection>
+      <auth-constraint>
+         <role-name>Authenticated</role-name>
+      </auth-constraint>
+   </security-constraint>      
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBoss User Manager</realm-name>
+   </login-config>
+   <security-role>
+      <role-name>Authenticated</role-name>
+   </security-role-->
+   
+</web-app>
+

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,68 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-	  <jsfHtml:form>	  
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Account Activation</b><br/>		
-	  	</td>
-	  </tr>	  
-      <tr>
-            <td> 
-				 Please confirm that your e-mail address is correct and 
-				 then click on "OK" to automatically alert the administrator 
-				 to the issue with your login.				 
-			</td>			
-      </tr>
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">		    
-         <tr valign="top">
-		 	<td>Your Email: </td>
-            <td>
-			<jsfHtml:inputText id="email" size="26" 
-			maxlength="60" value="#{activation.userEmail}"/>
-			</td><br/>
-			<td width="20"></td>
-            <td>&#160;</td>
-            <td>&#160;</td>
-            <br/>
-         </tr>
-		 <tr valign="top">
-		 	<td>Your Password: </td>
-            <td>
-				<jsfHtml:inputSecret id="currentPass1" size="26" maxlength="60" value="" required="true" binding="#{profileValidator.currentPassword}"/>
-				<jsfHtml:inputHidden id="currentPasswordCheck" validator="#{profileValidator.currentPasswordCheck}" value="stub"/>
-			</td>
-			<br/>
-			<td width="20"><jsfHtml:message for="currentPasswordCheck" tooltip="true" style="color:red"/></td>
-            <td>&#160;</td>
-            <td>&#160;</td>
-            <br/>
-         </tr> 			 	                                           		 	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the buttons -->	
-		<input type="hidden" name="id" value="#{param['id']}"/> 						 	                	              			
-		<jsfHtml:commandButton type="submit" action="#{activation.reportActivationIssue}" value="OK"/>		
-      </jsfHtml:form>      
-	</ui:define>
-	
-</ui:composition>
-
-
-
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdmin.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,68 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+	  <jsfHtml:form>	  
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Account Activation</b><br/>		
+	  	</td>
+	  </tr>	  
+      <tr>
+            <td> 
+				 Please confirm that your e-mail address is correct and 
+				 then click on "OK" to automatically alert the administrator 
+				 to the issue with your login.				 
+			</td>			
+      </tr>
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">		    
+         <tr valign="top">
+		 	<td>Your Email: </td>
+            <td>
+			<jsfHtml:inputText id="email" size="26" 
+			maxlength="60" value="#{activation.userEmail}"/>
+			</td><br/>
+			<td width="20"></td>
+            <td>&#160;</td>
+            <td>&#160;</td>
+            <br/>
+         </tr>
+		 <tr valign="top">
+		 	<td>Your Password: </td>
+            <td>
+				<jsfHtml:inputSecret id="currentPass1" size="26" maxlength="60" value="" required="true" binding="#{profileValidator.currentPassword}"/>
+				<jsfHtml:inputHidden id="currentPasswordCheck" validator="#{profileValidator.currentPasswordCheck}" value="stub"/>
+			</td>
+			<br/>
+			<td width="20"><jsfHtml:message for="currentPasswordCheck" tooltip="true" style="color:red"/></td>
+            <td>&#160;</td>
+            <td>&#160;</td>
+            <br/>
+         </tr> 			 	                                           		 	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the buttons -->	
+		<input type="hidden" name="id" value="#{param['id']}"/> 						 	                	              			
+		<jsfHtml:commandButton type="submit" action="#{activation.reportActivationIssue}" value="OK"/>		
+      </jsfHtml:form>      
+	</ui:define>
+	
+</ui:composition>
+
+
+
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,40 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-	
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-
-	<!-- actual form -->
-	<jsfHtml:form>  	              
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Account Activation</b><br/>		
-	  	</td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		  <tr valign="top">
-            <td> 
-				 Your issue has now been logged with the <b>Administrator</b>. You will be contacted shortly with a resolution.<br/><br/>				 
-			</td>            
-         </tr>                                             		 	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the buttons -->
-		<input type="hidden" name="id" value="#{param['id']}"/> 						 	                	              							
-		<!--jsfHtml:commandButton type="button" onclick="javascript:window.location.href='/login';" value="OK"/-->		
-     </jsfHtml:form>
-
-</ui:define>
-</ui:composition>
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/contactAdminConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,40 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+	
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+
+	<!-- actual form -->
+	<jsfHtml:form>  	              
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Account Activation</b><br/>		
+	  	</td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		  <tr valign="top">
+            <td> 
+				 Your issue has now been logged with the <b>Administrator</b>. You will be contacted shortly with a resolution.<br/><br/>				 
+			</td>            
+         </tr>                                             		 	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the buttons -->
+		<input type="hidden" name="id" value="#{param['id']}"/> 						 	                	              							
+		<!--jsfHtml:commandButton type="button" onclick="javascript:window.location.href='/login';" value="OK"/-->		
+     </jsfHtml:form>
+
+</ui:define>
+</ui:composition>
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,50 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-	
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-
-	<!-- actual form -->
-	<jsfHtml:form> 	  
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Account Activation</b><br/>		
-	  	</td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		  <tr valign="top">
-            <td> 
-				 An activation e-mail has been sent to your registered email-address at <b>#{activation.userEmail}</b>.<br/><br/>
-				 <ul>
-				 	<li>You must first click on the <b>Acctivation Link</b> in the e-mail in order to become an active member of the website.</li>
-				 	<li>If you did not receive this e-mail, please check to make sure that your <b>Spam Filter</b> did not block the e-mail.</li>
-				 </ul>
-				 <br/><br/>
-				 If the problem persists, please contact the <b>Administrator</b>
-			</td>            
-         </tr>                                             		 	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the buttons -->	
-		<input type="hidden" name="id" value="#{param['id']}"/> 
-        <!--
-		<jsfHtml:commandButton type="button" onclick="javascript:history.back();" value="Back"/>		
-		&#160;&#160;&#160;						 	              			
-        -->
-		<jsfHtml:commandButton type="submit" action="open" value="Contact the Administrator"/>		
-     </jsfHtml:form>
-
-	</ui:define>
-</ui:composition>
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/activation/resendActivationConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,50 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+	
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+
+	<!-- actual form -->
+	<jsfHtml:form> 	  
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Account Activation</b><br/>		
+	  	</td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		  <tr valign="top">
+            <td> 
+				 An activation e-mail has been sent to your registered email-address at <b>#{activation.userEmail}</b>.<br/><br/>
+				 <ul>
+				 	<li>You must first click on the <b>Acctivation Link</b> in the e-mail in order to become an active member of the website.</li>
+				 	<li>If you did not receive this e-mail, please check to make sure that your <b>Spam Filter</b> did not block the e-mail.</li>
+				 </ul>
+				 <br/><br/>
+				 If the problem persists, please contact the <b>Administrator</b>
+			</td>            
+         </tr>                                             		 	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the buttons -->	
+		<input type="hidden" name="id" value="#{param['id']}"/> 
+        <!--
+		<jsfHtml:commandButton type="button" onclick="javascript:history.back();" value="Back"/>		
+		&#160;&#160;&#160;						 	              			
+        -->
+		<jsfHtml:commandButton type="submit" action="open" value="Contact the Administrator"/>		
+     </jsfHtml:form>
+
+	</ui:define>
+</ui:composition>
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/common)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,68 +0,0 @@
-<!--!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"-->
-
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-<!--link rel="stylesheet" type="text/css" id="main_css" href="/portal-core/themes/renaissance/portal_style.css"/-->
-
-
-<!-- generic error handling -->
-<jstlCore:if test="#{!(jbossfacelets:isAccessDenied())}">
-	<jstlCore:if test="#{(jbossfacelets:errorMsg())!=null}">
-    	<script type="text/javascript">
-			alert('${jbossfacelets:errorMsg()}. Please try again.');
-		</script>		
-	</jstlCore:if>
-</jstlCore:if>
-
-
-<!--div id="portal-container">   
-   <div id="sizer">
-      <div id="expander"-->
-
-		<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"-->
-    		
-
-			<jstlCore:choose>
-				<jstlCore:when test="#{!(jbossfacelets:isAccessDenied())}">
-					<!-- main content for this page -->
-					<ui:insert name="mainContent"/>
-            	</jstlCore:when>
-				<jstlCore:otherwise>
-                	<!-- access was denied so put up that message -->
-					<ui:include src="/admin/noauth.xhtml"/>
-				</jstlCore:otherwise>
-			</jstlCore:choose>
-            
-
-      		<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-->
-
-
-
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/common/common.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,68 @@
+<!--!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"-->
+
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+<!--link rel="stylesheet" type="text/css" id="main_css" href="/portal-core/themes/renaissance/portal_style.css"/-->
+
+
+<!-- generic error handling -->
+<jstlCore:if test="#{!(jbossfacelets:isAccessDenied())}">
+	<jstlCore:if test="#{(jbossfacelets:errorMsg())!=null}">
+    	<script type="text/javascript">
+			alert('${jbossfacelets:errorMsg()}. Please try again.');
+		</script>		
+	</jstlCore:if>
+</jstlCore:if>
+
+
+<!--div id="portal-container">   
+   <div id="sizer">
+      <div id="expander"-->
+
+		<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"-->
+    		
+
+			<jstlCore:choose>
+				<jstlCore:when test="#{!(jbossfacelets:isAccessDenied())}">
+					<!-- main content for this page -->
+					<ui:insert name="mainContent"/>
+            	</jstlCore:when>
+				<jstlCore:otherwise>
+                	<!-- access was denied so put up that message -->
+					<ui:include src="/admin/noauth.xhtml"/>
+				</jstlCore:otherwise>
+			</jstlCore:choose>
+            
+
+      		<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-->
+
+
+
+
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/Thumbs.db
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/Thumbs.db (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/Thumbs.db)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/000.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/000.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/000.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/001.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/001.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/001.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/002.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/002.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/002.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/003.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/003.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/003.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/004.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/004.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/004.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/005.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/005.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/005.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/006.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/006.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/006.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/007.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/007.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/007.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/008.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/008.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/008.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/009.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/009.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/009.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/010.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/010.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/010.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/011.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/011.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/011.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/012.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/012.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/012.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/013.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/013.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/013.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/014.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/014.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/014.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/015.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/015.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/015.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/016.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/016.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/016.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/017.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/017.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/017.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/018.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/018.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/018.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/019.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/019.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/019.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/Thumbs.db
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/Thumbs.db (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/Thumbs.db)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/blank.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/blank.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/avatars/blank.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/btn_go_grey.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/btn_go_grey.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/btn_go_grey.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/exit.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/exit.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/exit.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/home.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/home.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/home.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/info.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/info.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/info.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/search.gif
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/images/search.gif (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/images/search.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,76 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-	
-<ui:composition template="/admin/common/common.xhtml">
-<ui:define name="mainContent">
-
-
-<acl:isAllowed fragmentId="acl://userManagement">
-
-<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/index.jsf',true)}" styleClass="pn-title" >
-	<font class="pn-title">
-	<b>User Management - Control Panel</b></font>
-</jsfHtml:outputLink>
-<br/><br/><br/><br/>
-
-<table border="0" width="100%" cellspacing="1">
-
-<!-- display the icons -->
-<tr>
-<!-- search users -->
-<acl:isAllowed fragmentId="acl://searchUsers">
-<td align="center" valign="top">
-	<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/search/index.jsf',true)}">
-		<img src="#{jbossfacelets:contextPath()}/admin/images/info.gif" border="0" alt="Search"/>
-	</jsfHtml:outputLink><br/><br/>
-</td>
-</acl:isAllowed>
-
-
-	<!-- edit My Profile -->
-	<td align="center" valign="top">
-		<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}">
-			<img src="#{jbossfacelets:contextPath()}/admin/images/info.gif" border="0" alt="My Account"/>
-		</jsfHtml:outputLink><br/><br/>
-	</td>
-	
-</tr>
-
-<!-- display the labels corresponding to the icons -->
-<tr>
-<!-- search users -->
-<acl:isAllowed fragmentId="acl://searchUsers">
-<td align="center" valign="top">
-	<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/search/index.jsf',true)}">
-		Search
-	</jsfHtml:outputLink>
-<br/><br/>
-</td>
-</acl:isAllowed>
-
-<!-- edit My Profile -->
-<td align="center" valign="top">
-	<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}">
-		My Account
-	</jsfHtml:outputLink>
-<br/><br/>
-</td>
-
-
-</tr>
-
-</table>
-
-</acl:isAllowed>
-
-</ui:define>
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,76 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+	
+<ui:composition template="/admin/common/common.xhtml">
+<ui:define name="mainContent">
+
+
+<acl:isAllowed fragmentId="acl://userManagement">
+
+<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/index.jsf',true)}" styleClass="pn-title" >
+	<font class="pn-title">
+	<b>User Management - Control Panel</b></font>
+</jsfHtml:outputLink>
+<br/><br/><br/><br/>
+
+<table border="0" width="100%" cellspacing="1">
+
+<!-- display the icons -->
+<tr>
+<!-- search users -->
+<acl:isAllowed fragmentId="acl://searchUsers">
+<td align="center" valign="top">
+	<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/search/index.jsf',true)}">
+		<img src="#{jbossfacelets:contextPath()}/admin/images/info.gif" border="0" alt="Search"/>
+	</jsfHtml:outputLink><br/><br/>
+</td>
+</acl:isAllowed>
+
+
+	<!-- edit My Profile -->
+	<td align="center" valign="top">
+		<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}">
+			<img src="#{jbossfacelets:contextPath()}/admin/images/info.gif" border="0" alt="My Account"/>
+		</jsfHtml:outputLink><br/><br/>
+	</td>
+	
+</tr>
+
+<!-- display the labels corresponding to the icons -->
+<tr>
+<!-- search users -->
+<acl:isAllowed fragmentId="acl://searchUsers">
+<td align="center" valign="top">
+	<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/search/index.jsf',true)}">
+		Search
+	</jsfHtml:outputLink>
+<br/><br/>
+</td>
+</acl:isAllowed>
+
+<!-- edit My Profile -->
+<td align="center" valign="top">
+	<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}">
+		My Account
+	</jsfHtml:outputLink>
+<br/><br/>
+</td>
+
+
+</tr>
+
+</table>
+
+</acl:isAllowed>
+
+</ui:define>
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,33 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-	
-
-	<div align="center">
-		<!-- actual form -->
-		<jsfHtml:form>  	              
-      	<table border="0" cellpadding="5">
-	  		<tr>
-	  			<td align="center"><b>User Management</b><br/>		
-	  		</td>
-	  		</tr>	  
-	  		<tr>
-	  	<td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		  <tr valign="top">
-            <td> 
-				 <b>Access Denied</b> - You are not authorized to perform this function.
-			</td>            
-         </tr>                                             		 	 			 		 			
-		</table>
-        </td></tr></table>        
-     </jsfHtml:form>
-     </div>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/noauth.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,33 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+	
+
+	<div align="center">
+		<!-- actual form -->
+		<jsfHtml:form>  	              
+      	<table border="0" cellpadding="5">
+	  		<tr>
+	  			<td align="center"><b>User Management</b><br/>		
+	  		</td>
+	  		</tr>	  
+	  		<tr>
+	  	<td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		  <tr valign="top">
+            <td> 
+				 <b>Access Denied</b> - You are not authorized to perform this function.
+			</td>            
+         </tr>                                             		 	 			 		 			
+		</table>
+        </td></tr></table>        
+     </jsfHtml:form>
+     </div>
+
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,85 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-	<ui:define name="mainContent">         		                
-            <div>
-             <fieldset>
-             <legend>
-             		<b>Reset Your Old JBoss.com Password</b>
-             </legend>
-			 <table align="center">
-             	<tr><td>
-             	<span style="color:red">
-             	<b>The site has been moved to a more secure JBoss Portal based infrastructure.
-			 	Your Old JBoss.com password needs to be reset</b>
-			 	</span>
-			 	</td></tr>
-			 </table><br/>
-             <jsfHtml:form>	
-					<table align="center" colspan="2">					
-					<tr>
-					<td>
-						<label for="username">Username:</label>			   		                    
-					</td>
-					<td>
-						<jsfHtml:inputText id="username" size="26" maxlength="60" value="#{resetNukesPass.helper.uname}" required="true"/>            		  
-					</td>
-					</tr>
-
-					<tr>
-					<td>
-						<label for="password">Password:</label>			   		                    	
-					</td>
-					<td>
-						<jsfHtml:inputSecret id="password" size="26" maxlength="60" value="#{resetNukesPass.password}"/>            		  
-					</td>
-					</tr>
-			
-					<tr>
-					<td>
-               			<label for="new_password">New Password:</label>			   		                    
-					</td>
-					<td>
-						<jsfHtml:inputSecret id="pass1" size="26" maxlength="60" value="#{resetNukesPass.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
-            		  		<jsfCore:validateLength minimum="8"/>
-            		  		<jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            	    	</jsfHtml:inputSecret> 
-            	    <jsfHtml:message for="pass1" tooltip="true" style="color:red"/>
-					</td>
-					</tr>
-					
-					<tr>
-					<td>
-               			<label for="confirm_password">Confirm Password:</label>			   		
-					</td>
-					<td>
-						<jsfHtml:inputSecret id="pass2" size="26" maxlength="60" value="#{resetNukesPass.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
-            				<jsfCore:validateLength minimum="8"/>
-            				<jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            			</jsfHtml:inputSecret>
-            			<jsfHtml:message for="pass2" tooltip="true" style="color:red"/>
-                    	<jsfHtml:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
-						<jsfHtml:message for="passwordCheck" tooltip="true" style="color:red"/>
-					</td>
-					</tr>										
-					</table><br/>
-					<table align="center">
-						<tr>
-							<td>
-								<jsfHtml:commandButton type="submit" action="#{resetNukesPass.changePassword}" value="Reset Password"/>
-							</td>
-						</tr>
-				    </table>
-              </jsfHtml:form>
-             </fieldset>
-            </div>            
-    </ui:define>
-</ui:composition>
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPass.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,85 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+	<ui:define name="mainContent">         		                
+            <div>
+             <fieldset>
+             <legend>
+             		<b>Reset Your Old JBoss.com Password</b>
+             </legend>
+			 <table align="center">
+             	<tr><td>
+             	<span style="color:red">
+             	<b>The site has been moved to a more secure JBoss Portal based infrastructure.
+			 	Your Old JBoss.com password needs to be reset</b>
+			 	</span>
+			 	</td></tr>
+			 </table><br/>
+             <jsfHtml:form>	
+					<table align="center" colspan="2">					
+					<tr>
+					<td>
+						<label for="username">Username:</label>			   		                    
+					</td>
+					<td>
+						<jsfHtml:inputText id="username" size="26" maxlength="60" value="#{resetNukesPass.helper.uname}" required="true"/>            		  
+					</td>
+					</tr>
+
+					<tr>
+					<td>
+						<label for="password">Password:</label>			   		                    	
+					</td>
+					<td>
+						<jsfHtml:inputSecret id="password" size="26" maxlength="60" value="#{resetNukesPass.password}"/>            		  
+					</td>
+					</tr>
+			
+					<tr>
+					<td>
+               			<label for="new_password">New Password:</label>			   		                    
+					</td>
+					<td>
+						<jsfHtml:inputSecret id="pass1" size="26" maxlength="60" value="#{resetNukesPass.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
+            		  		<jsfCore:validateLength minimum="8"/>
+            		  		<jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            	    	</jsfHtml:inputSecret> 
+            	    <jsfHtml:message for="pass1" tooltip="true" style="color:red"/>
+					</td>
+					</tr>
+					
+					<tr>
+					<td>
+               			<label for="confirm_password">Confirm Password:</label>			   		
+					</td>
+					<td>
+						<jsfHtml:inputSecret id="pass2" size="26" maxlength="60" value="#{resetNukesPass.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
+            				<jsfCore:validateLength minimum="8"/>
+            				<jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            			</jsfHtml:inputSecret>
+            			<jsfHtml:message for="pass2" tooltip="true" style="color:red"/>
+                    	<jsfHtml:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
+						<jsfHtml:message for="passwordCheck" tooltip="true" style="color:red"/>
+					</td>
+					</tr>										
+					</table><br/>
+					<table align="center">
+						<tr>
+							<td>
+								<jsfHtml:commandButton type="submit" action="#{resetNukesPass.changePassword}" value="Reset Password"/>
+							</td>
+						</tr>
+				    </table>
+              </jsfHtml:form>
+             </fieldset>
+            </div>            
+    </ui:define>
+</ui:composition>
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,23 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-	<ui:define name="mainContent">
-            <div id="login-container">
-             <fieldset>
-             <legend>
-             		Reset Password           		
-             </legend>
-              	Your password was successfully reset.
-             </fieldset>
-            </div>
-    </ui:define>
-</ui:composition>
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/resetNukesPassConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,23 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+	<ui:define name="mainContent">
+            <div id="login-container">
+             <fieldset>
+             <legend>
+             		Reset Password           		
+             </legend>
+              	Your password was successfully reset.
+             </fieldset>
+            </div>
+    </ui:define>
+</ui:composition>
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,36 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-            <div id="login-container">
-             <fieldset>
-             	<legend>
-             		Secret Question (${lostPassword.username}) - ${lostPassword.helper.question}             		
-             	</legend>
-              	<jsfHtml:form>               
-					<!-- secret answer text field -->
-			   		<label for="secret_answer">Secret Answer:</label>
-			   		<jsfHtml:inputSecret value="#{lostPassword.secretAnswer}"/>
-                    <jstlCore:if test="#{lostPassword.answerMatchFailed}">
-						<br/><span style="color:red">Your answer does not match</span>
-					</jstlCore:if>
-					<br/>
-
-					<jsfHtml:commandButton type="submit" action="#{lostPassword.verifySecretAnswer}" value="Submit"/>
-             	</jsfHtml:form>
-             </fieldset>
-            </div>            
-	</ui:define>
-
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestion.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,36 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+            <div id="login-container">
+             <fieldset>
+             	<legend>
+             		Secret Question (${lostPassword.username}) - ${lostPassword.helper.question}             		
+             	</legend>
+              	<jsfHtml:form>               
+					<!-- secret answer text field -->
+			   		<label for="secret_answer">Secret Answer:</label>
+			   		<jsfHtml:inputSecret value="#{lostPassword.secretAnswer}"/>
+                    <jstlCore:if test="#{lostPassword.answerMatchFailed}">
+						<br/><span style="color:red">Your answer does not match</span>
+					</jstlCore:if>
+					<br/>
+
+					<jsfHtml:commandButton type="submit" action="#{lostPassword.verifySecretAnswer}" value="Submit"/>
+             	</jsfHtml:form>
+             </fieldset>
+            </div>            
+	</ui:define>
+
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,28 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-            <div id="login-container">
-             <fieldset>
-             <legend>
-             		Retrieve Forgotten Password           		            		
-             </legend>
-              	An email is sent to your registered email address at <b style="color:red">${lostPassword.helper.realemail}</b>.<br/><br/>
-				Please follow the directions that will
-				allow you to <b>reset your password</b>.
-             </fieldset>
-            </div>
-    </ui:define>
-
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/secretQuestionConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,28 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+            <div id="login-container">
+             <fieldset>
+             <legend>
+             		Retrieve Forgotten Password           		            		
+             </legend>
+              	An email is sent to your registered email address at <b style="color:red">${lostPassword.helper.realemail}</b>.<br/><br/>
+				Please follow the directions that will
+				allow you to <b>reset your password</b>.
+             </fieldset>
+            </div>
+    </ui:define>
+
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,63 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">         
-
-
-		 <jstlCore:if test="#{lostPassword.inActive}">
-            <jsfHtml:form>
-            <div id="login-container">
-             <fieldset>
-             <legend>
-             		Retrieve Forgotten Password           		            		
-             </legend>
-              	Cannot retrieve your password. Your account has not been activated yet. 
-				<br/><br/>
-				Please
-               	<jsfHtml:commandLink action="resendActivation">
-					<jsfCore:param name="input" value="resend"/>
-					<jsfCore:param name="id" value="#{lostPassword.username}"/>
-               		<b style="color:red">Click Here</b>
-               	</jsfHtml:commandLink>
-               	to receive your activation email again.
-             </fieldset>
-            </div>        
-			</jsfHtml:form>    
-         </jstlCore:if>
-
-
-		         
-		 <jstlCore:if test="#{!lostPassword.inActive}">         
-            <div id="login-container">
-             <fieldset>
-             	<legend>
-             		 Retrieve Forgotten Password           		
-             	</legend>
-              	<jsfHtml:form>               
-					<!-- username text field -->
-			   		<label for="username">Username:</label>
-			   		<jsfHtml:inputText id="Username" value="#{lostPassword.username}" required="true" binding="#{profileValidator.uname}"/><br/>
-					<jsfHtml:inputHidden id="checkUsernameExists" validator="#{profileValidator.checkUsernameExists}" value="stub"/>
-            		<jsfHtml:message for="Username" tooltip="true" style="color:red"/>
-            		<jsfHtml:message for="checkUsernameExists" tooltip="true" style="color:red"/>
-					<br/>
-
-					<jsfHtml:commandButton type="submit" action="#{lostPassword.verifyUser}" value="Submit"/>
-             	</jsfHtml:form>
-             </fieldset>
-            </div>            
-		 </jstlCore:if>
-
-
-      </ui:define>
-	  </ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/startLostPassword.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,63 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">         
+
+
+		 <jstlCore:if test="#{lostPassword.inActive}">
+            <jsfHtml:form>
+            <div id="login-container">
+             <fieldset>
+             <legend>
+             		Retrieve Forgotten Password           		            		
+             </legend>
+              	Cannot retrieve your password. Your account has not been activated yet. 
+				<br/><br/>
+				Please
+               	<jsfHtml:commandLink action="resendActivation">
+					<jsfCore:param name="input" value="resend"/>
+					<jsfCore:param name="id" value="#{lostPassword.username}"/>
+               		<b style="color:red">Click Here</b>
+               	</jsfHtml:commandLink>
+               	to receive your activation email again.
+             </fieldset>
+            </div>        
+			</jsfHtml:form>    
+         </jstlCore:if>
+
+
+		         
+		 <jstlCore:if test="#{!lostPassword.inActive}">         
+            <div id="login-container">
+             <fieldset>
+             	<legend>
+             		 Retrieve Forgotten Password           		
+             	</legend>
+              	<jsfHtml:form>               
+					<!-- username text field -->
+			   		<label for="username">Username:</label>
+			   		<jsfHtml:inputText id="Username" value="#{lostPassword.username}" required="true" binding="#{profileValidator.uname}"/><br/>
+					<jsfHtml:inputHidden id="checkUsernameExists" validator="#{profileValidator.checkUsernameExists}" value="stub"/>
+            		<jsfHtml:message for="Username" tooltip="true" style="color:red"/>
+            		<jsfHtml:message for="checkUsernameExists" tooltip="true" style="color:red"/>
+					<br/>
+
+					<jsfHtml:commandButton type="submit" action="#{lostPassword.verifyUser}" value="Submit"/>
+             	</jsfHtml:form>
+             </fieldset>
+            </div>            
+		 </jstlCore:if>
+
+
+      </ui:define>
+	  </ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,64 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-         
-		 <!-- illegal access message -->
-         <jstlCore:if test="#{reset.illegalAccess}">        
-         <table border="0" cellpadding="0" cellspacing="0" id="header-container">
-            <tr>
-               <td align="center" valign="top">
-               		<b style="color:red">Access Denied</b> - This is an illegal attempt to access the site.               		
-               </td>
-            </tr>            
-         </table>
-         </jstlCore:if>
-         
-		 <jstlCore:if test="#{!reset.illegalAccess}">        
-            <div id="login-container">
-             <fieldset>
-             <legend>
-             		Reset Password - (${reset.helper.uname})            		
-             </legend>
-              	<jsfHtml:form>
-					<input type="hidden" name="id" value="#{param['id']}"/>
-					<input type="hidden" name="token" value="#{param['token']}"/>
-
-               		<label for="new_password">New Password:</label>			   		
-                    <jsfHtml:inputSecret id="pass1" size="26" maxlength="60" value="#{reset.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
-            		  <jsfCore:validateLength minimum="8"/>
-            		  <jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            	    </jsfHtml:inputSecret> 
-            	    <jsfHtml:message for="pass1" tooltip="true" style="color:red"/>
-					<br/>
-					
-               		<label for="confirm_password">Confirm Password:</label>
-			   		<jsfHtml:inputSecret id="pass2" size="26" maxlength="60" value="#{myPassword.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
-            			<jsfCore:validateLength minimum="8"/>
-            			<jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            		</jsfHtml:inputSecret>
-            		<jsfHtml:message for="pass2" tooltip="true" style="color:red"/>
-                    <jsfHtml:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
-					<jsfHtml:message for="passwordCheck" tooltip="true" style="color:red"/>
-					<br/>
-					               		
-                    <jsfHtml:commandButton type="submit" action="#{reset.changePassword}" value="Reset Password"/>
-              	</jsfHtml:form>
-             </fieldset>
-            </div>            
-		 </jstlCore:if>
-
-
-      </ui:define>
-	  </ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPassword.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,64 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+         
+		 <!-- illegal access message -->
+         <jstlCore:if test="#{reset.illegalAccess}">        
+         <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+            <tr>
+               <td align="center" valign="top">
+               		<b style="color:red">Access Denied</b> - This is an illegal attempt to access the site.               		
+               </td>
+            </tr>            
+         </table>
+         </jstlCore:if>
+         
+		 <jstlCore:if test="#{!reset.illegalAccess}">        
+            <div id="login-container">
+             <fieldset>
+             <legend>
+             		Reset Password - (${reset.helper.uname})            		
+             </legend>
+              	<jsfHtml:form>
+					<input type="hidden" name="id" value="#{param['id']}"/>
+					<input type="hidden" name="token" value="#{param['token']}"/>
+
+               		<label for="new_password">New Password:</label>			   		
+                    <jsfHtml:inputSecret id="pass1" size="26" maxlength="60" value="#{reset.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
+            		  <jsfCore:validateLength minimum="8"/>
+            		  <jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            	    </jsfHtml:inputSecret> 
+            	    <jsfHtml:message for="pass1" tooltip="true" style="color:red"/>
+					<br/>
+					
+               		<label for="confirm_password">Confirm Password:</label>
+			   		<jsfHtml:inputSecret id="pass2" size="26" maxlength="60" value="#{myPassword.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
+            			<jsfCore:validateLength minimum="8"/>
+            			<jsfCore:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            		</jsfHtml:inputSecret>
+            		<jsfHtml:message for="pass2" tooltip="true" style="color:red"/>
+                    <jsfHtml:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
+					<jsfHtml:message for="passwordCheck" tooltip="true" style="color:red"/>
+					<br/>
+					               		
+                    <jsfHtml:commandButton type="submit" action="#{reset.changePassword}" value="Reset Password"/>
+              	</jsfHtml:form>
+             </fieldset>
+            </div>            
+		 </jstlCore:if>
+
+
+      </ui:define>
+	  </ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,26 +0,0 @@
-<div  xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-            <div id="login-container">
-             <fieldset>
-             <legend>
-             		Reset Password - (${reset.helper.uname})            		
-             </legend>
-              	Your password was successfully reset.
-             </fieldset>
-            </div>
-    </ui:define>
-
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/password/tempPasswordConf.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,26 @@
+<div  xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+            <div id="login-container">
+             <fieldset>
+             <legend>
+             		Reset Password - (${reset.helper.uname})            		
+             </legend>
+              	Your password was successfully reset.
+             </fieldset>
+            </div>
+    </ui:define>
+
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,91 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-
-<ui:define name="mainContent">
-<!-- actual form -->
-<h:form id="changeMyPasswordForm">  
-    <center>
-	  <c:if test="#{param['caller']!=null}">
-		<input type="hidden" name="caller" value="#{param['caller']}"/> 						
-      </c:if>            
-	  <br/>
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Change My Password</b><br/>
-		(All fields marked with an asterisk (*) are required and must not be left blank.)
-	  	</td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">	
-         <tr valign="top">
-            <td>Current Password: *</td>
-            <td>
-            	<h:inputSecret id="currentPass1" size="26" maxlength="60" value="" required="true" binding="#{profileValidator.currentPassword}"/>
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>	  
-         <tr valign="top">
-            <td>New Password: *</td>
-            <td>
-            	<h:inputSecret id="pass1" size="26" maxlength="60" value="#{myPassword.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
-            		<f:validateLength minimum="8"/>
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            	</h:inputSecret> 
-            	<h:message for="pass1" tooltip="true" style="color:red"/>           	
-            </td>
-	</tr>
-	<tr valign="top">
-            <td>Confirm your New Password: *</td>
-            <td>
-            	<h:inputSecret id="pass2" size="26" maxlength="60" value="#{myPassword.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
-            		<f:validateLength minimum="8"/>
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            	</h:inputSecret>
-            	<h:message for="pass2" tooltip="true" style="color:red"/>            	
-            </td>
-         </tr>          
-         <tr valign="top">
-         	<td align="center" colspan="2">
-         		<h:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
-				<h:inputHidden id="currentPasswordCheck" validator="#{profileValidator.currentPasswordCheck}" value="stub"/>
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-            	<h:message for="passwordCheck" tooltip="true" style="color:red"/><br/><br/>
-				<h:message for="currentPasswordCheck" tooltip="true" style="color:red"/>
-         	</td>
-         </tr>	 	 
-		<tr>
-			<td>&#160;</td>
-		</tr>	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the buttons -->				
-		<h:commandButton type="submit" action="#{myPassword.changePassword}" value="OK"/>
-		&#160;&#160;		
-		<h:commandButton type="button" value="Cancel" immediate="true"
-        onclick="javascript:window.location.href='#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}';"/>		
-        </center>
-   </h:form>
-</ui:define>
-
-
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/changeMyPassword.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,91 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+
+<ui:define name="mainContent">
+<!-- actual form -->
+<h:form id="changeMyPasswordForm">  
+    <center>
+	  <c:if test="#{param['caller']!=null}">
+		<input type="hidden" name="caller" value="#{param['caller']}"/> 						
+      </c:if>            
+	  <br/>
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Change My Password</b><br/>
+		(All fields marked with an asterisk (*) are required and must not be left blank.)
+	  	</td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">	
+         <tr valign="top">
+            <td>Current Password: *</td>
+            <td>
+            	<h:inputSecret id="currentPass1" size="26" maxlength="60" value="" required="true" binding="#{profileValidator.currentPassword}"/>
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>	  
+         <tr valign="top">
+            <td>New Password: *</td>
+            <td>
+            	<h:inputSecret id="pass1" size="26" maxlength="60" value="#{myPassword.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
+            		<f:validateLength minimum="8"/>
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            	</h:inputSecret> 
+            	<h:message for="pass1" tooltip="true" style="color:red"/>           	
+            </td>
+	</tr>
+	<tr valign="top">
+            <td>Confirm your New Password: *</td>
+            <td>
+            	<h:inputSecret id="pass2" size="26" maxlength="60" value="#{myPassword.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
+            		<f:validateLength minimum="8"/>
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            	</h:inputSecret>
+            	<h:message for="pass2" tooltip="true" style="color:red"/>            	
+            </td>
+         </tr>          
+         <tr valign="top">
+         	<td align="center" colspan="2">
+         		<h:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
+				<h:inputHidden id="currentPasswordCheck" validator="#{profileValidator.currentPasswordCheck}" value="stub"/>
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+            	<h:message for="passwordCheck" tooltip="true" style="color:red"/><br/><br/>
+				<h:message for="currentPasswordCheck" tooltip="true" style="color:red"/>
+         	</td>
+         </tr>	 	 
+		<tr>
+			<td>&#160;</td>
+		</tr>	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the buttons -->				
+		<h:commandButton type="submit" action="#{myPassword.changePassword}" value="OK"/>
+		&#160;&#160;		
+		<h:commandButton type="button" value="Cancel" immediate="true"
+        onclick="javascript:window.location.href='#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}';"/>		
+        </center>
+   </h:form>
+</ui:define>
+
+
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,35 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-
-<ui:composition template="/admin/common/common.xhtml">
-	<ui:define name="mainContent">
-    <div class="box">
-	   <div align="center">	
-	      <div class="pn-title" style="padding: 0em 0em 1em">Welcome to JBoss.com registration area.</div>
-	      <div class="pn-normal" style="padding: 1em">You must be 18 or over, or have parental permission to register here.</div>
-	      <h:form>	
-	      	<h:commandLink action="register">      	      
-	      		<f:verbatim>I am 18 or over or I have parental consent</f:verbatim>
-	      	</h:commandLink>
-	      </h:form>
-	      <div class="pn-normal" style="padding: 1em">
-			(By clicking on the above link you certify that you are either<br/> 
-			18 or over, or that you have parental consent to register here.)</div>
-	      <h:form>
-	      	<h:commandLink action="underage">
-	      		<f:verbatim>I am under 18 and do not have parental consent.</f:verbatim>
-	      	</h:commandLink>	
-	      </h:form>
-	   </div>
-   </div>   
-   </ui:define>
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/checkage.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,35 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+
+<ui:composition template="/admin/common/common.xhtml">
+	<ui:define name="mainContent">
+    <div class="box">
+	   <div align="center">	
+	      <div class="pn-title" style="padding: 0em 0em 1em">Welcome to JBoss.com registration area.</div>
+	      <div class="pn-normal" style="padding: 1em">You must be 18 or over, or have parental permission to register here.</div>
+	      <h:form>	
+	      	<h:commandLink action="register">      	      
+	      		<f:verbatim>I am 18 or over or I have parental consent</f:verbatim>
+	      	</h:commandLink>
+	      </h:form>
+	      <div class="pn-normal" style="padding: 1em">
+			(By clicking on the above link you certify that you are either<br/> 
+			18 or over, or that you have parental consent to register here.)</div>
+	      <h:form>
+	      	<h:commandLink action="underage">
+	      		<f:verbatim>I am under 18 and do not have parental consent.</f:verbatim>
+	      	</h:commandLink>	
+	      </h:form>
+	   </div>
+   </div>   
+   </ui:define>
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,21 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-   <ui:define name="mainContent">
-   <div class="box">
-	   <div align="center">	
-	      <div class="pn-title" style="padding: 0em 0em 1em">You are now registered. You should receive your "Account Activation" link at the e-mail account you provided.</div>
-	   </div>	      
-   </div>   
-   </ui:define>
-
-</ui:composition>
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/confirmation.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,21 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+   <ui:define name="mainContent">
+   <div class="box">
+	   <div align="center">	
+	      <div class="pn-title" style="padding: 0em 0em 1em">You are now registered. You should receive your "Account Activation" link at the e-mail account you provided.</div>
+	   </div>	      
+   </div>   
+   </ui:define>
+
+</ui:composition>
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,400 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-<ui:define name="mainContent">
-
-
-<c:if test="#{editProfile.userNotFound}">
-	<div class="pn-normal" style="padding: 1em">User not found.</div>
-</c:if>
-
-
-<c:if test="#{!editProfile.userNotFound}">
-
-<script language="javascript">
-function checkAll(form)
-{
-   if (form["editForm:uname"].value.length==0)
-   {
-      alert('UserName cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:pass1"].value.length == 0)
-   {
-      alert('Password cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:pass2"].value.length == 0)
-   {
-      alert('Confirm Password cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:pass1"].value.length &amp;lt; 8)
-   {
-      alert('The password must be atleast 8 characters long.');
-      return false;
-   }
-   if(form["editForm:pass1"].value != form["editForm:pass2"].value)
-   {
-   	  alert('The confirmation password does not match the password.');
-   	  return false;
-   }
-   if(form["editForm:pass1"].value.length&amp;gt;0)
-   {
-   		//make sure the password has atleast 2 of the following character types, uppercase,lowercase,number, and symbol
-   		var firstMatch = 0;
-   		var secondMatch = 0;
-
-   		//check for whitespaces
-   		if(form["editForm:pass1"].value.match(/\s+/))
-   		{
-   			alert('The password should not contain any white spaces.');
-   			return false;
-   		}
-
-   		//check if atleast one uppercase character is found
-   		if(form["editForm:pass1"].value.match(/[A-Z]+/))
-   		{
-   			if(firstMatch==0)
-   			{
-   				firstMatch = 1;
-   			}
-   			else
-   			{
-   				secondMatch = 1;
-   			}
-   		}
-   		//check if atleast one lowercase character is found
-		if(form["editForm:pass1"].value.match(/[a-z]+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		//check if atleast one numeric character is found
-		if(form["editForm:pass1"].value.match(/\d+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		//check if atleast one symbolic character is found
-		if(form["editForm:pass1"].value.match(/\W+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		if(firstMatch==0 || secondMatch ==0)
-   		{
-   			alert('The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.');
-   			return false;
-   		}
-   }
-   if (form["editForm:realemail"].value.length == 0)
-   {
-      alert('Real Email cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:confirmrealemail"].value.length == 0)
-   {
-      alert('Confirm Real Email cannot be left blank.');
-      return false;
-   }
-   if(form["editForm:realemail"].value != form["editForm:confirmrealemail"].value)
-   {
-   	  alert('Your Real Email value does not match the Confirm Real Email value.');
-   	  return false;
-   }
-   if (form["editForm:fname"].value.length == 0)
-   {
-      alert('First Name cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:lname"].value.length == 0)
-   {
-      alert('Last Name cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:cname"].value.length == 0)
-   {
-      alert('Company Name cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:role"].value.length == 0)
-   {
-      alert('Role cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:title"].value.length == 0)
-   {
-      alert('Title cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:country"].value.length == 0)
-   {
-      alert('Country cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:phone"].value.length == 0)
-   {
-      alert('Phone cannot be left blank.');
-      return false;
-   }      
-   if (form["editForm:street"].value.length == 0)
-   {
-      alert('Street Address cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:city"].value.length == 0)
-   {
-      alert('City cannot be left blank.');
-      return false;
-   }   
-   if (form["editForm:usertype"].value.length == 0)
-   {
-      alert('User Type cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:companysize"].value.length == 0)
-   {
-      alert('Size of company cannot be left blank.');
-      return false;
-   }
-   var interest_arr = new Array(form["editForm:interestinjboss_eval"], form["editForm:interestinjboss_dev"], form["editForm:interestinjboss_deploy"]);
-   if (!isChecked(interest_arr))
-   {
-      alert("Interest in JBoss, must be selected");
-      return false;
-   }
-   if (form["editForm:industry"].value.length == 0)
-   {
-      alert('Industry cannot be left blanks.');
-      return false;
-   }         
-   if (form["editForm:salescontact"].checked &amp;&amp; form["editForm:supportcontact"].checked)
-   {
-      alert("Please uncheck either the 'optout of email' or the 'support contact' checkboxes.");
-      return false;
-   }
-   return true;
-}
-    
-	function isChecked(input_arr)
-	{
-	   var notchecked = 0;
-	   var k = 0;
-	   for (k; input_arr[k]; k++)
-	   {
-	      if(!input_arr[k].checked)
-	      {
-	         notchecked++;
-	      }
-	   }
-	   if (notchecked == input_arr.length)
-	      return false;
-	   else
-	   return true;
-	}
-
-  function changeList() 
-  {
-  	document.getElementById("toggle").style.display = "none";
-  	document.editForm["editForm:state"].value = "Other";
-  }
-
-  function stateBasedOnCountry() 
-  {	  
-	  if (document.editForm["editForm:country"].value != "USA")
-	  {
-	  		changeList();
-	  }
-	  else if(document.editForm["editForm:country"].value == "USA")
-	  {
-		document.getElementById("toggle").style.display = "";
-	  	document.editForm["editForm:state"].value = "";
-	  }	  
-   }
-</script>
-
-
-<div align="center">
-
-
-<!-- actual form -->
-<h:form id="editForm"> 
-	  <input type="hidden" name="id" value="#{param['id']}"/>
-      <c:if test="#{param['caller']!=null}">
-		<input type="hidden" name="caller" value="#{param['caller']}"/> 						
-      </c:if> 			     
-	  <br/>
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Member Profile</b><br/>
-		(All fields marked with an asterisk (*) are required and must not be left blank.)
-	  	</td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		  <tr valign="top">
-            <td>Username: *</td>
-            <td> 
-            	#{editProfile.helper.uname}
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>                                    
-         <tr valign="top">
-		 	<td>Real e-mail: *</td>
-            <td>
-            	<h:inputText id="realemail" size="26" maxlength="60" value="#{editProfile.helper.realemail}" required="true" binding="#{profileValidator.realemail}">
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
-            	</h:inputText>
-            	<h:message for="realemail" tooltip="true" style="color:red"/>
-            	<br/>            	
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>         
-         <tr valign="top">
-		 	<td>Fake e-mail: </td>
-            <td><h:inputText id="fakeemail" size="26" maxlength="60" value="#{editProfile.helper.fakeemail}"/></td><br/>
-			<td width="20"></td>
-            <td>&#160;</td>
-            <td>&#160;</td>
-            <br/>
-         </tr>
-         <tr valign="top">
-            <td>Secret question: *</td>
-            <td>
-				<h:inputText id="question" size="26" maxlength="26" value="#{editProfile.helper.question}" required="true"/>
-				<h:message for="question" tooltip="true" style="color:red"/>
-			</td>
-			<td width="20"></td>
-			<td>Secret answer: *</td>
-            <td>
-				<h:inputText id="answer" size="26" maxlength="26" value="#{editProfile.helper.answer}"/>
-				<h:message for="answer" tooltip="true" style="color:red"/>
-			</td>
-         </tr>
-	 	 <tr valign="top">
-				<td>First Name: *</td>
-				<td>
-					<h:inputText id="fname" size="26" maxlength="26" value="#{editProfile.helper.fname}" required="true"/>
-					<h:message for="fname" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Last Name: *</td>
-				<td>
-					<h:inputText id="lname" size="26" maxlength="26" value="#{editProfile.helper.lname}" required="true"/>
-					<h:message for="lname" tooltip="true" style="color:red"/>
-				</td>
-	 	  </tr>
-	 	  <tr valign="top">
-				<td>Company Name: *</td>
-				<td>
-					<h:inputText id="cname" size="26" maxlength="26" value="#{editProfile.helper.cname}" required="true"/>
-					<h:message for="cname" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Role: *</td>
-				<td>
-				    <h:selectOneMenu id="role" value="#{editProfile.helper.role}" required="true">
-				    	<f:selectItems value="#{editProfile.helper.roles}"/>					
-                	</h:selectOneMenu>
-                	<h:message for="role" tooltip="true" style="color:red"/>
-               </td>
-	 		</tr>
-			<tr valign="top">
-				<td>Title: *</td>
-				<td>
-					<h:inputText id="title" size="26" maxlength="26" value="#{editProfile.helper.title}" required="true"/>
-					<h:message for="title" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Country: *</td>
-				<td>				    
-					<h:selectOneMenu id="country" styleClass="pn-normal" onchange="return stateBasedOnCountry();" value="#{editProfile.helper.country}" required="true">
-					    <f:selectItems value="#{editProfile.helper.countries}"/>
-					</h:selectOneMenu>
-					<h:message for="country" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Phone: *</td>
-				<td>
-					<h:inputText id="phone" size="26" maxlength="26" value="#{editProfile.helper.phone}" required="true"/>
-					<h:message for="phone" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Street Address: *</td>
-				<td>
-					<h:inputText id="street" size="26" maxlength="26" value="#{editProfile.helper.street}" required="true"/>
-					<h:message for="street" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>City: *</td>
-				<td>
-					<h:inputText id="city" size="26" maxlength="26" value="#{editProfile.helper.city}" required="true"/>
-					<h:message for="city" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>State: </td>
-				<td>
-				<div id="toggle" style="width:auto;">
-				  <h:selectOneMenu id="state" styleClass="pn-normal" value="#{editProfile.helper.state}">
-					    <f:selectItems value="#{editProfile.helper.states}"/>
-				  </h:selectOneMenu>                  
-                </div></td>
-				<td width="20"></td>
-				<td>Postal Code: </td>
-				<td><h:inputText id="zip" size="26" maxlength="26" value="#{editProfile.helper.zip}"/></td>
-	 		</tr>
-			<tr>
-				<td>&#160;</td>
-			</tr>	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the buttons -->				
-		<h:commandButton type="submit" action="#{editProfile.edit}" value="OK"/>&#160;&#160;
-		<h:commandButton type="submit" action="cancel" value="Cancel" immediate="true"/>		                		
-   </h:form>
-   <br/>
-</div>
-
-</c:if>
-
-
-</ui:define>
-</ui:composition>
-
-
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/edit.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,400 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+<ui:define name="mainContent">
+
+
+<c:if test="#{editProfile.userNotFound}">
+	<div class="pn-normal" style="padding: 1em">User not found.</div>
+</c:if>
+
+
+<c:if test="#{!editProfile.userNotFound}">
+
+<script language="javascript">
+function checkAll(form)
+{
+   if (form["editForm:uname"].value.length==0)
+   {
+      alert('UserName cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:pass1"].value.length == 0)
+   {
+      alert('Password cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:pass2"].value.length == 0)
+   {
+      alert('Confirm Password cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:pass1"].value.length &amp;lt; 8)
+   {
+      alert('The password must be atleast 8 characters long.');
+      return false;
+   }
+   if(form["editForm:pass1"].value != form["editForm:pass2"].value)
+   {
+   	  alert('The confirmation password does not match the password.');
+   	  return false;
+   }
+   if(form["editForm:pass1"].value.length&amp;gt;0)
+   {
+   		//make sure the password has atleast 2 of the following character types, uppercase,lowercase,number, and symbol
+   		var firstMatch = 0;
+   		var secondMatch = 0;
+
+   		//check for whitespaces
+   		if(form["editForm:pass1"].value.match(/\s+/))
+   		{
+   			alert('The password should not contain any white spaces.');
+   			return false;
+   		}
+
+   		//check if atleast one uppercase character is found
+   		if(form["editForm:pass1"].value.match(/[A-Z]+/))
+   		{
+   			if(firstMatch==0)
+   			{
+   				firstMatch = 1;
+   			}
+   			else
+   			{
+   				secondMatch = 1;
+   			}
+   		}
+   		//check if atleast one lowercase character is found
+		if(form["editForm:pass1"].value.match(/[a-z]+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		//check if atleast one numeric character is found
+		if(form["editForm:pass1"].value.match(/\d+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		//check if atleast one symbolic character is found
+		if(form["editForm:pass1"].value.match(/\W+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		if(firstMatch==0 || secondMatch ==0)
+   		{
+   			alert('The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.');
+   			return false;
+   		}
+   }
+   if (form["editForm:realemail"].value.length == 0)
+   {
+      alert('Real Email cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:confirmrealemail"].value.length == 0)
+   {
+      alert('Confirm Real Email cannot be left blank.');
+      return false;
+   }
+   if(form["editForm:realemail"].value != form["editForm:confirmrealemail"].value)
+   {
+   	  alert('Your Real Email value does not match the Confirm Real Email value.');
+   	  return false;
+   }
+   if (form["editForm:fname"].value.length == 0)
+   {
+      alert('First Name cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:lname"].value.length == 0)
+   {
+      alert('Last Name cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:cname"].value.length == 0)
+   {
+      alert('Company Name cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:role"].value.length == 0)
+   {
+      alert('Role cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:title"].value.length == 0)
+   {
+      alert('Title cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:country"].value.length == 0)
+   {
+      alert('Country cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:phone"].value.length == 0)
+   {
+      alert('Phone cannot be left blank.');
+      return false;
+   }      
+   if (form["editForm:street"].value.length == 0)
+   {
+      alert('Street Address cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:city"].value.length == 0)
+   {
+      alert('City cannot be left blank.');
+      return false;
+   }   
+   if (form["editForm:usertype"].value.length == 0)
+   {
+      alert('User Type cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:companysize"].value.length == 0)
+   {
+      alert('Size of company cannot be left blank.');
+      return false;
+   }
+   var interest_arr = new Array(form["editForm:interestinjboss_eval"], form["editForm:interestinjboss_dev"], form["editForm:interestinjboss_deploy"]);
+   if (!isChecked(interest_arr))
+   {
+      alert("Interest in JBoss, must be selected");
+      return false;
+   }
+   if (form["editForm:industry"].value.length == 0)
+   {
+      alert('Industry cannot be left blanks.');
+      return false;
+   }         
+   if (form["editForm:salescontact"].checked &amp;&amp; form["editForm:supportcontact"].checked)
+   {
+      alert("Please uncheck either the 'optout of email' or the 'support contact' checkboxes.");
+      return false;
+   }
+   return true;
+}
+    
+	function isChecked(input_arr)
+	{
+	   var notchecked = 0;
+	   var k = 0;
+	   for (k; input_arr[k]; k++)
+	   {
+	      if(!input_arr[k].checked)
+	      {
+	         notchecked++;
+	      }
+	   }
+	   if (notchecked == input_arr.length)
+	      return false;
+	   else
+	   return true;
+	}
+
+  function changeList() 
+  {
+  	document.getElementById("toggle").style.display = "none";
+  	document.editForm["editForm:state"].value = "Other";
+  }
+
+  function stateBasedOnCountry() 
+  {	  
+	  if (document.editForm["editForm:country"].value != "USA")
+	  {
+	  		changeList();
+	  }
+	  else if(document.editForm["editForm:country"].value == "USA")
+	  {
+		document.getElementById("toggle").style.display = "";
+	  	document.editForm["editForm:state"].value = "";
+	  }	  
+   }
+</script>
+
+
+<div align="center">
+
+
+<!-- actual form -->
+<h:form id="editForm"> 
+	  <input type="hidden" name="id" value="#{param['id']}"/>
+      <c:if test="#{param['caller']!=null}">
+		<input type="hidden" name="caller" value="#{param['caller']}"/> 						
+      </c:if> 			     
+	  <br/>
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Member Profile</b><br/>
+		(All fields marked with an asterisk (*) are required and must not be left blank.)
+	  	</td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		  <tr valign="top">
+            <td>Username: *</td>
+            <td> 
+            	#{editProfile.helper.uname}
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>                                    
+         <tr valign="top">
+		 	<td>Real e-mail: *</td>
+            <td>
+            	<h:inputText id="realemail" size="26" maxlength="60" value="#{editProfile.helper.realemail}" required="true" binding="#{profileValidator.realemail}">
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
+            	</h:inputText>
+            	<h:message for="realemail" tooltip="true" style="color:red"/>
+            	<br/>            	
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>         
+         <tr valign="top">
+		 	<td>Fake e-mail: </td>
+            <td><h:inputText id="fakeemail" size="26" maxlength="60" value="#{editProfile.helper.fakeemail}"/></td><br/>
+			<td width="20"></td>
+            <td>&#160;</td>
+            <td>&#160;</td>
+            <br/>
+         </tr>
+         <tr valign="top">
+            <td>Secret question: *</td>
+            <td>
+				<h:inputText id="question" size="26" maxlength="26" value="#{editProfile.helper.question}" required="true"/>
+				<h:message for="question" tooltip="true" style="color:red"/>
+			</td>
+			<td width="20"></td>
+			<td>Secret answer: *</td>
+            <td>
+				<h:inputText id="answer" size="26" maxlength="26" value="#{editProfile.helper.answer}"/>
+				<h:message for="answer" tooltip="true" style="color:red"/>
+			</td>
+         </tr>
+	 	 <tr valign="top">
+				<td>First Name: *</td>
+				<td>
+					<h:inputText id="fname" size="26" maxlength="26" value="#{editProfile.helper.fname}" required="true"/>
+					<h:message for="fname" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Last Name: *</td>
+				<td>
+					<h:inputText id="lname" size="26" maxlength="26" value="#{editProfile.helper.lname}" required="true"/>
+					<h:message for="lname" tooltip="true" style="color:red"/>
+				</td>
+	 	  </tr>
+	 	  <tr valign="top">
+				<td>Company Name: *</td>
+				<td>
+					<h:inputText id="cname" size="26" maxlength="26" value="#{editProfile.helper.cname}" required="true"/>
+					<h:message for="cname" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Role: *</td>
+				<td>
+				    <h:selectOneMenu id="role" value="#{editProfile.helper.role}" required="true">
+				    	<f:selectItems value="#{editProfile.helper.roles}"/>					
+                	</h:selectOneMenu>
+                	<h:message for="role" tooltip="true" style="color:red"/>
+               </td>
+	 		</tr>
+			<tr valign="top">
+				<td>Title: *</td>
+				<td>
+					<h:inputText id="title" size="26" maxlength="26" value="#{editProfile.helper.title}" required="true"/>
+					<h:message for="title" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Country: *</td>
+				<td>				    
+					<h:selectOneMenu id="country" styleClass="pn-normal" onchange="return stateBasedOnCountry();" value="#{editProfile.helper.country}" required="true">
+					    <f:selectItems value="#{editProfile.helper.countries}"/>
+					</h:selectOneMenu>
+					<h:message for="country" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Phone: *</td>
+				<td>
+					<h:inputText id="phone" size="26" maxlength="26" value="#{editProfile.helper.phone}" required="true"/>
+					<h:message for="phone" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Street Address: *</td>
+				<td>
+					<h:inputText id="street" size="26" maxlength="26" value="#{editProfile.helper.street}" required="true"/>
+					<h:message for="street" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>City: *</td>
+				<td>
+					<h:inputText id="city" size="26" maxlength="26" value="#{editProfile.helper.city}" required="true"/>
+					<h:message for="city" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>State: </td>
+				<td>
+				<div id="toggle" style="width:auto;">
+				  <h:selectOneMenu id="state" styleClass="pn-normal" value="#{editProfile.helper.state}">
+					    <f:selectItems value="#{editProfile.helper.states}"/>
+				  </h:selectOneMenu>                  
+                </div></td>
+				<td width="20"></td>
+				<td>Postal Code: </td>
+				<td><h:inputText id="zip" size="26" maxlength="26" value="#{editProfile.helper.zip}"/></td>
+	 		</tr>
+			<tr>
+				<td>&#160;</td>
+			</tr>	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the buttons -->				
+		<h:commandButton type="submit" action="#{editProfile.edit}" value="OK"/>&#160;&#160;
+		<h:commandButton type="submit" action="cancel" value="Cancel" immediate="true"/>		                		
+   </h:form>
+   <br/>
+</div>
+
+</c:if>
+
+
+</ui:define>
+</ui:composition>
+
+
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,402 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-<ui:define name="mainContent">
-
-<c:if test="#{editMyProfile.userNotFound}">
-	<div class="pn-normal" style="padding: 1em">User not found.</div>
-</c:if>
-
-
-<c:if test="#{!editMyProfile.userNotFound}">
-
-<script language="javascript">
-function checkAll(form)
-{
-   if (form["editForm:uname"].value.length==0)
-   {
-      alert('UserName cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:pass1"].value.length == 0)
-   {
-      alert('Password cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:pass2"].value.length == 0)
-   {
-      alert('Confirm Password cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:pass1"].value.length &amp;lt; 8)
-   {
-      alert('The password must be atleast 8 characters long.');
-      return false;
-   }
-   if(form["editForm:pass1"].value != form["editForm:pass2"].value)
-   {
-   	  alert('The confirmation password does not match the password.');
-   	  return false;
-   }
-   if(form["editForm:pass1"].value.length&amp;gt;0)
-   {
-   		//make sure the password has atleast 2 of the following character types, uppercase,lowercase,number, and symbol
-   		var firstMatch = 0;
-   		var secondMatch = 0;
-
-   		//check for whitespaces
-   		if(form["editForm:pass1"].value.match(/\s+/))
-   		{
-   			alert('The password should not contain any white spaces.');
-   			return false;
-   		}
-
-   		//check if atleast one uppercase character is found
-   		if(form["editForm:pass1"].value.match(/[A-Z]+/))
-   		{
-   			if(firstMatch==0)
-   			{
-   				firstMatch = 1;
-   			}
-   			else
-   			{
-   				secondMatch = 1;
-   			}
-   		}
-   		//check if atleast one lowercase character is found
-		if(form["editForm:pass1"].value.match(/[a-z]+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		//check if atleast one numeric character is found
-		if(form["editForm:pass1"].value.match(/\d+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		//check if atleast one symbolic character is found
-		if(form["editForm:pass1"].value.match(/\W+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		if(firstMatch==0 || secondMatch ==0)
-   		{
-   			alert('The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.');
-   			return false;
-   		}
-   }
-   if (form["editForm:realemail"].value.length == 0)
-   {
-      alert('Real Email cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:confirmrealemail"].value.length == 0)
-   {
-      alert('Confirm Real Email cannot be left blank.');
-      return false;
-   }
-   if(form["editForm:realemail"].value != form["editForm:confirmrealemail"].value)
-   {
-   	  alert('Your Real Email value does not match the Confirm Real Email value.');
-   	  return false;
-   }
-   if (form["editForm:fname"].value.length == 0)
-   {
-      alert('First Name cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:lname"].value.length == 0)
-   {
-      alert('Last Name cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:cname"].value.length == 0)
-   {
-      alert('Company Name cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:role"].value.length == 0)
-   {
-      alert('Role cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:title"].value.length == 0)
-   {
-      alert('Title cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:country"].value.length == 0)
-   {
-      alert('Country cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:phone"].value.length == 0)
-   {
-      alert('Phone cannot be left blank.');
-      return false;
-   }      
-   if (form["editForm:street"].value.length == 0)
-   {
-      alert('Street Address cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:city"].value.length == 0)
-   {
-      alert('City cannot be left blank.');
-      return false;
-   }   
-   if (form["editForm:usertype"].value.length == 0)
-   {
-      alert('User Type cannot be left blank.');
-      return false;
-   }
-   if (form["editForm:companysize"].value.length == 0)
-   {
-      alert('Size of company cannot be left blank.');
-      return false;
-   }
-   var interest_arr = new Array(form["editForm:interestinjboss_eval"], form["editForm:interestinjboss_dev"], form["editForm:interestinjboss_deploy"]);
-   if (!isChecked(interest_arr))
-   {
-      alert("Interest in JBoss, must be selected");
-      return false;
-   }
-   if (form["editForm:industry"].value.length == 0)
-   {
-      alert('Industry cannot be left blanks.');
-      return false;
-   }         
-   if (form["editForm:salescontact"].checked &amp;&amp; form["editForm:supportcontact"].checked)
-   {
-      alert("Please uncheck either the 'optout of email' or the 'support contact' checkboxes.");
-      return false;
-   }
-   return true;
-}
-    
-	function isChecked(input_arr)
-	{
-	   var notchecked = 0;
-	   var k = 0;
-	   for (k; input_arr[k]; k++)
-	   {
-	      if(!input_arr[k].checked)
-	      {
-	         notchecked++;
-	      }
-	   }
-	   if (notchecked == input_arr.length)
-	      return false;
-	   else
-	   return true;
-	}
-
-  function changeList() 
-  {
-  	document.getElementById("toggle").style.display = "none";
-  	document.editForm["editForm:state"].value = "Other";
-  }
-
-  function stateBasedOnCountry() 
-  {	  
-	  if (document.editForm["editForm:country"].value != "USA")
-	  {
-	  		changeList();
-	  }
-	  else if(document.editForm["editForm:country"].value == "USA")
-	  {
-		document.getElementById("toggle").style.display = "";
-	  	document.editForm["editForm:state"].value = "";
-	  }	  
-   }
-</script>
-
-
-<div align="center">
-
-
-
-<!-- actual form -->
-<h:form id="editForm">  
-	  <c:if test="#{param['caller']!=null}">
-		<input type="hidden" name="caller" value="#{param['caller']}"/> 						
-      </c:if>            
-	  <br/>
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Member Profile</b><br/>
-		(All fields marked with an asterisk (*) are required and must not be left blank.)
-	  	</td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		  <tr valign="top">
-            <td>Username: *</td>
-            <td> 
-            	#{editMyProfile.helper.uname}
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>                                    
-         <tr valign="top">
-		 	<td>Real e-mail: *</td>
-            <td>
-            	<h:inputText id="realemail" size="26" maxlength="60" value="#{editMyProfile.helper.realemail}" required="true" binding="#{profileValidator.realemail}">
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
-            	</h:inputText>
-            	<h:message for="realemail" tooltip="true" style="color:red"/>
-            	<br/>            	
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>         
-         <tr valign="top">
-		 	<td>Fake e-mail: </td>
-            <td><h:inputText id="fakeemail" size="26" maxlength="60" value="#{editMyProfile.helper.fakeemail}"/></td><br/>
-			<td width="20"></td>
-            <td>&#160;</td>
-            <td>&#160;</td>
-            <br/>
-         </tr>
-         <tr valign="top">
-            <td>Secret question: *</td>
-            <td>
-				<h:inputText id="question" size="26" maxlength="26" value="#{editMyProfile.helper.question}" required="true"/>
-				<h:message for="question" tooltip="true" style="color:red"/>
-			</td>
-			<td width="20"></td>
-			<td>Secret answer: *</td>
-            <td>
-				<h:inputText id="answer" size="26" maxlength="26" value="#{editMyProfile.helper.answer}" required="true"/>
-				<h:message for="answer" tooltip="true" style="color:red"/>
-			</td>
-         </tr>
-	 	 <tr valign="top">
-				<td>First Name: *</td>
-				<td>
-					<h:inputText id="fname" size="26" maxlength="26" value="#{editMyProfile.helper.fname}" required="true"/>
-					<h:message for="fname" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Last Name: *</td>
-				<td>
-					<h:inputText id="lname" size="26" maxlength="26" value="#{editMyProfile.helper.lname}" required="true"/>
-					<h:message for="lname" tooltip="true" style="color:red"/>
-				</td>
-	 	  </tr>
-	 	  <tr valign="top">
-				<td>Company Name: *</td>
-				<td>
-					<h:inputText id="cname" size="26" maxlength="26" value="#{editMyProfile.helper.cname}" required="true"/>
-					<h:message for="cname" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Role: *</td>
-				<td>
-				    <h:selectOneMenu id="role" value="#{editMyProfile.helper.role}" required="true">
-				    	<f:selectItems value="#{editMyProfile.helper.roles}"/>					
-                	</h:selectOneMenu>
-                	<h:message for="role" tooltip="true" style="color:red"/>
-               </td>
-	 		</tr>
-			<tr valign="top">
-				<td>Title: *</td>
-				<td>
-					<h:inputText id="title" size="26" maxlength="26" value="#{editMyProfile.helper.title}" required="true"/>
-					<h:message for="title" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Country: *</td>
-				<td>				    
-					<h:selectOneMenu id="country" styleClass="pn-normal" onchange="return stateBasedOnCountry();" value="#{editMyProfile.helper.country}" required="true">
-					    <f:selectItems value="#{editMyProfile.helper.countries}"/>
-					</h:selectOneMenu>
-					<h:message for="country" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Phone: *</td>
-				<td>
-					<h:inputText id="phone" size="26" maxlength="26" value="#{editMyProfile.helper.phone}" required="true"/>
-					<h:message for="phone" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Street Address: *</td>
-				<td>
-					<h:inputText id="street" size="26" maxlength="26" value="#{editMyProfile.helper.street}" required="true"/>
-					<h:message for="street" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>City: *</td>
-				<td>
-					<h:inputText id="city" size="26" maxlength="26" value="#{editMyProfile.helper.city}" required="true"/>
-					<h:message for="city" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>State: </td>
-				<td>
-				<div id="toggle" style="width:auto;">
-				  <h:selectOneMenu id="state" styleClass="pn-normal" value="#{editMyProfile.helper.state}">
-					    <f:selectItems value="#{editMyProfile.helper.states}"/>
-				  </h:selectOneMenu>                  
-                </div></td>
-				<td width="20"></td>
-				<td>Postal Code: </td>
-				<td><h:inputText id="zip" size="26" maxlength="26" value="#{editMyProfile.helper.zip}"/></td>
-	 		</tr>
-			<tr>
-				<td>&#160;</td>
-			</tr>	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the buttons -->				
-		<h:commandButton type="submit" action="#{editMyProfile.edit}" value="OK"/>
-		&#160;&#160;
-		<h:commandButton type="button" value="Change Password" immediate="true" 
-		onclick="javascript:window.location.href='#{jbossfacelets:outputLink('/admin/profile/changeMyPassword.jsf',true)}';"/>
-		&#160;&#160;
-		<h:commandButton type="submit" action="cancel" value="Cancel" immediate="true"/>		
-   </h:form>
-   <br/>
-</div>
-
-</c:if>
-
-
-</ui:define>
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/editMyProfile.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,402 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+<ui:define name="mainContent">
+
+<c:if test="#{editMyProfile.userNotFound}">
+	<div class="pn-normal" style="padding: 1em">User not found.</div>
+</c:if>
+
+
+<c:if test="#{!editMyProfile.userNotFound}">
+
+<script language="javascript">
+function checkAll(form)
+{
+   if (form["editForm:uname"].value.length==0)
+   {
+      alert('UserName cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:pass1"].value.length == 0)
+   {
+      alert('Password cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:pass2"].value.length == 0)
+   {
+      alert('Confirm Password cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:pass1"].value.length &amp;lt; 8)
+   {
+      alert('The password must be atleast 8 characters long.');
+      return false;
+   }
+   if(form["editForm:pass1"].value != form["editForm:pass2"].value)
+   {
+   	  alert('The confirmation password does not match the password.');
+   	  return false;
+   }
+   if(form["editForm:pass1"].value.length&amp;gt;0)
+   {
+   		//make sure the password has atleast 2 of the following character types, uppercase,lowercase,number, and symbol
+   		var firstMatch = 0;
+   		var secondMatch = 0;
+
+   		//check for whitespaces
+   		if(form["editForm:pass1"].value.match(/\s+/))
+   		{
+   			alert('The password should not contain any white spaces.');
+   			return false;
+   		}
+
+   		//check if atleast one uppercase character is found
+   		if(form["editForm:pass1"].value.match(/[A-Z]+/))
+   		{
+   			if(firstMatch==0)
+   			{
+   				firstMatch = 1;
+   			}
+   			else
+   			{
+   				secondMatch = 1;
+   			}
+   		}
+   		//check if atleast one lowercase character is found
+		if(form["editForm:pass1"].value.match(/[a-z]+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		//check if atleast one numeric character is found
+		if(form["editForm:pass1"].value.match(/\d+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		//check if atleast one symbolic character is found
+		if(form["editForm:pass1"].value.match(/\W+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		if(firstMatch==0 || secondMatch ==0)
+   		{
+   			alert('The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.');
+   			return false;
+   		}
+   }
+   if (form["editForm:realemail"].value.length == 0)
+   {
+      alert('Real Email cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:confirmrealemail"].value.length == 0)
+   {
+      alert('Confirm Real Email cannot be left blank.');
+      return false;
+   }
+   if(form["editForm:realemail"].value != form["editForm:confirmrealemail"].value)
+   {
+   	  alert('Your Real Email value does not match the Confirm Real Email value.');
+   	  return false;
+   }
+   if (form["editForm:fname"].value.length == 0)
+   {
+      alert('First Name cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:lname"].value.length == 0)
+   {
+      alert('Last Name cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:cname"].value.length == 0)
+   {
+      alert('Company Name cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:role"].value.length == 0)
+   {
+      alert('Role cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:title"].value.length == 0)
+   {
+      alert('Title cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:country"].value.length == 0)
+   {
+      alert('Country cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:phone"].value.length == 0)
+   {
+      alert('Phone cannot be left blank.');
+      return false;
+   }      
+   if (form["editForm:street"].value.length == 0)
+   {
+      alert('Street Address cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:city"].value.length == 0)
+   {
+      alert('City cannot be left blank.');
+      return false;
+   }   
+   if (form["editForm:usertype"].value.length == 0)
+   {
+      alert('User Type cannot be left blank.');
+      return false;
+   }
+   if (form["editForm:companysize"].value.length == 0)
+   {
+      alert('Size of company cannot be left blank.');
+      return false;
+   }
+   var interest_arr = new Array(form["editForm:interestinjboss_eval"], form["editForm:interestinjboss_dev"], form["editForm:interestinjboss_deploy"]);
+   if (!isChecked(interest_arr))
+   {
+      alert("Interest in JBoss, must be selected");
+      return false;
+   }
+   if (form["editForm:industry"].value.length == 0)
+   {
+      alert('Industry cannot be left blanks.');
+      return false;
+   }         
+   if (form["editForm:salescontact"].checked &amp;&amp; form["editForm:supportcontact"].checked)
+   {
+      alert("Please uncheck either the 'optout of email' or the 'support contact' checkboxes.");
+      return false;
+   }
+   return true;
+}
+    
+	function isChecked(input_arr)
+	{
+	   var notchecked = 0;
+	   var k = 0;
+	   for (k; input_arr[k]; k++)
+	   {
+	      if(!input_arr[k].checked)
+	      {
+	         notchecked++;
+	      }
+	   }
+	   if (notchecked == input_arr.length)
+	      return false;
+	   else
+	   return true;
+	}
+
+  function changeList() 
+  {
+  	document.getElementById("toggle").style.display = "none";
+  	document.editForm["editForm:state"].value = "Other";
+  }
+
+  function stateBasedOnCountry() 
+  {	  
+	  if (document.editForm["editForm:country"].value != "USA")
+	  {
+	  		changeList();
+	  }
+	  else if(document.editForm["editForm:country"].value == "USA")
+	  {
+		document.getElementById("toggle").style.display = "";
+	  	document.editForm["editForm:state"].value = "";
+	  }	  
+   }
+</script>
+
+
+<div align="center">
+
+
+
+<!-- actual form -->
+<h:form id="editForm">  
+	  <c:if test="#{param['caller']!=null}">
+		<input type="hidden" name="caller" value="#{param['caller']}"/> 						
+      </c:if>            
+	  <br/>
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Member Profile</b><br/>
+		(All fields marked with an asterisk (*) are required and must not be left blank.)
+	  	</td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		  <tr valign="top">
+            <td>Username: *</td>
+            <td> 
+            	#{editMyProfile.helper.uname}
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>                                    
+         <tr valign="top">
+		 	<td>Real e-mail: *</td>
+            <td>
+            	<h:inputText id="realemail" size="26" maxlength="60" value="#{editMyProfile.helper.realemail}" required="true" binding="#{profileValidator.realemail}">
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
+            	</h:inputText>
+            	<h:message for="realemail" tooltip="true" style="color:red"/>
+            	<br/>            	
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>         
+         <tr valign="top">
+		 	<td>Fake e-mail: </td>
+            <td><h:inputText id="fakeemail" size="26" maxlength="60" value="#{editMyProfile.helper.fakeemail}"/></td><br/>
+			<td width="20"></td>
+            <td>&#160;</td>
+            <td>&#160;</td>
+            <br/>
+         </tr>
+         <tr valign="top">
+            <td>Secret question: *</td>
+            <td>
+				<h:inputText id="question" size="26" maxlength="26" value="#{editMyProfile.helper.question}" required="true"/>
+				<h:message for="question" tooltip="true" style="color:red"/>
+			</td>
+			<td width="20"></td>
+			<td>Secret answer: *</td>
+            <td>
+				<h:inputText id="answer" size="26" maxlength="26" value="#{editMyProfile.helper.answer}" required="true"/>
+				<h:message for="answer" tooltip="true" style="color:red"/>
+			</td>
+         </tr>
+	 	 <tr valign="top">
+				<td>First Name: *</td>
+				<td>
+					<h:inputText id="fname" size="26" maxlength="26" value="#{editMyProfile.helper.fname}" required="true"/>
+					<h:message for="fname" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Last Name: *</td>
+				<td>
+					<h:inputText id="lname" size="26" maxlength="26" value="#{editMyProfile.helper.lname}" required="true"/>
+					<h:message for="lname" tooltip="true" style="color:red"/>
+				</td>
+	 	  </tr>
+	 	  <tr valign="top">
+				<td>Company Name: *</td>
+				<td>
+					<h:inputText id="cname" size="26" maxlength="26" value="#{editMyProfile.helper.cname}" required="true"/>
+					<h:message for="cname" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Role: *</td>
+				<td>
+				    <h:selectOneMenu id="role" value="#{editMyProfile.helper.role}" required="true">
+				    	<f:selectItems value="#{editMyProfile.helper.roles}"/>					
+                	</h:selectOneMenu>
+                	<h:message for="role" tooltip="true" style="color:red"/>
+               </td>
+	 		</tr>
+			<tr valign="top">
+				<td>Title: *</td>
+				<td>
+					<h:inputText id="title" size="26" maxlength="26" value="#{editMyProfile.helper.title}" required="true"/>
+					<h:message for="title" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Country: *</td>
+				<td>				    
+					<h:selectOneMenu id="country" styleClass="pn-normal" onchange="return stateBasedOnCountry();" value="#{editMyProfile.helper.country}" required="true">
+					    <f:selectItems value="#{editMyProfile.helper.countries}"/>
+					</h:selectOneMenu>
+					<h:message for="country" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Phone: *</td>
+				<td>
+					<h:inputText id="phone" size="26" maxlength="26" value="#{editMyProfile.helper.phone}" required="true"/>
+					<h:message for="phone" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Street Address: *</td>
+				<td>
+					<h:inputText id="street" size="26" maxlength="26" value="#{editMyProfile.helper.street}" required="true"/>
+					<h:message for="street" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>City: *</td>
+				<td>
+					<h:inputText id="city" size="26" maxlength="26" value="#{editMyProfile.helper.city}" required="true"/>
+					<h:message for="city" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>State: </td>
+				<td>
+				<div id="toggle" style="width:auto;">
+				  <h:selectOneMenu id="state" styleClass="pn-normal" value="#{editMyProfile.helper.state}">
+					    <f:selectItems value="#{editMyProfile.helper.states}"/>
+				  </h:selectOneMenu>                  
+                </div></td>
+				<td width="20"></td>
+				<td>Postal Code: </td>
+				<td><h:inputText id="zip" size="26" maxlength="26" value="#{editMyProfile.helper.zip}"/></td>
+	 		</tr>
+			<tr>
+				<td>&#160;</td>
+			</tr>	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the buttons -->				
+		<h:commandButton type="submit" action="#{editMyProfile.edit}" value="OK"/>
+		&#160;&#160;
+		<h:commandButton type="button" value="Change Password" immediate="true" 
+		onclick="javascript:window.location.href='#{jbossfacelets:outputLink('/admin/profile/changeMyPassword.jsf',true)}';"/>
+		&#160;&#160;
+		<h:commandButton type="submit" action="cancel" value="Cancel" immediate="true"/>		
+   </h:form>
+   <br/>
+</div>
+
+</c:if>
+
+
+</ui:define>
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,509 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-
-<script language="javascript">
-function checkAll(form)
-{
-   if (form["registrationForm:uname"].value.length==0)
-   {
-      alert('UserName cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:pass1"].value.length == 0)
-   {
-      alert('Password cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:pass2"].value.length == 0)
-   {
-      alert('Confirm Password cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:pass1"].value.length &lt; 8)
-   {
-      alert('The password must be atleast 8 characters long.');
-      return false;
-   }
-   if(form["registrationForm:pass1"].value != form["registrationForm:pass2"].value)
-   {
-   	  alert('The confirmation password does not match the password.');
-   	  return false;
-   }
-   if(form["registrationForm:pass1"].value.length&gt;0)
-   {
-   		//make sure the password has atleast 2 of the following character types, uppercase,lowercase,number, and symbol
-   		var firstMatch = 0;
-   		var secondMatch = 0;
-
-   		//check for whitespaces
-   		if(form["registrationForm:pass1"].value.match(/\s+/))
-   		{
-   			alert('The password should not contain any white spaces.');
-   			return false;
-   		}
-
-   		//check if atleast one uppercase character is found
-   		if(form["registrationForm:pass1"].value.match(/[A-Z]+/))
-   		{
-   			if(firstMatch==0)
-   			{
-   				firstMatch = 1;
-   			}
-   			else
-   			{
-   				secondMatch = 1;
-   			}
-   		}
-   		//check if atleast one lowercase character is found
-		if(form["registrationForm:pass1"].value.match(/[a-z]+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		//check if atleast one numeric character is found
-		if(form["registrationForm:pass1"].value.match(/\d+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		//check if atleast one symbolic character is found
-		if(form["registrationForm:pass1"].value.match(/\W+/))
-		{
-			if(firstMatch==0)
-			{
-				firstMatch = 1;
-			}
-			else
-			{
-				secondMatch = 1;
-			}
-   		}
-   		if(firstMatch==0 || secondMatch ==0)
-   		{
-   			alert('The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.');
-   			return false;
-   		}
-   }
-   if (form["registrationForm:realemail"].value.length == 0)
-   {
-      alert('Real Email cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:confirmrealemail"].value.length == 0)
-   {
-      alert('Confirm Real Email cannot be left blank.');
-      return false;
-   }
-   if(form["registrationForm:realemail"].value != form["registrationForm:confirmrealemail"].value)
-   {
-   	  alert('Your Real Email value does not match the Confirm Real Email value.');
-   	  return false;
-   }
-   if (form["registrationForm:fname"].value.length == 0)
-   {
-      alert('First Name cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:lname"].value.length == 0)
-   {
-      alert('Last Name cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:cname"].value.length == 0)
-   {
-      alert('Company Name cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:role"].value.length == 0)
-   {
-      alert('Role cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:title"].value.length == 0)
-   {
-      alert('Title cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:country"].value.length == 0)
-   {
-      alert('Country cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:phone"].value.length == 0)
-   {
-      alert('Phone cannot be left blank.');
-      return false;
-   }      
-   if (form["registrationForm:street"].value.length == 0)
-   {
-      alert('Street Address cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:city"].value.length == 0)
-   {
-      alert('City cannot be left blank.');
-      return false;
-   }   
-   if (form["registrationForm:usertype"].value.length == 0)
-   {
-      alert('User Type cannot be left blank.');
-      return false;
-   }
-   if (form["registrationForm:companysize"].value.length == 0)
-   {
-      alert('Size of company cannot be left blank.');
-      return false;
-   }
-   var interest_arr = new Array(form["registrationForm:interestinjboss_eval"], form["registrationForm:interestinjboss_dev"], form["registrationForm:interestinjboss_deploy"]);
-   if (!isChecked(interest_arr))
-   {
-      alert("Interest in JBoss, must be selected");
-      return false;
-   }
-   if (form["registrationForm:industry"].value.length == 0)
-   {
-      alert('Industry cannot be left blanks.');
-      return false;
-   }         
-   if (form["registrationForm:salescontact"].checked &amp;&amp; form["registrationForm:supportcontact"].checked)
-   {
-      alert("Please uncheck either the 'optout of email' or the 'support contact' checkboxes.");
-      return false;
-   }
-   return true;
-}
-    
-	function isChecked(input_arr)
-	{
-	   var notchecked = 0;
-	   var k = 0;
-	   for (k; input_arr[k]; k++)
-	   {
-	      if(!input_arr[k].checked)
-	      {
-	         notchecked++;
-	      }
-	   }
-	   if (notchecked == input_arr.length)
-	      return false;
-	   else
-	   return true;
-	}
-
-  function changeList() 
-  {
-  	document.getElementById("toggle").style.display = "none";
-  	document.registrationForm["registrationForm:state"].value = "Other";
-  }
-
-  function stateBasedOnCountry() 
-  {	  
-	  if (document.registrationForm["registrationForm:country"].value != "USA")
-	  {
-	  		changeList();
-	  }
-	  else if(document.registrationForm["registrationForm:country"].value == "USA")
-	  {
-		document.getElementById("toggle").style.display = "";
-	  	document.registrationForm["registrationForm:state"].value = "";
-	  }	  
-   }
-</script>
-<div align="center">
-<h:form id="registrationForm">
-      <div class="pn-title"><b>New user registration</b></div>                
-	        <br/>      	  	
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Member Registration</b><br/>
-		(All fields marked with an asterisk (*) are required and must not be left blank.)
-	  	</td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		         <tr valign="top">
-            <td>Username: *</td>
-            <td>
-            	<h:inputText id="uname" value="#{registrar.helper.uname}" size="26" maxlength="26" required="true" binding="#{profileValidator.uname}"/>
-            	<h:inputHidden id="checkUsername" validator="#{profileValidator.checkUsername}" value="stub"/>
-            	<h:message for="uname" tooltip="true" style="color:red"/>
-            	<h:message for="checkUsername" tooltip="true" style="color:red"/>
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>
-         <tr valign="top">
-            <td>Password: *</td>
-            <td>
-            	<h:inputSecret id="pass1" size="26" maxlength="60" value="#{registrar.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
-            		<f:validateLength minimum="8"/>
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            	</h:inputSecret> 
-            	<h:message for="pass1" tooltip="true" style="color:red"/>           	
-            </td>
-			<td width="20"></td>
-            <td>Confirm your password: *</td>
-            <td>
-            	<h:inputSecret id="pass2" size="26" maxlength="60" value="#{registrar.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
-            		<f:validateLength minimum="8"/>
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
-            	</h:inputSecret>
-            	<h:message for="pass2" tooltip="true" style="color:red"/>            	
-            </td>
-         </tr>          
-         <tr valign="top">
-         	<td align="center" colspan="2">
-         		<h:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-            	<h:message for="passwordCheck" tooltip="true" style="color:red"/>
-         	</td>
-         </tr>        
-         <tr valign="top">
-		 	<td>Real e-mail: *</td>
-            <td>
-            	<h:inputText id="realemail" size="26" maxlength="60" value="#{registrar.helper.realemail}" required="true" binding="#{profileValidator.realemail}">
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
-            	</h:inputText>
-            	<h:message for="realemail" tooltip="true" style="color:red"/>
-            	<br/>
-            	Valid e-mail address required (for e-mail verification process)
-            </td>
-			<td width="20"></td>
-            <td>Confirm Real e-mail: *</td>
-            <td>
-            	<h:inputText id="confirmrealemail" size="26" maxlength="60" value="#{registrar.helper.confirmrealemail}" required="true" binding="#{profileValidator.confirmrealemail}">
-            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
-            	</h:inputText>
-            	<h:message for="confirmrealemail" tooltip="true" style="color:red"/>
-            </td>
-            <br/>
-         </tr>
-         <tr valign="top">
-         	<td align="center" colspan="2">
-         		<h:inputHidden id="emailCheck" validator="#{profileValidator.emailCheck}" value="stub"/>
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
-            	<h:message for="emailCheck" tooltip="true" style="color:red"/>
-         	</td>
-         </tr>
-         <tr valign="top">
-		 	<td>Fake e-mail: </td>
-            <td><h:inputText id="fakeemail" size="26" maxlength="60" value="#{registrar.helper.fakeemail}"/></td><br/>
-			<td width="20"></td>
-            <td>&#160;</td>
-            <td>&#160;</td>
-            <br/>
-         </tr>
-         <tr valign="top">
-            <td>Secret question: *</td>
-            <td>
-				<h:inputText id="question" size="26" maxlength="26" value="#{registrar.helper.question}" required="true"/>
-				<h:message for="question" tooltip="true" style="color:red"/>
-			</td>
-			<td width="20"></td>
-			<td>Secret answer: *</td>
-            <td>
-				<h:inputText id="answer" size="26" maxlength="26" value="#{registrar.helper.answer}" required="true"/>
-				<h:message for="answer" tooltip="true" style="color:red"/>
-			</td>
-         </tr>
-	 	 <tr valign="top">
-				<td>First Name: *</td>
-				<td>
-					<h:inputText id="fname" size="26" maxlength="26" value="#{registrar.helper.fname}" required="true"/>
-					<h:message for="fname" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Last Name: *</td>
-				<td>
-					<h:inputText id="lname" size="26" maxlength="26" value="#{registrar.helper.lname}" required="true"/>
-					<h:message for="lname" tooltip="true" style="color:red"/>
-				</td>
-	 	  </tr>
-	 	  <tr valign="top">
-				<td>Company Name: *</td>
-				<td>
-					<h:inputText id="cname" size="26" maxlength="26" value="#{registrar.helper.cname}" required="true"/>
-					<h:message for="cname" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Role: *</td>
-				<td>
-				    <h:selectOneMenu id="role" value="#{registrar.helper.role}" required="true">
-				    	<f:selectItems value="#{registrar.helper.roles}"/>					
-                	</h:selectOneMenu>
-                	<h:message for="role" tooltip="true" style="color:red"/>
-               </td>
-	 		</tr>
-			<tr valign="top">
-				<td>Title: *</td>
-				<td>
-					<h:inputText id="title" size="26" maxlength="26" value="#{registrar.helper.title}" required="true"/>
-					<h:message for="title" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Country: *</td>
-				<td>				    
-					<h:selectOneMenu id="country" styleClass="pn-normal" onchange="return stateBasedOnCountry();" value="#{registrar.helper.country}" required="true">
-					    <f:selectItems value="#{registrar.helper.countries}"/>
-					</h:selectOneMenu>
-					<h:message for="country" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>Phone: *</td>
-				<td>
-					<h:inputText id="phone" size="26" maxlength="26" value="#{registrar.helper.phone}" required="true"/>
-					<h:message for="phone" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Street Address: *</td>
-				<td>
-					<h:inputText id="street" size="26" maxlength="26" value="#{registrar.helper.street}" required="true"/>
-					<h:message for="street" tooltip="true" style="color:red"/>
-				</td>
-				<td width="20"></td>
-				<td>City: *</td>
-				<td>
-					<h:inputText id="city" size="26" maxlength="26" value="#{registrar.helper.city}" required="true"/>
-					<h:message for="city" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>State: </td>
-				<td>
-				<div id="toggle" style="width:auto;">
-				  <h:selectOneMenu id="state" styleClass="pn-normal" value="#{registrar.helper.state}">
-					    <f:selectItems value="#{registrar.helper.states}"/>
-				  </h:selectOneMenu>                  
-                </div></td>
-				<td width="20"></td>
-				<td>Postal Code: </td>
-				<td><h:inputText id="zip" size="26" maxlength="26" value="#{registrar.helper.zip}"/></td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Type of Company: *</td>
-				<td>
-				    <h:selectOneMenu id="usertype" styleClass="pn-normal" value="#{registrar.helper.usertype}" required="true">
-					    <f:selectItems value="#{registrar.helper.usertypes}"/>
-				    </h:selectOneMenu>			    	
-				    <h:message for="usertype" tooltip="true" style="color:red"/>
-			    </td>
-				<td width="20"></td>
-				<td>Company size: *</td>
-				<td>
-				    <h:selectOneMenu id="companysize" styleClass="pn-normal" value="#{registrar.helper.companysize}" required="true">
-					    <f:selectItems value="#{registrar.helper.companysizes}"/>
-				    </h:selectOneMenu>					
-				    <h:message for="companysize" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Interest in JBoss: *</td>
-				<td>				    
-				    <h:selectManyCheckbox id="interestinjboss_eval" value="#{registrar.helper.interestinjboss_eval}" binding="#{profileValidator.interestinjboss_eval}">
-               			<f:selectItem itemValue="presently evaluating"/>                			         
-               		</h:selectManyCheckbox>      		
-               		<h:selectManyCheckbox id="interestinjboss_dev" value="#{registrar.helper.interestinjboss_dev}" binding="#{profileValidator.interestinjboss_dev}">
-               			<f:selectItem itemValue="using in development"/>               		
-               		</h:selectManyCheckbox>
-               		<h:selectManyCheckbox id="interestinjboss_deploy" value="#{registrar.helper.interestinjboss_deploy}" binding="#{profileValidator.interestinjboss_deploy}">
-               			<f:selectItem itemValue="using in deployment"/>
-               		</h:selectManyCheckbox>
-               		<h:inputHidden id="interestCheck" validator="#{profileValidator.interestCheck}" value="stub"/>
-               		<h:message for="interestCheck" tooltip="true" style="color:red"/>               		
-				</td>				
-				<td width="0">									
-				</td>
-				<td>Industry: *</td>
-				<td>
-				    <h:selectOneMenu id="industry" styleClass="pn-normal" value="#{registrar.helper.industry}" required="true">
-				      <f:selectItem itemValue="" itemLabel="Please Choose"/>
-					  <f:selectItem itemValue="comm_media" itemLabel="Communications/Media"/>
-					  <f:selectItem itemValue="consulting" itemLabel="Consulting"/>
-					  <f:selectItem itemValue="education" itemLabel="Education"/>
-					  <f:selectItem itemValue="energy_utilities" itemLabel="Energy/Utilities"/>
-					  <f:selectItem itemValue="finance_banking" itemLabel="Finance - Banking"/>
-					  <f:selectItem itemValue="finance_insurance" itemLabel="Finance - Insurance"/>
-					  <f:selectItem itemValue="government_federal" itemLabel="Government - Federal"/>
-					  <f:selectItem itemValue="government_state_local" itemLabel="Government - State/Local"/>
-					  <f:selectItem itemValue="healthcare" itemLabel="Healthcare"/>
-					  <f:selectItem itemValue="hospitality" itemLabel="Hospitality"/>
-					  <f:selectItem itemValue="manufacturing" itemLabel="Manufacturing"/>
-					  <f:selectItem itemValue="pharma_lifesciences" itemLabel="Pharmaceuticals/Life Sciences"/>
-					  <f:selectItem itemValue="retail" itemLabel="Retail"/>
-					  <f:selectItem itemValue="telecommunications" itemLabel="Telecommunications"/>
-					  <f:selectItem itemValue="transp_logistics" itemLabel="Transportation &amp;amp; Logistics"/>
-					  <f:selectItem itemValue="technology" itemLabel="Technology"/>
-					  <f:selectItem itemValue="travel" itemLabel="Travel"/>
-					  <f:selectItem itemValue="other" itemLabel="Other"/>
-				    </h:selectOneMenu>					
-				    <h:message for="industry" tooltip="true" style="color:red"/>
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-	 		    <td colspan="5">Click here to signup for the JBoss Newsletter:
-	 		    &#160;&#160;&#160;
-	 		        <h:selectBooleanCheckbox id="newsletter" value="#{registrar.helper.newsletter}"/>	 		    	
-	 		    </td>
-	 		</tr>
-	 		<tr valign="top">
-	 		    <td colspan="5">Click here to opt-out of ALL communication with JBoss including newsletters, announcements, and event confirmation e-mails:
-	 		    &#160;&#160;&#160;
-	 		    	<h:selectBooleanCheckbox id="salescontact" value="#{registrar.helper.salescontact}" binding="#{profileValidator.salescontact}"/>
-	 		    </td>
-	 		</tr>
-	 		<tr valign="top">
-	 		    <td colspan="5">Click here if you wish to be contacted by a JBoss representative regarding support, training, or consulting options:
-	 		    &#160;&#160;&#160;
-	 		    	<h:selectBooleanCheckbox id="supportcontact" value="#{registrar.helper.supportcontact}" binding="#{profileValidator.supportcontact}"/>
-	 		    	<h:inputHidden id="contactCheck" validator="#{profileValidator.contactCheck}" value="stub"/>
-               		<h:message for="contactCheck" tooltip="true" style="color:red"/>               		
-	 		    </td>	 		    
-	 		</tr>	 		 			
-		</table>
-        </td></tr></table>		
-		<h:commandButton action="#{registrar.register}" value="New user"/>
-   </h:form>
-   <br/>
-</div>
-
-</ui:define>
-</ui:composition>
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/register.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,509 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+
+<script language="javascript">
+function checkAll(form)
+{
+   if (form["registrationForm:uname"].value.length==0)
+   {
+      alert('UserName cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:pass1"].value.length == 0)
+   {
+      alert('Password cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:pass2"].value.length == 0)
+   {
+      alert('Confirm Password cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:pass1"].value.length &lt; 8)
+   {
+      alert('The password must be atleast 8 characters long.');
+      return false;
+   }
+   if(form["registrationForm:pass1"].value != form["registrationForm:pass2"].value)
+   {
+   	  alert('The confirmation password does not match the password.');
+   	  return false;
+   }
+   if(form["registrationForm:pass1"].value.length&gt;0)
+   {
+   		//make sure the password has atleast 2 of the following character types, uppercase,lowercase,number, and symbol
+   		var firstMatch = 0;
+   		var secondMatch = 0;
+
+   		//check for whitespaces
+   		if(form["registrationForm:pass1"].value.match(/\s+/))
+   		{
+   			alert('The password should not contain any white spaces.');
+   			return false;
+   		}
+
+   		//check if atleast one uppercase character is found
+   		if(form["registrationForm:pass1"].value.match(/[A-Z]+/))
+   		{
+   			if(firstMatch==0)
+   			{
+   				firstMatch = 1;
+   			}
+   			else
+   			{
+   				secondMatch = 1;
+   			}
+   		}
+   		//check if atleast one lowercase character is found
+		if(form["registrationForm:pass1"].value.match(/[a-z]+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		//check if atleast one numeric character is found
+		if(form["registrationForm:pass1"].value.match(/\d+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		//check if atleast one symbolic character is found
+		if(form["registrationForm:pass1"].value.match(/\W+/))
+		{
+			if(firstMatch==0)
+			{
+				firstMatch = 1;
+			}
+			else
+			{
+				secondMatch = 1;
+			}
+   		}
+   		if(firstMatch==0 || secondMatch ==0)
+   		{
+   			alert('The password must contain atleast 2 of the following types of characters : Uppercase, Lowercase, Numeric, and Symbol.');
+   			return false;
+   		}
+   }
+   if (form["registrationForm:realemail"].value.length == 0)
+   {
+      alert('Real Email cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:confirmrealemail"].value.length == 0)
+   {
+      alert('Confirm Real Email cannot be left blank.');
+      return false;
+   }
+   if(form["registrationForm:realemail"].value != form["registrationForm:confirmrealemail"].value)
+   {
+   	  alert('Your Real Email value does not match the Confirm Real Email value.');
+   	  return false;
+   }
+   if (form["registrationForm:fname"].value.length == 0)
+   {
+      alert('First Name cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:lname"].value.length == 0)
+   {
+      alert('Last Name cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:cname"].value.length == 0)
+   {
+      alert('Company Name cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:role"].value.length == 0)
+   {
+      alert('Role cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:title"].value.length == 0)
+   {
+      alert('Title cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:country"].value.length == 0)
+   {
+      alert('Country cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:phone"].value.length == 0)
+   {
+      alert('Phone cannot be left blank.');
+      return false;
+   }      
+   if (form["registrationForm:street"].value.length == 0)
+   {
+      alert('Street Address cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:city"].value.length == 0)
+   {
+      alert('City cannot be left blank.');
+      return false;
+   }   
+   if (form["registrationForm:usertype"].value.length == 0)
+   {
+      alert('User Type cannot be left blank.');
+      return false;
+   }
+   if (form["registrationForm:companysize"].value.length == 0)
+   {
+      alert('Size of company cannot be left blank.');
+      return false;
+   }
+   var interest_arr = new Array(form["registrationForm:interestinjboss_eval"], form["registrationForm:interestinjboss_dev"], form["registrationForm:interestinjboss_deploy"]);
+   if (!isChecked(interest_arr))
+   {
+      alert("Interest in JBoss, must be selected");
+      return false;
+   }
+   if (form["registrationForm:industry"].value.length == 0)
+   {
+      alert('Industry cannot be left blanks.');
+      return false;
+   }         
+   if (form["registrationForm:salescontact"].checked &amp;&amp; form["registrationForm:supportcontact"].checked)
+   {
+      alert("Please uncheck either the 'optout of email' or the 'support contact' checkboxes.");
+      return false;
+   }
+   return true;
+}
+    
+	function isChecked(input_arr)
+	{
+	   var notchecked = 0;
+	   var k = 0;
+	   for (k; input_arr[k]; k++)
+	   {
+	      if(!input_arr[k].checked)
+	      {
+	         notchecked++;
+	      }
+	   }
+	   if (notchecked == input_arr.length)
+	      return false;
+	   else
+	   return true;
+	}
+
+  function changeList() 
+  {
+  	document.getElementById("toggle").style.display = "none";
+  	document.registrationForm["registrationForm:state"].value = "Other";
+  }
+
+  function stateBasedOnCountry() 
+  {	  
+	  if (document.registrationForm["registrationForm:country"].value != "USA")
+	  {
+	  		changeList();
+	  }
+	  else if(document.registrationForm["registrationForm:country"].value == "USA")
+	  {
+		document.getElementById("toggle").style.display = "";
+	  	document.registrationForm["registrationForm:state"].value = "";
+	  }	  
+   }
+</script>
+<div align="center">
+<h:form id="registrationForm">
+      <div class="pn-title"><b>New user registration</b></div>                
+	        <br/>      	  	
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Member Registration</b><br/>
+		(All fields marked with an asterisk (*) are required and must not be left blank.)
+	  	</td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		         <tr valign="top">
+            <td>Username: *</td>
+            <td>
+            	<h:inputText id="uname" value="#{registrar.helper.uname}" size="26" maxlength="26" required="true" binding="#{profileValidator.uname}"/>
+            	<h:inputHidden id="checkUsername" validator="#{profileValidator.checkUsername}" value="stub"/>
+            	<h:message for="uname" tooltip="true" style="color:red"/>
+            	<h:message for="checkUsername" tooltip="true" style="color:red"/>
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>
+         <tr valign="top">
+            <td>Password: *</td>
+            <td>
+            	<h:inputSecret id="pass1" size="26" maxlength="60" value="#{registrar.helper.pass1}" required="true" binding="#{profileValidator.pass1}">
+            		<f:validateLength minimum="8"/>
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            	</h:inputSecret> 
+            	<h:message for="pass1" tooltip="true" style="color:red"/>           	
+            </td>
+			<td width="20"></td>
+            <td>Confirm your password: *</td>
+            <td>
+            	<h:inputSecret id="pass2" size="26" maxlength="60" value="#{registrar.helper.pass2}" required="true" binding="#{profileValidator.pass2}">
+            		<f:validateLength minimum="8"/>
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Password"/>
+            	</h:inputSecret>
+            	<h:message for="pass2" tooltip="true" style="color:red"/>            	
+            </td>
+         </tr>          
+         <tr valign="top">
+         	<td align="center" colspan="2">
+         		<h:inputHidden id="passwordCheck" validator="#{profileValidator.passwordCheck}" value="stub"/>
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+            	<h:message for="passwordCheck" tooltip="true" style="color:red"/>
+         	</td>
+         </tr>        
+         <tr valign="top">
+		 	<td>Real e-mail: *</td>
+            <td>
+            	<h:inputText id="realemail" size="26" maxlength="60" value="#{registrar.helper.realemail}" required="true" binding="#{profileValidator.realemail}">
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
+            	</h:inputText>
+            	<h:message for="realemail" tooltip="true" style="color:red"/>
+            	<br/>
+            	Valid e-mail address required (for e-mail verification process)
+            </td>
+			<td width="20"></td>
+            <td>Confirm Real e-mail: *</td>
+            <td>
+            	<h:inputText id="confirmrealemail" size="26" maxlength="60" value="#{registrar.helper.confirmrealemail}" required="true" binding="#{profileValidator.confirmrealemail}">
+            		<f:validator validatorId="org.jboss.website.jsf.validator.Email"/>
+            	</h:inputText>
+            	<h:message for="confirmrealemail" tooltip="true" style="color:red"/>
+            </td>
+            <br/>
+         </tr>
+         <tr valign="top">
+         	<td align="center" colspan="2">
+         		<h:inputHidden id="emailCheck" validator="#{profileValidator.emailCheck}" value="stub"/>
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+         		&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+            	<h:message for="emailCheck" tooltip="true" style="color:red"/>
+         	</td>
+         </tr>
+         <tr valign="top">
+		 	<td>Fake e-mail: </td>
+            <td><h:inputText id="fakeemail" size="26" maxlength="60" value="#{registrar.helper.fakeemail}"/></td><br/>
+			<td width="20"></td>
+            <td>&#160;</td>
+            <td>&#160;</td>
+            <br/>
+         </tr>
+         <tr valign="top">
+            <td>Secret question: *</td>
+            <td>
+				<h:inputText id="question" size="26" maxlength="26" value="#{registrar.helper.question}" required="true"/>
+				<h:message for="question" tooltip="true" style="color:red"/>
+			</td>
+			<td width="20"></td>
+			<td>Secret answer: *</td>
+            <td>
+				<h:inputText id="answer" size="26" maxlength="26" value="#{registrar.helper.answer}" required="true"/>
+				<h:message for="answer" tooltip="true" style="color:red"/>
+			</td>
+         </tr>
+	 	 <tr valign="top">
+				<td>First Name: *</td>
+				<td>
+					<h:inputText id="fname" size="26" maxlength="26" value="#{registrar.helper.fname}" required="true"/>
+					<h:message for="fname" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Last Name: *</td>
+				<td>
+					<h:inputText id="lname" size="26" maxlength="26" value="#{registrar.helper.lname}" required="true"/>
+					<h:message for="lname" tooltip="true" style="color:red"/>
+				</td>
+	 	  </tr>
+	 	  <tr valign="top">
+				<td>Company Name: *</td>
+				<td>
+					<h:inputText id="cname" size="26" maxlength="26" value="#{registrar.helper.cname}" required="true"/>
+					<h:message for="cname" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Role: *</td>
+				<td>
+				    <h:selectOneMenu id="role" value="#{registrar.helper.role}" required="true">
+				    	<f:selectItems value="#{registrar.helper.roles}"/>					
+                	</h:selectOneMenu>
+                	<h:message for="role" tooltip="true" style="color:red"/>
+               </td>
+	 		</tr>
+			<tr valign="top">
+				<td>Title: *</td>
+				<td>
+					<h:inputText id="title" size="26" maxlength="26" value="#{registrar.helper.title}" required="true"/>
+					<h:message for="title" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Country: *</td>
+				<td>				    
+					<h:selectOneMenu id="country" styleClass="pn-normal" onchange="return stateBasedOnCountry();" value="#{registrar.helper.country}" required="true">
+					    <f:selectItems value="#{registrar.helper.countries}"/>
+					</h:selectOneMenu>
+					<h:message for="country" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>Phone: *</td>
+				<td>
+					<h:inputText id="phone" size="26" maxlength="26" value="#{registrar.helper.phone}" required="true"/>
+					<h:message for="phone" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Street Address: *</td>
+				<td>
+					<h:inputText id="street" size="26" maxlength="26" value="#{registrar.helper.street}" required="true"/>
+					<h:message for="street" tooltip="true" style="color:red"/>
+				</td>
+				<td width="20"></td>
+				<td>City: *</td>
+				<td>
+					<h:inputText id="city" size="26" maxlength="26" value="#{registrar.helper.city}" required="true"/>
+					<h:message for="city" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>State: </td>
+				<td>
+				<div id="toggle" style="width:auto;">
+				  <h:selectOneMenu id="state" styleClass="pn-normal" value="#{registrar.helper.state}">
+					    <f:selectItems value="#{registrar.helper.states}"/>
+				  </h:selectOneMenu>                  
+                </div></td>
+				<td width="20"></td>
+				<td>Postal Code: </td>
+				<td><h:inputText id="zip" size="26" maxlength="26" value="#{registrar.helper.zip}"/></td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Type of Company: *</td>
+				<td>
+				    <h:selectOneMenu id="usertype" styleClass="pn-normal" value="#{registrar.helper.usertype}" required="true">
+					    <f:selectItems value="#{registrar.helper.usertypes}"/>
+				    </h:selectOneMenu>			    	
+				    <h:message for="usertype" tooltip="true" style="color:red"/>
+			    </td>
+				<td width="20"></td>
+				<td>Company size: *</td>
+				<td>
+				    <h:selectOneMenu id="companysize" styleClass="pn-normal" value="#{registrar.helper.companysize}" required="true">
+					    <f:selectItems value="#{registrar.helper.companysizes}"/>
+				    </h:selectOneMenu>					
+				    <h:message for="companysize" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Interest in JBoss: *</td>
+				<td>				    
+				    <h:selectManyCheckbox id="interestinjboss_eval" value="#{registrar.helper.interestinjboss_eval}" binding="#{profileValidator.interestinjboss_eval}">
+               			<f:selectItem itemValue="presently evaluating"/>                			         
+               		</h:selectManyCheckbox>      		
+               		<h:selectManyCheckbox id="interestinjboss_dev" value="#{registrar.helper.interestinjboss_dev}" binding="#{profileValidator.interestinjboss_dev}">
+               			<f:selectItem itemValue="using in development"/>               		
+               		</h:selectManyCheckbox>
+               		<h:selectManyCheckbox id="interestinjboss_deploy" value="#{registrar.helper.interestinjboss_deploy}" binding="#{profileValidator.interestinjboss_deploy}">
+               			<f:selectItem itemValue="using in deployment"/>
+               		</h:selectManyCheckbox>
+               		<h:inputHidden id="interestCheck" validator="#{profileValidator.interestCheck}" value="stub"/>
+               		<h:message for="interestCheck" tooltip="true" style="color:red"/>               		
+				</td>				
+				<td width="0">									
+				</td>
+				<td>Industry: *</td>
+				<td>
+				    <h:selectOneMenu id="industry" styleClass="pn-normal" value="#{registrar.helper.industry}" required="true">
+				      <f:selectItem itemValue="" itemLabel="Please Choose"/>
+					  <f:selectItem itemValue="comm_media" itemLabel="Communications/Media"/>
+					  <f:selectItem itemValue="consulting" itemLabel="Consulting"/>
+					  <f:selectItem itemValue="education" itemLabel="Education"/>
+					  <f:selectItem itemValue="energy_utilities" itemLabel="Energy/Utilities"/>
+					  <f:selectItem itemValue="finance_banking" itemLabel="Finance - Banking"/>
+					  <f:selectItem itemValue="finance_insurance" itemLabel="Finance - Insurance"/>
+					  <f:selectItem itemValue="government_federal" itemLabel="Government - Federal"/>
+					  <f:selectItem itemValue="government_state_local" itemLabel="Government - State/Local"/>
+					  <f:selectItem itemValue="healthcare" itemLabel="Healthcare"/>
+					  <f:selectItem itemValue="hospitality" itemLabel="Hospitality"/>
+					  <f:selectItem itemValue="manufacturing" itemLabel="Manufacturing"/>
+					  <f:selectItem itemValue="pharma_lifesciences" itemLabel="Pharmaceuticals/Life Sciences"/>
+					  <f:selectItem itemValue="retail" itemLabel="Retail"/>
+					  <f:selectItem itemValue="telecommunications" itemLabel="Telecommunications"/>
+					  <f:selectItem itemValue="transp_logistics" itemLabel="Transportation &amp;amp; Logistics"/>
+					  <f:selectItem itemValue="technology" itemLabel="Technology"/>
+					  <f:selectItem itemValue="travel" itemLabel="Travel"/>
+					  <f:selectItem itemValue="other" itemLabel="Other"/>
+				    </h:selectOneMenu>					
+				    <h:message for="industry" tooltip="true" style="color:red"/>
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+	 		    <td colspan="5">Click here to signup for the JBoss Newsletter:
+	 		    &#160;&#160;&#160;
+	 		        <h:selectBooleanCheckbox id="newsletter" value="#{registrar.helper.newsletter}"/>	 		    	
+	 		    </td>
+	 		</tr>
+	 		<tr valign="top">
+	 		    <td colspan="5">Click here to opt-out of ALL communication with JBoss including newsletters, announcements, and event confirmation e-mails:
+	 		    &#160;&#160;&#160;
+	 		    	<h:selectBooleanCheckbox id="salescontact" value="#{registrar.helper.salescontact}" binding="#{profileValidator.salescontact}"/>
+	 		    </td>
+	 		</tr>
+	 		<tr valign="top">
+	 		    <td colspan="5">Click here if you wish to be contacted by a JBoss representative regarding support, training, or consulting options:
+	 		    &#160;&#160;&#160;
+	 		    	<h:selectBooleanCheckbox id="supportcontact" value="#{registrar.helper.supportcontact}" binding="#{profileValidator.supportcontact}"/>
+	 		    	<h:inputHidden id="contactCheck" validator="#{profileValidator.contactCheck}" value="stub"/>
+               		<h:message for="contactCheck" tooltip="true" style="color:red"/>               		
+	 		    </td>	 		    
+	 		</tr>	 		 			
+		</table>
+        </td></tr></table>		
+		<h:commandButton action="#{registrar.register}" value="New user"/>
+   </h:form>
+   <br/>
+</div>
+
+</ui:define>
+</ui:composition>
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,25 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-    <div class="box">
-   	<div align="center" class="pn-title" style="padding: 1em">Sorry.</div>
-	<center>You must be 18 or over, or have parental permission to register here. Please click 
-	<a href="/index">
-		here
-	</a> 
-	to return to the main page.
-	</center>
-   </div>
-   </ui:define>
-
-</ui:composition>
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/underage.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,25 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+    <div class="box">
+   	<div align="center" class="pn-title" style="padding: 1em">Sorry.</div>
+	<center>You must be 18 or over, or have parental permission to register here. Please click 
+	<a href="/index">
+		here
+	</a> 
+	to return to the main page.
+	</center>
+   </div>
+   </ui:define>
+
+</ui:composition>
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,192 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"      
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
-	  xmlns:acl="http://www.jboss.com/security/website"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-
-	<c:if test="#{viewProfile.userNotFound}">
-		<div class="pn-normal" style="padding: 1em">User not found.</div>
-	</c:if>
-
-
-	<c:if test="#{!viewProfile.userNotFound}">
-
-		<c:if test="#{!(viewProfile.user.identity.active)}">
-   			<div style="color:red">This user is currently De-Activated in the system</div>
-		</c:if>
-
-		<c:if test="#{viewProfile.passwordReset}">
-   			<div>
-				A <b style="color:red">Password Reset</b> request has been successfully sent to 
-				<span style="color:red">#{viewProfile.helper.realemail}</span>
-   			</div>
-		</c:if>
-
-
-<div align="center">
-
-<!-- actual form -->
-<h:form id="viewForm">   
-	  <input type="hidden" name="id" value="#{param['id']}"/>
-	  <c:if test="#{param['caller']!=null}">
-			<input type="hidden" name="caller" value="#{param['caller']}"/> 			
-      </c:if>   
-	  <br/>
-      <table border="0" cellpadding="5">
-	  <tr>
-	  	<td align="center"><b>Member Profile</b><br/></td>
-	  </tr>	  
-	  <tr>
-	  <td>
-	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
-		  <tr valign="top">
-            <td>Username: *</td>
-            <td> 
-            	#{viewProfile.helper.uname}
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>                                    
-         <tr valign="top">
-		 	<td>Real e-mail: *</td>
-            <td>
-            	#{viewProfile.helper.realemail}
-            	<br/>            	
-            </td>
-			<td width="20"></td>
-			<td></td>
-			<td></td>
-         </tr>         
-         <tr valign="top">
-		 	<td>Fake e-mail: </td>
-            <td>#{viewProfile.helper.fakeemail}</td><br/>
-			<td width="20"></td>
-            <td>&#160;</td>
-            <td>&#160;</td>
-            <br/>
-         </tr>
-         <tr valign="top">
-            <td>Secret question: *</td>
-            <td>#{viewProfile.helper.question}</td>
-			<td width="20"></td>
-			<td>Secret answer: *</td>
-            <td>#{viewProfile.helper.answer}</td>
-         </tr>
-	 	 <tr valign="top">
-				<td>First Name: *</td>
-				<td>
-					#{viewProfile.helper.fname}
-				</td>
-				<td width="20"></td>
-				<td>Last Name: *</td>
-				<td>
-					#{viewProfile.helper.lname}
-				</td>
-	 	  </tr>
-	 	  <tr valign="top">
-				<td>Company Name: *</td>
-				<td>
-					#{viewProfile.helper.cname}
-				</td>
-				<td width="20"></td>
-				<td>Role: *</td>
-				<td>
-				    #{viewProfile.helper.role}
-               </td>
-	 		</tr>
-			<tr valign="top">
-				<td>Title: *</td>
-				<td>
-					#{viewProfile.helper.title}
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Country: *</td>
-				<td>				    
-					#{viewProfile.helper.country}
-				</td>
-				<td width="20"></td>
-				<td>Phone: *</td>
-				<td>
-					#{viewProfile.helper.phone}
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>Street Address: *</td>
-				<td>
-					#{viewProfile.helper.street}
-				</td>
-				<td width="20"></td>
-				<td>City: *</td>
-				<td>
-					#{viewProfile.helper.city}
-				</td>
-	 		</tr>
-	 		<tr valign="top">
-				<td>State: </td>
-				<td>
-				<div id="toggle" style="width:auto;">
-				  #{viewProfile.helper.state}                  
-                </div></td>
-				<td width="20"></td>
-				<td>Postal Code: </td>
-				<td>#{viewProfile.helper.zip}</td>
-	 		</tr>
-			<tr>
-				<td>&#160;</td>
-			</tr>	 			 		 			
-		</table>
-        </td></tr></table>
-        <!-- setup the function buttons -->				        
-        <c:if test="#{param['caller']==null}">			
-			<!-- just a regular ok,fine button -->
-			<h:commandButton action="success" value="OK" immediate="true"/>			
-        </c:if>
-        <c:if test="#{param['caller']!=null}">			
-			<!-- just a regular ok,fine button, this one takes you back to the initial caller -->
-			<h:commandButton type="button" value="OK" onclick="javascript:window.location='#{param['caller']}';"/>				
-        </c:if>
-		&#160;&#160;&#160;	
-		
-        <acl:isAllowed fragmentId="acl://editUserProfile">	        			
-            <!-- edit button -->
-			<h:commandButton type="button" value="Edit" onclick="javascript:window.location='#{jbossfacelets:outputLink(viewProfile.editUrl,true)}';"/>		
-			&#160;&#160;&#160;
-        </acl:isAllowed>
-
-        <acl:isAllowed fragmentId="acl://changeActiveStatus">	        
-			<!-- account activation/deactivation button -->
-			<c:if test="#{viewProfile.user.identity.active}">
-        		<h:commandButton action="#{viewProfile.changeAccountStatus}" immediate="true" value="De-Activate"/>		
-        	</c:if>
-			<c:if test="#{!(viewProfile.user.identity.active)}">
-        		<h:commandButton action="#{viewProfile.changeAccountStatus}" immediate="true" value="Activate"/>		
-        	</c:if>        	
-        	&#160;&#160;&#160;
-        </acl:isAllowed>	        
-		
-		<c:if test="#{(viewProfile.user.identity.active)}">
-        	<acl:isAllowed fragmentId="acl://sendResetPasswordEmail">	        
-            	<!-- reset password button -->
-				<h:commandButton action="#{viewProfile.resetPassword}" immediate="true" value="Reset Password"/>		
-        	</acl:isAllowed>
-        </c:if>
-   </h:form>
-   <br/>
-</div>
-
-</c:if>
-
-</ui:define>
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/profile/view.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,192 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"      
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+	  xmlns:acl="http://www.jboss.com/security/website"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+
+	<c:if test="#{viewProfile.userNotFound}">
+		<div class="pn-normal" style="padding: 1em">User not found.</div>
+	</c:if>
+
+
+	<c:if test="#{!viewProfile.userNotFound}">
+
+		<c:if test="#{!(viewProfile.user.identity.active)}">
+   			<div style="color:red">This user is currently De-Activated in the system</div>
+		</c:if>
+
+		<c:if test="#{viewProfile.passwordReset}">
+   			<div>
+				A <b style="color:red">Password Reset</b> request has been successfully sent to 
+				<span style="color:red">#{viewProfile.helper.realemail}</span>
+   			</div>
+		</c:if>
+
+
+<div align="center">
+
+<!-- actual form -->
+<h:form id="viewForm">   
+	  <input type="hidden" name="id" value="#{param['id']}"/>
+	  <c:if test="#{param['caller']!=null}">
+			<input type="hidden" name="caller" value="#{param['caller']}"/> 			
+      </c:if>   
+	  <br/>
+      <table border="0" cellpadding="5">
+	  <tr>
+	  	<td align="center"><b>Member Profile</b><br/></td>
+	  </tr>	  
+	  <tr>
+	  <td>
+	  	<table bgcolor="#CFCFCF" cellpadding="0" cellspacing="8" style="border: dashed 1px #494949;">
+		  <tr valign="top">
+            <td>Username: *</td>
+            <td> 
+            	#{viewProfile.helper.uname}
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>                                    
+         <tr valign="top">
+		 	<td>Real e-mail: *</td>
+            <td>
+            	#{viewProfile.helper.realemail}
+            	<br/>            	
+            </td>
+			<td width="20"></td>
+			<td></td>
+			<td></td>
+         </tr>         
+         <tr valign="top">
+		 	<td>Fake e-mail: </td>
+            <td>#{viewProfile.helper.fakeemail}</td><br/>
+			<td width="20"></td>
+            <td>&#160;</td>
+            <td>&#160;</td>
+            <br/>
+         </tr>
+         <tr valign="top">
+            <td>Secret question: *</td>
+            <td>#{viewProfile.helper.question}</td>
+			<td width="20"></td>
+			<td>Secret answer: *</td>
+            <td>#{viewProfile.helper.answer}</td>
+         </tr>
+	 	 <tr valign="top">
+				<td>First Name: *</td>
+				<td>
+					#{viewProfile.helper.fname}
+				</td>
+				<td width="20"></td>
+				<td>Last Name: *</td>
+				<td>
+					#{viewProfile.helper.lname}
+				</td>
+	 	  </tr>
+	 	  <tr valign="top">
+				<td>Company Name: *</td>
+				<td>
+					#{viewProfile.helper.cname}
+				</td>
+				<td width="20"></td>
+				<td>Role: *</td>
+				<td>
+				    #{viewProfile.helper.role}
+               </td>
+	 		</tr>
+			<tr valign="top">
+				<td>Title: *</td>
+				<td>
+					#{viewProfile.helper.title}
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Country: *</td>
+				<td>				    
+					#{viewProfile.helper.country}
+				</td>
+				<td width="20"></td>
+				<td>Phone: *</td>
+				<td>
+					#{viewProfile.helper.phone}
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>Street Address: *</td>
+				<td>
+					#{viewProfile.helper.street}
+				</td>
+				<td width="20"></td>
+				<td>City: *</td>
+				<td>
+					#{viewProfile.helper.city}
+				</td>
+	 		</tr>
+	 		<tr valign="top">
+				<td>State: </td>
+				<td>
+				<div id="toggle" style="width:auto;">
+				  #{viewProfile.helper.state}                  
+                </div></td>
+				<td width="20"></td>
+				<td>Postal Code: </td>
+				<td>#{viewProfile.helper.zip}</td>
+	 		</tr>
+			<tr>
+				<td>&#160;</td>
+			</tr>	 			 		 			
+		</table>
+        </td></tr></table>
+        <!-- setup the function buttons -->				        
+        <c:if test="#{param['caller']==null}">			
+			<!-- just a regular ok,fine button -->
+			<h:commandButton action="success" value="OK" immediate="true"/>			
+        </c:if>
+        <c:if test="#{param['caller']!=null}">			
+			<!-- just a regular ok,fine button, this one takes you back to the initial caller -->
+			<h:commandButton type="button" value="OK" onclick="javascript:window.location='#{param['caller']}';"/>				
+        </c:if>
+		&#160;&#160;&#160;	
+		
+        <acl:isAllowed fragmentId="acl://editUserProfile">	        			
+            <!-- edit button -->
+			<h:commandButton type="button" value="Edit" onclick="javascript:window.location='#{jbossfacelets:outputLink(viewProfile.editUrl,true)}';"/>		
+			&#160;&#160;&#160;
+        </acl:isAllowed>
+
+        <acl:isAllowed fragmentId="acl://changeActiveStatus">	        
+			<!-- account activation/deactivation button -->
+			<c:if test="#{viewProfile.user.identity.active}">
+        		<h:commandButton action="#{viewProfile.changeAccountStatus}" immediate="true" value="De-Activate"/>		
+        	</c:if>
+			<c:if test="#{!(viewProfile.user.identity.active)}">
+        		<h:commandButton action="#{viewProfile.changeAccountStatus}" immediate="true" value="Activate"/>		
+        	</c:if>        	
+        	&#160;&#160;&#160;
+        </acl:isAllowed>	        
+		
+		<c:if test="#{(viewProfile.user.identity.active)}">
+        	<acl:isAllowed fragmentId="acl://sendResetPasswordEmail">	        
+            	<!-- reset password button -->
+				<h:commandButton action="#{viewProfile.resetPassword}" immediate="true" value="Reset Password"/>		
+        	</acl:isAllowed>
+        </c:if>
+   </h:form>
+   <br/>
+</div>
+
+</c:if>
+
+</ui:define>
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,17 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-		<ui:include src="indexBody.xhtml"/>
-	</ui:define>
-
-</ui:composition>	
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/index.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,17 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+		<ui:include src="indexBody.xhtml"/>
+	</ui:define>
+
+</ui:composition>	
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,39 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<div class="box" align="center">
-    <div style="width:75%;margin-bottom:4em;">
-       <img src="#{jbossfacelets:contextPath()}/admin/images/search.gif" width="32" height="32" alt="Member list"/>
-       <span class="pn-title"> Member List </span>
-    </div>
-
-	<!-- provide a form to input the search string and the type of search to perform -->
-    <div class="pn-normal" align="center">
-    <jsfHtml:form id="searchForm">
-        <div style="margin:1em;">
-			<span style="font-weight:bold">Search :</span> 
-			<jsfHtml:inputText id="inputValue" value="#{search.input}" size="60"/>
-		</div>
-        <div style="margin:1em;">
-			<jsfHtml:selectOneRadio value="#{search.type}">
-        		<jsfCore:selectItem itemLabel="Username" itemValue="0"/>
-        		<jsfCore:selectItem itemLabel="E-mail" itemValue="1"/>
-        		<jsfCore:selectItem itemLabel="First Name" itemValue="2"/>
-        		<jsfCore:selectItem itemLabel="Last Name" itemValue="3"/>
-        		<jsfCore:selectItem itemLabel="Company Name" itemValue="4"/>        		
-            </jsfHtml:selectOneRadio>
-        </div>                
-        <jsfHtml:commandButton action="#{search.search}" value="Submit" style="margin:1em;"/>
-    </jsfHtml:form>    
-    </div>
-
-    <div align="center" class="pn-normal" style="margin:1em;"></div>    
-	</div>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/indexBody.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,39 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<div class="box" align="center">
+    <div style="width:75%;margin-bottom:4em;">
+       <img src="#{jbossfacelets:contextPath()}/admin/images/search.gif" width="32" height="32" alt="Member list"/>
+       <span class="pn-title"> Member List </span>
+    </div>
+
+	<!-- provide a form to input the search string and the type of search to perform -->
+    <div class="pn-normal" align="center">
+    <jsfHtml:form id="searchForm">
+        <div style="margin:1em;">
+			<span style="font-weight:bold">Search :</span> 
+			<jsfHtml:inputText id="inputValue" value="#{search.input}" size="60"/>
+		</div>
+        <div style="margin:1em;">
+			<jsfHtml:selectOneRadio value="#{search.type}">
+        		<jsfCore:selectItem itemLabel="Username" itemValue="0"/>
+        		<jsfCore:selectItem itemLabel="E-mail" itemValue="1"/>
+        		<jsfCore:selectItem itemLabel="First Name" itemValue="2"/>
+        		<jsfCore:selectItem itemLabel="Last Name" itemValue="3"/>
+        		<jsfCore:selectItem itemLabel="Company Name" itemValue="4"/>        		
+            </jsfHtml:selectOneRadio>
+        </div>                
+        <jsfHtml:commandButton action="#{search.search}" value="Submit" style="margin:1em;"/>
+    </jsfHtml:form>    
+    </div>
+
+    <div align="center" class="pn-normal" style="margin:1em;"></div>    
+	</div>
+
+
+</div>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,77 +0,0 @@
-<div  xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jstlCore="http://java.sun.com/jstl/core"
-      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
-      xmlns:jsfCore="http://java.sun.com/jsf/core"
-      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
->
-
-<ui:composition template="/admin/common/common.xhtml">
-
-	<ui:define name="mainContent">
-
-
-	<!-- include the search index component -->
-	<ui:include src="indexBody.xhtml"/>
-
-	<!-- display the results here -->
-	<div align="center" class="pn-normal" style="margin:1em;"></div>
-    
-     <!-- display the results header -->
-     <div style="border-top:1px solid #000000"></div>
-     <div align="center" style="margin:1em;" class="pn-sub">
-     <div style="margin:0.5em;">- #{search.helper.total} user(s) found for [#{search.helper.searchInput}] -</div>     
-
-	 <!-- display the rows of users on this page -->
-     <jstlCore:if test="#{search.helper.total>0}">
-
-	 <!-- display result page related information -->
-     <jstlCore:if test="#{search.helper.pageCount>1}">     	
-     	<div style="margin:1em;">
-			<jsfHtml:form id="pageForm">                
-				Page:&#160;
-				<jsfHtml:selectOneMenu value="#{search.currentPage}" onchange="document.getElementById('pageForm:goButton').click();">
-					<jsfCore:selectItems value="#{search.helper.pages}"/>
-				</jsfHtml:selectOneMenu>
-				&#160;
-				<jsfHtml:commandButton id="goButton" type="submit" action="#{search.displayPage}" 
-				image="/admin/images/btn_go_grey.gif" alt="Go"/>
-				&#160;-&#160;
-				(#{search.helper.resultSize}) users shown on this page.
-			</jsfHtml:form>
-	 	</div>
-     </jstlCore:if>
-
-
-     <table class="pn-normal" style="background-color: black" cellspacing="1" cellpadding="5">
-        <tr>            
-            <th align="center" style="background-color:white"> Username </th>
-            <th align="center" style="background-color:white"> E-mail </th>
-            <th align="center" style="background-color:white"> Company Name </th>
-			<th align="center" style="background-color:white"> Active </th>            
-        </tr>        
-		<jstlCore:forEach items="#{search.helper.users}" var="user">
-        	<tr style="background-color:white;text-align:center;">            
-            	<td>					
-					<jsfHtml:outputLink value="#{jbossfacelets:outputLink(user.profileUrl,true)}">					
-						${user.user.userName}
-					</jsfHtml:outputLink>
-				</td>
-            	<td>${user.user.identity.email}</td>
-            	<td>${user.user.identity.companyName}</td>
-				<td>${user.user.identity.active}</td>            
-        	</tr>
-		</jstlCore:forEach>                        
-     </table>
-     </jstlCore:if>
-
-
-    </div>
-
-
-	</ui:define>
-
-</ui:composition>
-
-
-</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-admin/src/web/admin/search/results.xhtml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,77 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jstlCore="http://java.sun.com/jstl/core"
+      xmlns:jsfHtml="http://java.sun.com/jsf/html"      
+      xmlns:jsfCore="http://java.sun.com/jsf/core"
+      xmlns:jbossfacelets="http://www.jboss.com/jbossfacelets"
+>
+
+<ui:composition template="/admin/common/common.xhtml">
+
+	<ui:define name="mainContent">
+
+
+	<!-- include the search index component -->
+	<ui:include src="indexBody.xhtml"/>
+
+	<!-- display the results here -->
+	<div align="center" class="pn-normal" style="margin:1em;"></div>
+    
+     <!-- display the results header -->
+     <div style="border-top:1px solid #000000"></div>
+     <div align="center" style="margin:1em;" class="pn-sub">
+     <div style="margin:0.5em;">- #{search.helper.total} user(s) found for [#{search.helper.searchInput}] -</div>     
+
+	 <!-- display the rows of users on this page -->
+     <jstlCore:if test="#{search.helper.total>0}">
+
+	 <!-- display result page related information -->
+     <jstlCore:if test="#{search.helper.pageCount>1}">     	
+     	<div style="margin:1em;">
+			<jsfHtml:form id="pageForm">                
+				Page:&#160;
+				<jsfHtml:selectOneMenu value="#{search.currentPage}" onchange="document.getElementById('pageForm:goButton').click();">
+					<jsfCore:selectItems value="#{search.helper.pages}"/>
+				</jsfHtml:selectOneMenu>
+				&#160;
+				<jsfHtml:commandButton id="goButton" type="submit" action="#{search.displayPage}" 
+				image="/admin/images/btn_go_grey.gif" alt="Go"/>
+				&#160;-&#160;
+				(#{search.helper.resultSize}) users shown on this page.
+			</jsfHtml:form>
+	 	</div>
+     </jstlCore:if>
+
+
+     <table class="pn-normal" style="background-color: black" cellspacing="1" cellpadding="5">
+        <tr>            
+            <th align="center" style="background-color:white"> Username </th>
+            <th align="center" style="background-color:white"> E-mail </th>
+            <th align="center" style="background-color:white"> Company Name </th>
+			<th align="center" style="background-color:white"> Active </th>            
+        </tr>        
+		<jstlCore:forEach items="#{search.helper.users}" var="user">
+        	<tr style="background-color:white;text-align:center;">            
+            	<td>					
+					<jsfHtml:outputLink value="#{jbossfacelets:outputLink(user.profileUrl,true)}">					
+						${user.user.userName}
+					</jsfHtml:outputLink>
+				</td>
+            	<td>${user.user.identity.email}</td>
+            	<td>${user.user.identity.companyName}</td>
+				<td>${user.user.identity.active}</td>            
+        	</tr>
+		</jstlCore:forEach>                        
+     </table>
+     </jstlCore:if>
+
+
+    </div>
+
+
+	</ui:define>
+
+</ui:composition>
+
+
+</div>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration)


Property changes on: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration
___________________________________________________________________
Name: svn:ignore
   + target


Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/maven.xml.off	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,38 +0,0 @@
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-	<!-- Default war-project goals -->
-
-	<goal name="all">		
-		<attainGoal name="clean"/>
-		<attainGoal name="build"/>
-		<attainGoal name="deploy"/>
-	</goal>
-	
-	<goal name="clean">
-		<ant:delete dir="${maven.build.dir}"/>
-		<ant:delete dir="${maven.build.dest}"/>
-	</goal>
-
-	<goal name="build">	
-		<attainGoal name="prj-war-build" />
-	</goal>
-    
-	<goal name="deploy">	
-	    <attainGoal name="prj-war-deploy"/>	
-	    <ant:unzip src="${local.deploy.dir}/jbwebsite-user-migration-1.0.sar" 
-		dest="${local.deploy.dir}/temp" overwrite="true"/>   	     	  
-   	    <ant:delete file="${local.deploy.dir}/jbwebsite-user-migration-1.0.sar"/>   	    
-  	    <ant:copy todir="${local.deploy.dir}/temp">
-			<ant:fileset dir="src/etc/lib">
-				<ant:filename name="*.jar" />
-			</ant:fileset>			
-		</ant:copy>	    
-		<ant:zip basedir="${local.deploy.dir}/temp" 
-		destfile="${local.deploy.dir}/jbwebsite-user-migration-1.0.sar"/>
-		<ant:delete dir="${local.deploy.dir}/temp"/>			    			
-	</goal>	
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/maven.xml.off)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/maven.xml.off	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,38 @@
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+	<!-- Default war-project goals -->
+
+	<goal name="all">		
+		<attainGoal name="clean"/>
+		<attainGoal name="build"/>
+		<attainGoal name="deploy"/>
+	</goal>
+	
+	<goal name="clean">
+		<ant:delete dir="${maven.build.dir}"/>
+		<ant:delete dir="${maven.build.dest}"/>
+	</goal>
+
+	<goal name="build">	
+		<attainGoal name="prj-war-build" />
+	</goal>
+    
+	<goal name="deploy">	
+	    <attainGoal name="prj-war-deploy"/>	
+	    <ant:unzip src="${local.deploy.dir}/jbwebsite-user-migration-1.0.sar" 
+		dest="${local.deploy.dir}/temp" overwrite="true"/>   	     	  
+   	    <ant:delete file="${local.deploy.dir}/jbwebsite-user-migration-1.0.sar"/>   	    
+  	    <ant:copy todir="${local.deploy.dir}/temp">
+			<ant:fileset dir="src/etc/lib">
+				<ant:filename name="*.jar" />
+			</ant:fileset>			
+		</ant:copy>	    
+		<ant:zip basedir="${local.deploy.dir}/temp" 
+		destfile="${local.deploy.dir}/jbwebsite-user-migration-1.0.sar"/>
+		<ant:delete dir="${local.deploy.dir}/temp"/>			    			
+	</goal>	
+</project>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/project.properties.off	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,2 +0,0 @@
-maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
-maven.war.src=${basedir}/src/web

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/project.properties.off)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.properties.off	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,2 @@
+maven.repo.remote=http://repository.atlassian.com,http://repo1.maven.org/maven,http://dist.codehaus.org/
+maven.war.src=${basedir}/src/web

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/project.xml.off	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,80 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
-    <id>jbwebsite-user-migration</id>
-    <name>user-migration</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Sohil Shah</name>
-        <url>http://www.jboss.org</url>
-    </organization>
-    <description></description>
-    
-    <dependencies>
-    
-    <!--  application dependencies -->        
-    <dependency>
-	    <groupId>jbosswebsite</groupId>
-	    <artifactId>jbosswebsite-common</artifactId>
-	    <version>1.0</version>
-	</dependency>
-	<dependency>
-	    	<groupId>jbosswebsite</groupId>
-	    	<artifactId>jbwebsite-security</artifactId>
-	    	<version>1.0</version>
-		</dependency>
-	
-	<dependency>
-	    <groupId>jbosswebsite</groupId>
-	    <artifactId>jbwebsite-user-admin</artifactId>
-	    <version>1.0</version>	    
-	</dependency>
-	
-	<!--  jboss-sso framework -->
-	<dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-identity-management</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-identity-management.jar</jar>
-    </dependency>    
-    <dependency>
-                <groupId>jboss-sso</groupId>
-                <artifactId>jboss-sso-common</artifactId>
-                <version>1.0</version>                
-                <jar>jboss-security-common.jar</jar>
-    </dependency>            
-    
-    <!--  infrastructure dependencies -->
-    <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>hibernate3</artifactId>
-            <version>1.0</version>
-            <jar>hibernate3.jar</jar>
-    </dependency>
-    <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.0</version>
-        <jar>log4j.jar</jar>
-    </dependency>
-    <!--  plug in the cactus dependencies -->
-    <dependency>
-            <groupId>cactus</groupId>
-            <artifactId>cactus</artifactId>
-            <version>1.7.1</version>
-            <jar>cactus-1.7.1.jar</jar>
-    </dependency>
-    <dependency>
-            <groupId>cactus</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <jar>junit-3.8.1.jar</jar>
-    </dependency>  	    	     		
-   </dependencies>
-</project>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/project.xml.off)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/project.xml.off	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../common.xml</extend>
+    <id>jbwebsite-user-migration</id>
+    <name>user-migration</name>
+    <currentVersion>1.0</currentVersion>
+    <organization>
+        <name>Sohil Shah</name>
+        <url>http://www.jboss.org</url>
+    </organization>
+    <description></description>
+    
+    <dependencies>
+    
+    <!--  application dependencies -->        
+    <dependency>
+	    <groupId>jbosswebsite</groupId>
+	    <artifactId>jbosswebsite-common</artifactId>
+	    <version>1.0</version>
+	</dependency>
+	<dependency>
+	    	<groupId>jbosswebsite</groupId>
+	    	<artifactId>jbwebsite-security</artifactId>
+	    	<version>1.0</version>
+		</dependency>
+	
+	<dependency>
+	    <groupId>jbosswebsite</groupId>
+	    <artifactId>jbwebsite-user-admin</artifactId>
+	    <version>1.0</version>	    
+	</dependency>
+	
+	<!--  jboss-sso framework -->
+	<dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-identity-management</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-identity-management.jar</jar>
+    </dependency>    
+    <dependency>
+                <groupId>jboss-sso</groupId>
+                <artifactId>jboss-sso-common</artifactId>
+                <version>1.0</version>                
+                <jar>jboss-security-common.jar</jar>
+    </dependency>            
+    
+    <!--  infrastructure dependencies -->
+    <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>hibernate3</artifactId>
+            <version>1.0</version>
+            <jar>hibernate3.jar</jar>
+    </dependency>
+    <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.0</version>
+        <jar>log4j.jar</jar>
+    </dependency>
+    <!--  plug in the cactus dependencies -->
+    <dependency>
+            <groupId>cactus</groupId>
+            <artifactId>cactus</artifactId>
+            <version>1.7.1</version>
+            <jar>cactus-1.7.1.jar</jar>
+    </dependency>
+    <dependency>
+            <groupId>cactus</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <jar>junit-3.8.1.jar</jar>
+    </dependency>  	    	     		
+   </dependencies>
+</project>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/readme.txt	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,17 +0,0 @@
-This is the migration tool that can be used to migrate Nukes (JBoss.com) users over to the JBoss.org Identity System running on LDAP
-
-Instructions are:
-
-1) rename maven.xml.off/project.properties.off/project.xml.off to maven.xml/project.properties/project.xml respectively
-
-2) do a maven all at the /portal-extensions level
-
-3) This will deploy the migration tool on the server
-
-4) To launch the tool, run the SyncNukesUserTestCase and this will sync up the data
-
-5) The resulting data will add new data to portal database, and produces a nukes.ldif file.
-
-6) Do a slapadd -l nukes.ldif to add the data into the OpenLDAP repository.
-
-7) Restart the server
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/readme.txt)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/readme.txt	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,17 @@
+This is the migration tool that can be used to migrate Nukes (JBoss.com) users over to the JBoss.org Identity System running on LDAP
+
+Instructions are:
+
+1) rename maven.xml.off/project.properties.off/project.xml.off to maven.xml/project.properties/project.xml respectively
+
+2) do a maven all at the /portal-extensions level
+
+3) This will deploy the migration tool on the server
+
+4) To launch the tool, run the SyncNukesUserTestCase and this will sync up the data
+
+5) The resulting data will add new data to portal database, and produces a nukes.ldif file.
+
+6) Do a slapadd -l nukes.ldif to add the data into the OpenLDAP repository.
+
+7) Restart the server
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,7 +0,0 @@
-#jbwebsite testing
-cactus.contextURL=http://localhost/migrate
-#cactus.contextURL=http://169.254.25.129/jbwebsite-test
-#acl testing
-#cactus.contextURL=http://localhost:8080/jboss-acl-test
-#sso testing
-#cactus.contextURL=http://localhost:8080/test
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/cactus.properties	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,7 @@
+#jbwebsite testing
+cactus.contextURL=http://localhost/migrate
+#cactus.contextURL=http://169.254.25.129/jbwebsite-test
+#acl testing
+#cactus.contextURL=http://localhost:8080/jboss-acl-test
+#sso testing
+#cactus.contextURL=http://localhost:8080/test
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/aspectjrt-1.2.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/aspectjrt-1.2.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/aspectjrt-1.2.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/cactus-1.7.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/cactus-1.7.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/cactus-1.7.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-httpclient-2.0.2.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-httpclient-2.0.2.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-httpclient-2.0.2.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-logging-1.0.4.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-logging-1.0.4.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/commons-logging-1.0.4.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/httpunit-1.6.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/httpunit-1.6.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/httpunit-1.6.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junit-3.8.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junit-3.8.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/junit-3.8.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junitperf-1.9.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/junitperf-1.9.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/junitperf-1.9.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/nekohtml-0.9.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/etc/lib/nekohtml-0.9.1.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/etc/lib/nekohtml-0.9.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,89 +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.website.user.migration;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.ArrayList;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Jul 24, 2006
- *
- */
-public class NukeRoleBean implements Serializable 
-{
-    private long id = 0;
-    private String name = null;
-    private Collection users = null;
-    
-    
-    
-    public String getName() 
-    {
-        return name;
-    }
-
-
-
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-    
-    
-
-
-
-    public long getId() {
-        return id;
-    }
-
-
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
-
-    /**
-     * 
-     *
-     */
-    public NukeRoleBean()
-    {
-        
-    }
-
-
-
-    public Collection getUsers() {
-        return users;
-    }
-
-
-
-    public void setUsers(Collection users) {
-        this.users = users;
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeRoleBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,89 @@
+/*
+* 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.website.user.migration;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Jul 24, 2006
+ *
+ */
+public class NukeRoleBean implements Serializable 
+{
+    private long id = 0;
+    private String name = null;
+    private Collection users = null;
+    
+    
+    
+    public String getName() 
+    {
+        return name;
+    }
+
+
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+    
+    
+
+
+
+    public long getId() {
+        return id;
+    }
+
+
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+
+
+    /**
+     * 
+     *
+     */
+    public NukeRoleBean()
+    {
+        
+    }
+
+
+
+    public Collection getUsers() {
+        return users;
+    }
+
+
+
+    public void setUsers(Collection users) {
+        this.users = users;
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,641 +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.website.user.migration;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.jboss.website.utils.Util;
-
-/**
- * 
- * @author Sohil Shah - sohil.shah at jboss.com - Jul 19, 2006
- *
- */
-public class NukeUserBean implements Serializable
-{
-    private long id = 0;
-    private String userName = null;
-    private Date regDate = null;
-    private Date prevLastVisit = null;
-    private Date lastVisit = null;
-    private Date memberPlusDate = null;
-    private Integer commentMax = 0;
-    private Integer userLang = 0;
-    private Integer thold = 0;
-    private Integer newsletter = 0;
-    private Integer enabled = 0;
-    private Integer salesContact = 0;
-    private Integer supportContact = 0;
-    private Integer uorder = 0;
-    private Integer userViewEmail = 0;
-    private Integer noScore = 0;
-    private Integer timezoneOffset = 0;
-    private String answer = null;
-    private String bio = null;
-    private String question = null;
-    private String umode = null;
-    private String usingSince = null;
-    private String companySize = null;
-    private String userOcc = null;
-    private String userFrom = null;
-    private String street = null;
-    private String userIcq = null;
-    private String userInterest = null;
-    private String userAim = null;
-    private String firstHear = null;
-    private String zip = null;
-    private String interestInJboss = null;
-    private String role = null;
-    private String userType = null;
-    private String userYim = null;
-    private String userMsnm = null;
-    private String url = null;
-    private String userSig = null;
-    private String theme = null;
-    private String userAvatar = null;
-    private String phone = null;
-    private String state = null;
-    private String pass = null;
-    private String hardware = null;
-    private String os = null;
-    private String title = null;
-    private String fname = null;
-    private String lname = null;
-    private String name = null;
-    private String femail = null;
-    private String email = null;
-    private String city = null;
-    private String country = null;
-    private String cname = null;
-    
-    
-    
-    
-    
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-    
-
-    public Date getRegDate() {
-        if(regDate == null)
-        {
-            return new Date();
-        }
-        return regDate;
-    }
-
-    public void setRegDate(Date regDate) {
-        this.regDate = regDate;
-    }
-    
-    
-
-    public Date getLastVisit() {
-        return lastVisit;
-    }
-
-    public void setLastVisit(Date lastVisit) {
-        this.lastVisit = lastVisit;
-    }
-
-    public Date getMemberPlusDate() {
-        return memberPlusDate;
-    }
-
-    public void setMemberPlusDate(Date memberPlusDate) {
-        this.memberPlusDate = memberPlusDate;
-    }
-
-    public Date getPrevLastVisit() {
-        return prevLastVisit;
-    }
-
-    public void setPrevLastVisit(Date prevLastVisit) {
-        this.prevLastVisit = prevLastVisit;
-    }
-
-    /**
-     * 
-     *
-     */
-    public NukeUserBean()
-    {
-        
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Integer getCommentMax() {
-        if(this.commentMax==null)
-        {
-            this.commentMax = new Integer(0);
-        }
-        return commentMax;
-    }
-
-    public void setCommentMax(Integer commentMax) {
-        this.commentMax = commentMax;
-    }
-
-    public Integer getEnabled() {
-        if(this.enabled==null)
-        {
-            this.enabled = new Integer(0);
-        }
-        return enabled;
-    }
-
-    public void setEnabled(Integer enabled) {
-        this.enabled = enabled;
-    }
-
-    public Integer getNewsletter() {
-        if(this.newsletter==null)
-        {
-            this.newsletter = new Integer(0);
-        }
-        return newsletter;
-    }
-
-    public void setNewsletter(Integer newsletter) {
-        this.newsletter = newsletter;
-    }
-
-    public Integer getNoScore() {
-        if(this.noScore==null)
-        {
-            this.noScore = new Integer(0);
-        }
-        return noScore;
-    }
-
-    public void setNoScore(Integer noScore) {
-        this.noScore = noScore;
-    }
-
-    public Integer getSalesContact() {
-        if(this.salesContact==null)
-        {
-            this.salesContact = new Integer(0);
-        }
-        return salesContact;
-    }
-
-    public void setSalesContact(Integer salesContact) {
-        this.salesContact = salesContact;
-    }
-
-    public Integer getSupportContact() {
-        if(this.supportContact==null)
-        {
-            this.supportContact = new Integer(0);
-        }
-        return supportContact;
-    }
-
-    public void setSupportContact(Integer supportContact) {
-        this.supportContact = supportContact;
-    }
-
-    public Integer getThold() {
-        if(this.thold==null)
-        {
-            this.thold = new Integer(0);
-        }
-        return thold;
-    }
-
-    public void setThold(Integer thold) {
-        this.thold = thold;
-    }
-
-    public Integer getTimezoneOffset() {
-        if(this.timezoneOffset==null)
-        {
-            this.timezoneOffset = new Integer(0);
-        }
-        return timezoneOffset;
-    }
-
-    public void setTimezoneOffset(Integer timezoneOffset) {
-        this.timezoneOffset = timezoneOffset;
-    }
-
-    public Integer getUorder() {
-        if(this.uorder==null)
-        {
-            this.uorder = new Integer(0);
-        }
-        return uorder;
-    }
-
-    public void setUorder(Integer uorder) {
-        this.uorder = uorder;
-    }
-
-    public Integer getUserLang() {
-        if(this.userLang==null)
-        {
-            this.userLang = new Integer(0);
-        }
-        return userLang;
-    }
-
-    public void setUserLang(Integer userLang) {
-        this.userLang = userLang;
-    }
-
-    public Integer getUserViewEmail() {
-        if(this.userViewEmail==null)
-        {
-            this.userViewEmail = new Integer(0);
-        }
-        return userViewEmail;
-    }
-
-    public void setUserViewEmail(Integer userViewEmail) {
-        this.userViewEmail = userViewEmail;
-    }
-
-    public String getAnswer() {
-        if(Util.isEmpty(answer))
-        {
-            return "missing";
-        }
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-    public String getBio() {
-        return bio;
-    }
-
-    public void setBio(String bio) {
-        this.bio = bio;
-    }
-
-    public String getCompanySize() {
-        return companySize;
-    }
-
-    public void setCompanySize(String companySize) {
-        this.companySize = companySize;
-    }
-
-    public String getQuestion() {
-        if(Util.isEmpty(question))
-        {
-            return "missing";
-        }
-        return question;
-    }
-
-    public void setQuestion(String question) {
-        this.question = question;
-    }
-
-    public String getStreet() {
-        if(Util.isEmpty(street))
-        {
-            return "missing";
-        }
-        return street;
-    }
-
-    public void setStreet(String street) {
-        this.street = street;
-    }
-
-    public String getUmode() {
-        return umode;
-    }
-
-    public void setUmode(String umode) {
-        this.umode = umode;
-    }
-
-    public String getUserFrom() {
-        return userFrom;
-    }
-
-    public void setUserFrom(String userFrom) {
-        this.userFrom = userFrom;
-    }
-
-    public String getUserOcc() {
-        return userOcc;
-    }
-
-    public void setUserOcc(String userOcc) {
-        this.userOcc = userOcc;
-    }
-
-    public String getUsingSince() {
-        return usingSince;
-    }
-
-    public void setUsingSince(String usingSince) {
-        this.usingSince = usingSince;
-    }
-
-    public String getFirstHear() {
-        return firstHear;
-    }
-
-    public void setFirstHear(String firstHear) {
-        this.firstHear = firstHear;
-    }
-
-    public String getInterestInJboss() {
-        return interestInJboss;
-    }
-
-    public void setInterestInJboss(String interestInJboss) {
-        this.interestInJboss = interestInJboss;
-    }
-
-    public String getRole() {
-        if(Util.isEmpty(role))
-        {
-            return "other";
-        }
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    public String getUserAim() {
-        return userAim;
-    }
-
-    public void setUserAim(String userAim) {
-        this.userAim = userAim;
-    }
-
-    public String getUserIcq() {
-        return userIcq;
-    }
-
-    public void setUserIcq(String userIcq) {
-        this.userIcq = userIcq;
-    }
-
-    public String getUserInterest() {
-        return userInterest;
-    }
-
-    public void setUserInterest(String userInterest) {
-        this.userInterest = userInterest;
-    }
-
-    public String getUserMsnm() {
-        return userMsnm;
-    }
-
-    public void setUserMsnm(String userMsnm) {
-        this.userMsnm = userMsnm;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-
-    public String getUserYim() {
-        return userYim;
-    }
-
-    public void setUserYim(String userYim) {
-        this.userYim = userYim;
-    }
-
-    public String getZip() {
-        if(Util.isEmpty(zip))
-        {
-            return "missing";
-        }
-        return zip;
-    }
-
-    public void setZip(String zip) {
-        this.zip = zip;
-    }
-
-    public String getHardware() {
-        return hardware;
-    }
-
-    public void setHardware(String hardware) {
-        this.hardware = hardware;
-    }
-
-    public String getOs() {
-        return os;
-    }
-
-    public void setOs(String os) {
-        this.os = os;
-    }
-
-    public String getPass() {
-        return pass;
-    }
-
-    public void setPass(String pass) {
-        this.pass = pass;
-    }
-
-    public String getPhone() {
-        if(Util.isEmpty(phone))
-        {
-            return "missing";
-        }
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getState() {
-        if(Util.isEmpty(state))
-        {
-            return "missing";
-        }
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getTheme() {
-        return theme;
-    }
-
-    public void setTheme(String theme) {
-        this.theme = theme;
-    }
-
-    public String getTitle() {
-        if(Util.isEmpty(title))
-        {
-            return "missing";
-        }
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getUserAvatar() {
-        return userAvatar;
-    }
-
-    public void setUserAvatar(String userAvatar) {
-        this.userAvatar = userAvatar;
-    }
-
-    public String getUserSig() {
-        return userSig;
-    }
-
-    public void setUserSig(String userSig) {
-        this.userSig = userSig;
-    }
-
-    public String getCity() {
-        if(Util.isEmpty(city))
-        {
-            return "missing";
-        }
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getCname() {
-        if(Util.isEmpty(cname))
-        {
-            return "missing";
-        }
-        return cname;
-    }
-
-    public void setCname(String cname) {
-        this.cname = cname;
-    }
-
-    public String getCountry() {
-        if(Util.isEmpty(country))
-        {
-            return "USA";
-        }
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getFemail() {
-        return femail;
-    }
-
-    public void setFemail(String femail) {
-        this.femail = femail;
-    }
-
-    public String getFname() {
-        if(Util.isEmpty(fname))
-        {
-            return "missing";
-        }
-        return fname;
-    }
-
-    public void setFname(String fname) {
-        this.fname = fname;
-    }
-
-    public String getLname() {
-        if(Util.isEmpty(lname))
-        {
-            return "missing";
-        }
-        return lname;
-    }
-
-    public void setLname(String lname) {
-        this.lname = lname;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/NukeUserBean.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,641 @@
+/*
+* 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.website.user.migration;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.jboss.website.utils.Util;
+
+/**
+ * 
+ * @author Sohil Shah - sohil.shah at jboss.com - Jul 19, 2006
+ *
+ */
+public class NukeUserBean implements Serializable
+{
+    private long id = 0;
+    private String userName = null;
+    private Date regDate = null;
+    private Date prevLastVisit = null;
+    private Date lastVisit = null;
+    private Date memberPlusDate = null;
+    private Integer commentMax = 0;
+    private Integer userLang = 0;
+    private Integer thold = 0;
+    private Integer newsletter = 0;
+    private Integer enabled = 0;
+    private Integer salesContact = 0;
+    private Integer supportContact = 0;
+    private Integer uorder = 0;
+    private Integer userViewEmail = 0;
+    private Integer noScore = 0;
+    private Integer timezoneOffset = 0;
+    private String answer = null;
+    private String bio = null;
+    private String question = null;
+    private String umode = null;
+    private String usingSince = null;
+    private String companySize = null;
+    private String userOcc = null;
+    private String userFrom = null;
+    private String street = null;
+    private String userIcq = null;
+    private String userInterest = null;
+    private String userAim = null;
+    private String firstHear = null;
+    private String zip = null;
+    private String interestInJboss = null;
+    private String role = null;
+    private String userType = null;
+    private String userYim = null;
+    private String userMsnm = null;
+    private String url = null;
+    private String userSig = null;
+    private String theme = null;
+    private String userAvatar = null;
+    private String phone = null;
+    private String state = null;
+    private String pass = null;
+    private String hardware = null;
+    private String os = null;
+    private String title = null;
+    private String fname = null;
+    private String lname = null;
+    private String name = null;
+    private String femail = null;
+    private String email = null;
+    private String city = null;
+    private String country = null;
+    private String cname = null;
+    
+    
+    
+    
+    
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    
+    
+
+    public Date getRegDate() {
+        if(regDate == null)
+        {
+            return new Date();
+        }
+        return regDate;
+    }
+
+    public void setRegDate(Date regDate) {
+        this.regDate = regDate;
+    }
+    
+    
+
+    public Date getLastVisit() {
+        return lastVisit;
+    }
+
+    public void setLastVisit(Date lastVisit) {
+        this.lastVisit = lastVisit;
+    }
+
+    public Date getMemberPlusDate() {
+        return memberPlusDate;
+    }
+
+    public void setMemberPlusDate(Date memberPlusDate) {
+        this.memberPlusDate = memberPlusDate;
+    }
+
+    public Date getPrevLastVisit() {
+        return prevLastVisit;
+    }
+
+    public void setPrevLastVisit(Date prevLastVisit) {
+        this.prevLastVisit = prevLastVisit;
+    }
+
+    /**
+     * 
+     *
+     */
+    public NukeUserBean()
+    {
+        
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Integer getCommentMax() {
+        if(this.commentMax==null)
+        {
+            this.commentMax = new Integer(0);
+        }
+        return commentMax;
+    }
+
+    public void setCommentMax(Integer commentMax) {
+        this.commentMax = commentMax;
+    }
+
+    public Integer getEnabled() {
+        if(this.enabled==null)
+        {
+            this.enabled = new Integer(0);
+        }
+        return enabled;
+    }
+
+    public void setEnabled(Integer enabled) {
+        this.enabled = enabled;
+    }
+
+    public Integer getNewsletter() {
+        if(this.newsletter==null)
+        {
+            this.newsletter = new Integer(0);
+        }
+        return newsletter;
+    }
+
+    public void setNewsletter(Integer newsletter) {
+        this.newsletter = newsletter;
+    }
+
+    public Integer getNoScore() {
+        if(this.noScore==null)
+        {
+            this.noScore = new Integer(0);
+        }
+        return noScore;
+    }
+
+    public void setNoScore(Integer noScore) {
+        this.noScore = noScore;
+    }
+
+    public Integer getSalesContact() {
+        if(this.salesContact==null)
+        {
+            this.salesContact = new Integer(0);
+        }
+        return salesContact;
+    }
+
+    public void setSalesContact(Integer salesContact) {
+        this.salesContact = salesContact;
+    }
+
+    public Integer getSupportContact() {
+        if(this.supportContact==null)
+        {
+            this.supportContact = new Integer(0);
+        }
+        return supportContact;
+    }
+
+    public void setSupportContact(Integer supportContact) {
+        this.supportContact = supportContact;
+    }
+
+    public Integer getThold() {
+        if(this.thold==null)
+        {
+            this.thold = new Integer(0);
+        }
+        return thold;
+    }
+
+    public void setThold(Integer thold) {
+        this.thold = thold;
+    }
+
+    public Integer getTimezoneOffset() {
+        if(this.timezoneOffset==null)
+        {
+            this.timezoneOffset = new Integer(0);
+        }
+        return timezoneOffset;
+    }
+
+    public void setTimezoneOffset(Integer timezoneOffset) {
+        this.timezoneOffset = timezoneOffset;
+    }
+
+    public Integer getUorder() {
+        if(this.uorder==null)
+        {
+            this.uorder = new Integer(0);
+        }
+        return uorder;
+    }
+
+    public void setUorder(Integer uorder) {
+        this.uorder = uorder;
+    }
+
+    public Integer getUserLang() {
+        if(this.userLang==null)
+        {
+            this.userLang = new Integer(0);
+        }
+        return userLang;
+    }
+
+    public void setUserLang(Integer userLang) {
+        this.userLang = userLang;
+    }
+
+    public Integer getUserViewEmail() {
+        if(this.userViewEmail==null)
+        {
+            this.userViewEmail = new Integer(0);
+        }
+        return userViewEmail;
+    }
+
+    public void setUserViewEmail(Integer userViewEmail) {
+        this.userViewEmail = userViewEmail;
+    }
+
+    public String getAnswer() {
+        if(Util.isEmpty(answer))
+        {
+            return "missing";
+        }
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer;
+    }
+
+    public String getBio() {
+        return bio;
+    }
+
+    public void setBio(String bio) {
+        this.bio = bio;
+    }
+
+    public String getCompanySize() {
+        return companySize;
+    }
+
+    public void setCompanySize(String companySize) {
+        this.companySize = companySize;
+    }
+
+    public String getQuestion() {
+        if(Util.isEmpty(question))
+        {
+            return "missing";
+        }
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public String getStreet() {
+        if(Util.isEmpty(street))
+        {
+            return "missing";
+        }
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getUmode() {
+        return umode;
+    }
+
+    public void setUmode(String umode) {
+        this.umode = umode;
+    }
+
+    public String getUserFrom() {
+        return userFrom;
+    }
+
+    public void setUserFrom(String userFrom) {
+        this.userFrom = userFrom;
+    }
+
+    public String getUserOcc() {
+        return userOcc;
+    }
+
+    public void setUserOcc(String userOcc) {
+        this.userOcc = userOcc;
+    }
+
+    public String getUsingSince() {
+        return usingSince;
+    }
+
+    public void setUsingSince(String usingSince) {
+        this.usingSince = usingSince;
+    }
+
+    public String getFirstHear() {
+        return firstHear;
+    }
+
+    public void setFirstHear(String firstHear) {
+        this.firstHear = firstHear;
+    }
+
+    public String getInterestInJboss() {
+        return interestInJboss;
+    }
+
+    public void setInterestInJboss(String interestInJboss) {
+        this.interestInJboss = interestInJboss;
+    }
+
+    public String getRole() {
+        if(Util.isEmpty(role))
+        {
+            return "other";
+        }
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    public String getUserAim() {
+        return userAim;
+    }
+
+    public void setUserAim(String userAim) {
+        this.userAim = userAim;
+    }
+
+    public String getUserIcq() {
+        return userIcq;
+    }
+
+    public void setUserIcq(String userIcq) {
+        this.userIcq = userIcq;
+    }
+
+    public String getUserInterest() {
+        return userInterest;
+    }
+
+    public void setUserInterest(String userInterest) {
+        this.userInterest = userInterest;
+    }
+
+    public String getUserMsnm() {
+        return userMsnm;
+    }
+
+    public void setUserMsnm(String userMsnm) {
+        this.userMsnm = userMsnm;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getUserYim() {
+        return userYim;
+    }
+
+    public void setUserYim(String userYim) {
+        this.userYim = userYim;
+    }
+
+    public String getZip() {
+        if(Util.isEmpty(zip))
+        {
+            return "missing";
+        }
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public String getHardware() {
+        return hardware;
+    }
+
+    public void setHardware(String hardware) {
+        this.hardware = hardware;
+    }
+
+    public String getOs() {
+        return os;
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
+
+    public String getPass() {
+        return pass;
+    }
+
+    public void setPass(String pass) {
+        this.pass = pass;
+    }
+
+    public String getPhone() {
+        if(Util.isEmpty(phone))
+        {
+            return "missing";
+        }
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getState() {
+        if(Util.isEmpty(state))
+        {
+            return "missing";
+        }
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public String getTitle() {
+        if(Util.isEmpty(title))
+        {
+            return "missing";
+        }
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUserAvatar() {
+        return userAvatar;
+    }
+
+    public void setUserAvatar(String userAvatar) {
+        this.userAvatar = userAvatar;
+    }
+
+    public String getUserSig() {
+        return userSig;
+    }
+
+    public void setUserSig(String userSig) {
+        this.userSig = userSig;
+    }
+
+    public String getCity() {
+        if(Util.isEmpty(city))
+        {
+            return "missing";
+        }
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCname() {
+        if(Util.isEmpty(cname))
+        {
+            return "missing";
+        }
+        return cname;
+    }
+
+    public void setCname(String cname) {
+        this.cname = cname;
+    }
+
+    public String getCountry() {
+        if(Util.isEmpty(country))
+        {
+            return "USA";
+        }
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getFemail() {
+        return femail;
+    }
+
+    public void setFemail(String femail) {
+        this.femail = femail;
+    }
+
+    public String getFname() {
+        if(Util.isEmpty(fname))
+        {
+            return "missing";
+        }
+        return fname;
+    }
+
+    public void setFname(String fname) {
+        this.fname = fname;
+    }
+
+    public String getLname() {
+        if(Util.isEmpty(lname))
+        {
+            return "missing";
+        }
+        return lname;
+    }
+
+    public void setLname(String lname) {
+        this.lname = lname;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,618 +0,0 @@
-/*****************************************
- *                                       *                                         *
- *   Distributable under LGPL license.   *
- *   See terms of license at gnu.org.    *
- *                                       *
- *****************************************/
-package org.jboss.website.user.migration;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.text.SimpleDateFormat;
-import java.text.MessageFormat;
-import java.io.OutputStream;
-
-
-import org.apache.log4j.Logger;
-import org.apache.cactus.ServletTestCase;
-
-
-import org.hibernate.*;
-
-import org.jboss.website.security.JBossIdentity;
-import org.jboss.website.user.bo.UserBean;
-import org.jboss.website.user.bo.ProfileBean;
-import org.jboss.security.idm.Address;
-import org.jboss.security.idm.Role;
-import org.jboss.website.utils.Util;
-
-/**
- * users to test
- * 
- * cn=chrisi
- * cn=kristofn
- * cn=oudenaar
- * cn=jgilje
- * cn=njipp
- * cn=nbk27hi
- * 
- * 
- * 
- * 
- */
-
-/**
- * @author Sohil Shah - sohil.shah at jboss.com
- *
- */
-public class SyncNukesUsersTestCase extends ServletTestCase 
-{
-    private static Logger log = Logger.getLogger(SyncNukesUsersTestCase.class);
-        
-    private FileOutputStream ldifos = null;
-    private Collection usersAdded = new ArrayList();
-    
-    /**
-     * 
-     */
-    public void setUp() throws Exception
-    { 
-        File file = new File("/migration/nukes.ldif");
-        file.createNewFile();
-        this.ldifos = new FileOutputStream(file,false); //overwrite mode
-    }
-             
-    /**
-     * 
-     */
-    protected void tearDown() throws Exception 
-    {        
-        if(this.ldifos!=null)
-        {
-            this.ldifos.flush();
-            this.ldifos.close();
-        }
-    }
-
-
-
-
-    /**
-     * 
-     */
-    public void testStartSync() throws Exception
-    {
-       System.out.println("User Migration tool successfully called.........");
-        //initialize the ldif file
-        this.initLDIF(this.ldifos);
-        
-        this.performUserSync();
-        
-        this.performRoleSync();
-    }
-    
-    //------user sync-------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @throws Exception
-     */
-    private void performUserSync() throws Exception
-    {
-        StringBuffer buffer = new StringBuffer();
-        SimpleDateFormat format = new SimpleDateFormat();
-        Session session = null;
-        try
-        {
-            log.info("Starting synchronization from NukesUsers to PortalUsers...."); 
-            long start = System.currentTimeMillis();
-            
-            //testing the Hibernate setup to look into the Nukes database
-            session = Tools.getOpenSession();        
-            session.beginTransaction();
-            
-            //read a NukeUserBean            
-            Query query = session.createQuery("from NukeUserBean as u");
-            
-            int counter = 1;            
-            for(Iterator itr=query.iterate();itr.hasNext();)
-            {                
-                /*if(counter == 20)
-                {
-                    break;
-                }*/
-                
-                NukeUserBean user = (NukeUserBean)itr.next();
-                            
-                log.info("Synchronizing........"+user.getUserName()+" ("+counter+++")");
-                
-                /*Transaction userReadTx = org.jboss.website.hibernate.Tools.getOpenSession().beginTransaction(); 
-                try
-                {
-                    if(UserBean.readByUserName(user.getUserName().trim())!=null)
-                    {
-                        //the user already exists....no need to migrate
-                        continue;
-                    }
-                }
-                catch(Exception e)
-                {
-                    buffer.append("-----------------------------\n");
-                    buffer.append("User="+user.getUserName()+"\n");
-                    buffer.append("RegisteredOn="+format.format(user.getRegDate())+"\n");
-                    buffer.append("Exception="+e.toString()+"\n");
-                    buffer.append("-----------------------------\n");
-                    continue;
-                }
-                finally
-                {
-                    if(userReadTx != null)
-                    {
-                        userReadTx.rollback();
-                    }
-                }*/
-                if(this.usersAdded.contains(user.getUserName().trim()))
-                {
-                    //the user already exists....no need to migrate
-                    continue;
-                }
-                
-                if( 
-                        Util.isEmpty(user.getUserName()) ||
-                        user.getUserName().contains("--") ||
-                        user.getUserName().contains(",")  ||                        
-                        user.getUserName().contains("=") ||                        
-                        user.getUserName().contains("&#") ||
-                        user.getUserName().contains("#") ||
-                        user.getUserName().contains(";") ||
-                        user.getUserName().contains("+") ||
-                        user.getUserName().startsWith("-") ||
-                        user.getUserName().endsWith("-")
-                )
-                {
-                    buffer.append("-----------------------------\n");
-                    buffer.append("User="+user.getUserName()+"\n");
-                    buffer.append("RegisteredOn="+format.format(user.getRegDate())+"\n");
-                    buffer.append("Exception=Illegal UserName.....This account will not be synched\n");
-                    buffer.append("-----------------------------\n");
-                    continue;
-                }
-                
-                
-                //now for testing purpose setup this user into the new Portal system
-                UserBean portalUser = new UserBean();
-                ProfileBean profile = new ProfileBean();
-                JBossIdentity identity = new JBossIdentity();
-                
-                portalUser.setIdentity(identity);
-                portalUser.setProfile(profile);
-                
-                
-                //setup the portalUser
-                portalUser.setUserName(user.getUserName().trim());
-                portalUser.setForceResetEnabled(false);
-                portalUser.setOldNukesPass(user.getPass());
-                
-                
-                //setup the identity
-                identity.setUserName(user.getUserName().trim());
-                identity.setPassword(user.getPass().getBytes());
-                identity.setEmail(user.getEmail().trim());
-                if(user.getEnabled()>0)
-                {
-                    identity.setActive(true);
-                }
-                else
-                {
-                    identity.setActive(false);
-                }
-                
-                
-                identity.setFullName(user.getFname().trim()+" "+user.getLname().trim());
-                identity.setRegistrationDate(user.getRegDate());
-                identity.setSecretQuestion(user.getQuestion().trim());
-                identity.setSecretAnswer(user.getAnswer().trim());
-                
-                //other emails
-                //identity.addEmail(user.getFemail());
-                
-                //phone numbers
-                //if(user.getPhone()!=null && user.getPhone().trim().length()>0 && 
-                //   ( user.getPhone().startsWith("+")|| Character.isDigit(user.getPhone().charAt(0)) )
-                //)
-                //{
-                //    identity.addPhoneNumber(user.getPhone());
-                //}
-                
-                
-                //company
-                Address companyAddress = new Address();
-                identity.setCompanyAddress(companyAddress);
-                companyAddress.setStreet(user.getStreet().trim());
-                companyAddress.setCity(user.getCity().trim());
-                companyAddress.setState(user.getState().trim());                
-                companyAddress.setPostalCode(user.getZip().trim());
-                companyAddress.setCountry(user.getCountry().trim());
-                
-                                
-                identity.setCompanyRole(user.getRole().trim());
-                identity.setCompanyName(user.getCname().trim());
-                identity.setCompanyTitle(user.getTitle().trim());
-                
-                
-                //setup the profile
-                profile.setCompanySize(user.getCompanySize());
-                profile.setCompanyType(user.getUserType());
-                profile.setInterestType(user.getInterestInJboss());
-                if(user.getNewsletter()>0)
-                {
-                    profile.setNewsLetter(true);
-                }
-                else
-                {
-                    profile.setNewsLetter(false);
-                }
-                if(user.getSalesContact()>0)
-                {
-                    profile.setSalesContact(true);
-                }
-                else
-                {
-                    profile.setSalesContact(false);
-                }
-                if(user.getSupportContact()>0)
-                {
-                    profile.setSupportContact(true);
-                }
-                else
-                {
-                    profile.setSupportContact(false);
-                }
-                
-                //perform the user add operation
-                Transaction tx = org.jboss.website.hibernate.Tools.getOpenSession().beginTransaction();
-                boolean success = false;
-                try
-                {
-                    this.register(portalUser);
-                    success = true;
-                }
-                catch(Exception e)
-                {
-                    success = false;
-                    //log this error
-                    buffer.append("-----------------------------\n");
-                    buffer.append("User="+user.getUserName()+"\n");
-                    buffer.append("RegisteredOn="+format.format(user.getRegDate())+"\n");
-                    buffer.append("Exception="+e.toString()+"\n");
-                    buffer.append("-----------------------------\n");
-                }
-                finally
-                {
-                    if(success)
-                    {
-                        tx.commit();
-                        this.usersAdded.add(identity.getUserName().trim());
-                    }
-                    else
-                    {
-                        tx.rollback();
-                    }
-                }                               
-            }                                                
-            log.info("Synchronization from NukesUsers to PortalUsers successfully finished....");
-            long stop = System.currentTimeMillis();
-            long duration = stop - start;
-            log.info("Sync finished in..."+duration+"ms");
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            throw e;
-        }
-        finally
-        {
-            Tools.closeSession(session);            
-            //log
-            //spit it out to a log file
-            File file = new File("/migration/synctoolusers.log");
-            file.createNewFile();
-            FileOutputStream fos = new FileOutputStream(file,false); //truncates if an older file exists
-            fos.write(buffer.toString().getBytes());
-            fos.close();
-        }
-    }
-    
-    /**
-     * 
-     *
-     */
-    private void register(UserBean user)
-    {
-        boolean success = false;        
-        try
-        {                                                        
-            //save the user to the database, this saves the user to the portal database,
-            user.save();
-            
-            //add this user to the core portal data....without this the portal will break,
-            //this should be fixed in 2.4
-            //UserModule userModule = JBossPortalUtil.getUserModule();
-            //userModule.createUser(user.getUserName(),null,null);
-                                                                                            
-            //tag success, so that the profile can be created in the JBoss Corp Identity system
-            success = true;                     
-        }        
-        catch(Exception e)
-        {
-            log.error(this,e);
-            throw new RuntimeException(e);
-        }
-        finally
-        {
-            if(success)
-            {
-                try{this.saveLDIF(user,this.ldifos);}catch(Exception e){throw new RuntimeException(e);}
-            }
-        }                
-    }
-    
-    /**
-     * 
-     * @param user
-     * @param os
-     * @throws Exception
-     */
-    private void saveLDIF(UserBean user,OutputStream os) throws Exception
-    {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-DD");
-        StringBuffer template = new StringBuffer();
-        template.append("dn: cn={0},ou=jbosssso,dc=jboss,dc=com\n");
-        template.append("cn: {1}\n");
-        template.append("sn: {2}\n");
-        template.append("o: {3}\n");        
-        template.append("objectClass: jbossIdentity\n");
-        template.append("secretQuestion: {4}\n");
-        template.append("secretAnswer: {5}\n");        
-        template.append("registrationDate: {6}\n");
-        template.append("employeeType: {7}\n");
-        template.append("title: {8}\n");
-        template.append("givenName: {9}\n");
-        template.append("displayName: {10}\n");
-        template.append("userPassword: {11}\n");
-        
-        //multivalue telephoneNumber
-        template.append("telephoneNumber: missing\n");                
-        
-        //multivalue mail
-        Collection allEmails = new ArrayList();
-        allEmails.add(user.getIdentity().getEmail());
-        allEmails.addAll(user.getIdentity().getOtherEmails());
-        if(!Util.isEmpty(allEmails))
-        {
-            int count = 0;
-            for(Iterator itr=allEmails.iterator();itr.hasNext();)
-            {
-                if(count == 0)
-                {
-                    template.append("mail: primary="+itr.next()+"\n");
-                }
-                else
-                {
-                    template.append("mail: "+itr.next()+"\n");
-                }
-                count++;
-            }
-        }
-        else
-        {
-            template.append("mail: null\n");
-        }
-        
-        //multivalue postalAddress
-        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getStreet()))
-        {
-            template.append("postalAddress: street="+user.getIdentity().getCompanyAddress().getStreet()+"\n");
-        }
-        else
-        {
-            template.append("postalAddress: street=null\n");
-        }
-        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getCity()))
-        {
-            template.append("postalAddress: city="+user.getIdentity().getCompanyAddress().getCity()+"\n");
-        }
-        else
-        {
-            template.append("postalAddress: city=null\n");
-        }
-        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getState()))
-        {
-            template.append("postalAddress: state="+user.getIdentity().getCompanyAddress().getState()+"\n");
-        }
-        else
-        {
-            template.append("postalAddress: state=null\n");
-        }
-        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getPostalCode()))
-        {
-            template.append("postalAddress: postalCode="+user.getIdentity().getCompanyAddress().getPostalCode()+"\n");
-        }
-        else
-        {
-            template.append("postalAddress: postalCode=null\n");
-        }
-        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getCountry()))
-        {
-            template.append("postalAddress: country="+user.getIdentity().getCompanyAddress().getCountry()+"\n");
-        }
-        else
-        {
-            template.append("postalAddress: country=null\n");
-        }
-        
-        template.append("\n");
-        
-        String userObject = MessageFormat.format(template.toString(),
-        new Object[]{
-            user.getIdentity().getUserName(),
-            user.getIdentity().getUserName(),
-            user.getIdentity().isActive(),
-            !Util.isEmpty(user.getIdentity().getCompanyName())?user.getIdentity().getCompanyName():"null",
-            !Util.isEmpty(user.getIdentity().getSecretQuestion())?user.getIdentity().getSecretQuestion():"null",
-            !Util.isEmpty(user.getIdentity().getSecretAnswer())?user.getIdentity().getSecretAnswer():"null",
-            user.getIdentity().getRegistrationDate()!=null?simpleDateFormat.format(user.getIdentity().getRegistrationDate()):simpleDateFormat.format(new Date()),
-            !Util.isEmpty(user.getIdentity().getCompanyRole())?user.getIdentity().getCompanyRole():"null",
-            !Util.isEmpty(user.getIdentity().getCompanyTitle())?user.getIdentity().getCompanyTitle():"null",
-            !Util.isEmpty(user.getIdentity().getFullName())?user.getIdentity().getFullName():"null",
-            !Util.isEmpty(user.getIdentity().getFullName())?user.getIdentity().getFullName():"null",
-            new String(user.getIdentity().getPassword())
-        }
-        );
-        
-        os.write(userObject.getBytes());
-        os.flush();
-    }
-    //----------role sync------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    private void performRoleSync() throws Exception
-    {
-        log.info("Starting synchronization from NukesRoles to PortalRoles....");
-        
-        //add the defaultRoles
-        this.createDefaultRoles(this.ldifos);
-        
-        //testing the Hibernate setup to look into the Nukes database
-        Session session = Tools.getCurrentSession();
-        
-        session.beginTransaction();
-        
-        //read a NukeRoleBean
-        Query query = session.createQuery("from NukeRoleBean as u");        
-        
-        int counter = 1;
-        for(Iterator itr=query.iterate();itr.hasNext();)
-        {
-            NukeRoleBean role = (NukeRoleBean)itr.next();
-            Role portalRole = new Role();
-            
-            //skip the specified roles
-            if(
-                    role.getName().equalsIgnoreCase("users") ||
-                    role.getName().equalsIgnoreCase("admins") ||
-                    role.getName().equalsIgnoreCase("jboss-html") ||
-                    role.getName().equalsIgnoreCase("jboss-blog") ||
-                    role.getName().equalsIgnoreCase("jbosside") ||
-                    role.getName().equalsIgnoreCase("nukes") ||
-                    role.getName().equalsIgnoreCase("memberplus")
-            )
-            {
-                continue;
-            }
-                                    
-            System.out.println("Synchronizing........"+role.getName()+" ("+counter+")");
-            portalRole.setName("jboss.com_"+role.getName().toLowerCase());
-            
-            for(Iterator userItr=role.getUsers().iterator();userItr.hasNext();)
-            {
-                NukeUserBean user = (NukeUserBean)userItr.next();
-                System.out.println("User="+user.getId()+","+user.getUserName());
-                portalRole.getIdentities().add(user.getUserName());
-            }                        
-            
-            
-            //now persist the portalRole into the LDAP repo
-            this.saveLDIF(portalRole,this.ldifos);
-            
-            counter++;
-        }                
-        log.info("Synchronization from NukesRoles to PortalRoles successfully finished....");
-    }  
-    
-    /**
-     * 
-     * @param role
-     * @param os
-     */
-    private void saveLDIF(Role role,OutputStream os) throws Exception
-    {
-        StringBuffer buffer = new StringBuffer();
-        
-        buffer.append("dn: cn="+role.getName()+",ou=role,dc=jboss,dc=com\n");
-        buffer.append("cn: "+role.getName()+"\n");
-        buffer.append("objectClass: groupOfUniqueNames\n");
-        if(!Util.isEmpty(role.getIdentities()))
-        {
-            for(Iterator itr=role.getIdentities().iterator();itr.hasNext();)
-            {
-                String identity = (String)itr.next();
-                buffer.append("uniqueMember: cn="+identity+"\n");
-            }
-        }
-        else
-        {
-            buffer.append("uniqueMember: cn=null\n");
-        }
-        buffer.append("\n");
-        
-        os.write(buffer.toString().getBytes());
-        os.flush();
-    }
-    
-    /**
-     * 
-     * @param os
-     * @throws Exception
-     */
-    private void createDefaultRoles(OutputStream os) throws Exception
-    {
-        StringBuffer buffer = new StringBuffer();
-        
-        buffer.append("dn: cn=Admin,ou=role,dc=jboss,dc=com\n");
-        buffer.append("cn: Admin\n");
-        buffer.append("uniqueMember: cn=admin\n");
-        buffer.append("objectClass: groupOfUniqueNames\n");
-        buffer.append("\n");
-        
-        buffer.append("dn: cn=User,ou=role,dc=jboss,dc=com\n");
-        buffer.append("cn: User\n");
-        buffer.append("uniqueMember: cn=null\n");
-        buffer.append("objectClass: groupOfUniqueNames\n");
-        buffer.append("\n");
-        
-        os.write(buffer.toString().getBytes());
-        os.flush();
-    }
-    //-------------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     * @throws Exception
-     */
-    private void initLDIF(OutputStream os) throws Exception
-    {
-        StringBuffer buffer = new StringBuffer();
-        
-        buffer.append("dn: dc=jboss,dc=com\n");
-        buffer.append("dc: jboss\n");
-        buffer.append("objectClass: dcObject\n");
-        buffer.append("objectClass: organizationalUnit\n");
-        buffer.append("ou: JBoss Dot Com\n");
-        buffer.append("\n");
-        buffer.append("dn: ou=role,dc=jboss,dc=com\n");
-        buffer.append("ou: role\n");
-        buffer.append("objectClass: organizationalUnit\n");
-        buffer.append("\n");
-        buffer.append("dn: ou=jbosssso,dc=jboss,dc=com\n");
-        buffer.append("ou: jbosssso\n");
-        buffer.append("objectClass: organizationalUnit\n");
-        buffer.append("\n");
-        
-        os.write(buffer.toString().getBytes());
-        os.flush();
-    }
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/SyncNukesUsersTestCase.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,618 @@
+/*****************************************
+ *                                       *                                         *
+ *   Distributable under LGPL license.   *
+ *   See terms of license at gnu.org.    *
+ *                                       *
+ *****************************************/
+package org.jboss.website.user.migration;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.text.SimpleDateFormat;
+import java.text.MessageFormat;
+import java.io.OutputStream;
+
+
+import org.apache.log4j.Logger;
+import org.apache.cactus.ServletTestCase;
+
+
+import org.hibernate.*;
+
+import org.jboss.website.security.JBossIdentity;
+import org.jboss.website.user.bo.UserBean;
+import org.jboss.website.user.bo.ProfileBean;
+import org.jboss.security.idm.Address;
+import org.jboss.security.idm.Role;
+import org.jboss.website.utils.Util;
+
+/**
+ * users to test
+ * 
+ * cn=chrisi
+ * cn=kristofn
+ * cn=oudenaar
+ * cn=jgilje
+ * cn=njipp
+ * cn=nbk27hi
+ * 
+ * 
+ * 
+ * 
+ */
+
+/**
+ * @author Sohil Shah - sohil.shah at jboss.com
+ *
+ */
+public class SyncNukesUsersTestCase extends ServletTestCase 
+{
+    private static Logger log = Logger.getLogger(SyncNukesUsersTestCase.class);
+        
+    private FileOutputStream ldifos = null;
+    private Collection usersAdded = new ArrayList();
+    
+    /**
+     * 
+     */
+    public void setUp() throws Exception
+    { 
+        File file = new File("/migration/nukes.ldif");
+        file.createNewFile();
+        this.ldifos = new FileOutputStream(file,false); //overwrite mode
+    }
+             
+    /**
+     * 
+     */
+    protected void tearDown() throws Exception 
+    {        
+        if(this.ldifos!=null)
+        {
+            this.ldifos.flush();
+            this.ldifos.close();
+        }
+    }
+
+
+
+
+    /**
+     * 
+     */
+    public void testStartSync() throws Exception
+    {
+       System.out.println("User Migration tool successfully called.........");
+        //initialize the ldif file
+        this.initLDIF(this.ldifos);
+        
+        this.performUserSync();
+        
+        this.performRoleSync();
+    }
+    
+    //------user sync-------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @throws Exception
+     */
+    private void performUserSync() throws Exception
+    {
+        StringBuffer buffer = new StringBuffer();
+        SimpleDateFormat format = new SimpleDateFormat();
+        Session session = null;
+        try
+        {
+            log.info("Starting synchronization from NukesUsers to PortalUsers...."); 
+            long start = System.currentTimeMillis();
+            
+            //testing the Hibernate setup to look into the Nukes database
+            session = Tools.getOpenSession();        
+            session.beginTransaction();
+            
+            //read a NukeUserBean            
+            Query query = session.createQuery("from NukeUserBean as u");
+            
+            int counter = 1;            
+            for(Iterator itr=query.iterate();itr.hasNext();)
+            {                
+                /*if(counter == 20)
+                {
+                    break;
+                }*/
+                
+                NukeUserBean user = (NukeUserBean)itr.next();
+                            
+                log.info("Synchronizing........"+user.getUserName()+" ("+counter+++")");
+                
+                /*Transaction userReadTx = org.jboss.website.hibernate.Tools.getOpenSession().beginTransaction(); 
+                try
+                {
+                    if(UserBean.readByUserName(user.getUserName().trim())!=null)
+                    {
+                        //the user already exists....no need to migrate
+                        continue;
+                    }
+                }
+                catch(Exception e)
+                {
+                    buffer.append("-----------------------------\n");
+                    buffer.append("User="+user.getUserName()+"\n");
+                    buffer.append("RegisteredOn="+format.format(user.getRegDate())+"\n");
+                    buffer.append("Exception="+e.toString()+"\n");
+                    buffer.append("-----------------------------\n");
+                    continue;
+                }
+                finally
+                {
+                    if(userReadTx != null)
+                    {
+                        userReadTx.rollback();
+                    }
+                }*/
+                if(this.usersAdded.contains(user.getUserName().trim()))
+                {
+                    //the user already exists....no need to migrate
+                    continue;
+                }
+                
+                if( 
+                        Util.isEmpty(user.getUserName()) ||
+                        user.getUserName().contains("--") ||
+                        user.getUserName().contains(",")  ||                        
+                        user.getUserName().contains("=") ||                        
+                        user.getUserName().contains("&#") ||
+                        user.getUserName().contains("#") ||
+                        user.getUserName().contains(";") ||
+                        user.getUserName().contains("+") ||
+                        user.getUserName().startsWith("-") ||
+                        user.getUserName().endsWith("-")
+                )
+                {
+                    buffer.append("-----------------------------\n");
+                    buffer.append("User="+user.getUserName()+"\n");
+                    buffer.append("RegisteredOn="+format.format(user.getRegDate())+"\n");
+                    buffer.append("Exception=Illegal UserName.....This account will not be synched\n");
+                    buffer.append("-----------------------------\n");
+                    continue;
+                }
+                
+                
+                //now for testing purpose setup this user into the new Portal system
+                UserBean portalUser = new UserBean();
+                ProfileBean profile = new ProfileBean();
+                JBossIdentity identity = new JBossIdentity();
+                
+                portalUser.setIdentity(identity);
+                portalUser.setProfile(profile);
+                
+                
+                //setup the portalUser
+                portalUser.setUserName(user.getUserName().trim());
+                portalUser.setForceResetEnabled(false);
+                portalUser.setOldNukesPass(user.getPass());
+                
+                
+                //setup the identity
+                identity.setUserName(user.getUserName().trim());
+                identity.setPassword(user.getPass().getBytes());
+                identity.setEmail(user.getEmail().trim());
+                if(user.getEnabled()>0)
+                {
+                    identity.setActive(true);
+                }
+                else
+                {
+                    identity.setActive(false);
+                }
+                
+                
+                identity.setFullName(user.getFname().trim()+" "+user.getLname().trim());
+                identity.setRegistrationDate(user.getRegDate());
+                identity.setSecretQuestion(user.getQuestion().trim());
+                identity.setSecretAnswer(user.getAnswer().trim());
+                
+                //other emails
+                //identity.addEmail(user.getFemail());
+                
+                //phone numbers
+                //if(user.getPhone()!=null && user.getPhone().trim().length()>0 && 
+                //   ( user.getPhone().startsWith("+")|| Character.isDigit(user.getPhone().charAt(0)) )
+                //)
+                //{
+                //    identity.addPhoneNumber(user.getPhone());
+                //}
+                
+                
+                //company
+                Address companyAddress = new Address();
+                identity.setCompanyAddress(companyAddress);
+                companyAddress.setStreet(user.getStreet().trim());
+                companyAddress.setCity(user.getCity().trim());
+                companyAddress.setState(user.getState().trim());                
+                companyAddress.setPostalCode(user.getZip().trim());
+                companyAddress.setCountry(user.getCountry().trim());
+                
+                                
+                identity.setCompanyRole(user.getRole().trim());
+                identity.setCompanyName(user.getCname().trim());
+                identity.setCompanyTitle(user.getTitle().trim());
+                
+                
+                //setup the profile
+                profile.setCompanySize(user.getCompanySize());
+                profile.setCompanyType(user.getUserType());
+                profile.setInterestType(user.getInterestInJboss());
+                if(user.getNewsletter()>0)
+                {
+                    profile.setNewsLetter(true);
+                }
+                else
+                {
+                    profile.setNewsLetter(false);
+                }
+                if(user.getSalesContact()>0)
+                {
+                    profile.setSalesContact(true);
+                }
+                else
+                {
+                    profile.setSalesContact(false);
+                }
+                if(user.getSupportContact()>0)
+                {
+                    profile.setSupportContact(true);
+                }
+                else
+                {
+                    profile.setSupportContact(false);
+                }
+                
+                //perform the user add operation
+                Transaction tx = org.jboss.website.hibernate.Tools.getOpenSession().beginTransaction();
+                boolean success = false;
+                try
+                {
+                    this.register(portalUser);
+                    success = true;
+                }
+                catch(Exception e)
+                {
+                    success = false;
+                    //log this error
+                    buffer.append("-----------------------------\n");
+                    buffer.append("User="+user.getUserName()+"\n");
+                    buffer.append("RegisteredOn="+format.format(user.getRegDate())+"\n");
+                    buffer.append("Exception="+e.toString()+"\n");
+                    buffer.append("-----------------------------\n");
+                }
+                finally
+                {
+                    if(success)
+                    {
+                        tx.commit();
+                        this.usersAdded.add(identity.getUserName().trim());
+                    }
+                    else
+                    {
+                        tx.rollback();
+                    }
+                }                               
+            }                                                
+            log.info("Synchronization from NukesUsers to PortalUsers successfully finished....");
+            long stop = System.currentTimeMillis();
+            long duration = stop - start;
+            log.info("Sync finished in..."+duration+"ms");
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+            throw e;
+        }
+        finally
+        {
+            Tools.closeSession(session);            
+            //log
+            //spit it out to a log file
+            File file = new File("/migration/synctoolusers.log");
+            file.createNewFile();
+            FileOutputStream fos = new FileOutputStream(file,false); //truncates if an older file exists
+            fos.write(buffer.toString().getBytes());
+            fos.close();
+        }
+    }
+    
+    /**
+     * 
+     *
+     */
+    private void register(UserBean user)
+    {
+        boolean success = false;        
+        try
+        {                                                        
+            //save the user to the database, this saves the user to the portal database,
+            user.save();
+            
+            //add this user to the core portal data....without this the portal will break,
+            //this should be fixed in 2.4
+            //UserModule userModule = JBossPortalUtil.getUserModule();
+            //userModule.createUser(user.getUserName(),null,null);
+                                                                                            
+            //tag success, so that the profile can be created in the JBoss Corp Identity system
+            success = true;                     
+        }        
+        catch(Exception e)
+        {
+            log.error(this,e);
+            throw new RuntimeException(e);
+        }
+        finally
+        {
+            if(success)
+            {
+                try{this.saveLDIF(user,this.ldifos);}catch(Exception e){throw new RuntimeException(e);}
+            }
+        }                
+    }
+    
+    /**
+     * 
+     * @param user
+     * @param os
+     * @throws Exception
+     */
+    private void saveLDIF(UserBean user,OutputStream os) throws Exception
+    {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-DD");
+        StringBuffer template = new StringBuffer();
+        template.append("dn: cn={0},ou=jbosssso,dc=jboss,dc=com\n");
+        template.append("cn: {1}\n");
+        template.append("sn: {2}\n");
+        template.append("o: {3}\n");        
+        template.append("objectClass: jbossIdentity\n");
+        template.append("secretQuestion: {4}\n");
+        template.append("secretAnswer: {5}\n");        
+        template.append("registrationDate: {6}\n");
+        template.append("employeeType: {7}\n");
+        template.append("title: {8}\n");
+        template.append("givenName: {9}\n");
+        template.append("displayName: {10}\n");
+        template.append("userPassword: {11}\n");
+        
+        //multivalue telephoneNumber
+        template.append("telephoneNumber: missing\n");                
+        
+        //multivalue mail
+        Collection allEmails = new ArrayList();
+        allEmails.add(user.getIdentity().getEmail());
+        allEmails.addAll(user.getIdentity().getOtherEmails());
+        if(!Util.isEmpty(allEmails))
+        {
+            int count = 0;
+            for(Iterator itr=allEmails.iterator();itr.hasNext();)
+            {
+                if(count == 0)
+                {
+                    template.append("mail: primary="+itr.next()+"\n");
+                }
+                else
+                {
+                    template.append("mail: "+itr.next()+"\n");
+                }
+                count++;
+            }
+        }
+        else
+        {
+            template.append("mail: null\n");
+        }
+        
+        //multivalue postalAddress
+        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getStreet()))
+        {
+            template.append("postalAddress: street="+user.getIdentity().getCompanyAddress().getStreet()+"\n");
+        }
+        else
+        {
+            template.append("postalAddress: street=null\n");
+        }
+        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getCity()))
+        {
+            template.append("postalAddress: city="+user.getIdentity().getCompanyAddress().getCity()+"\n");
+        }
+        else
+        {
+            template.append("postalAddress: city=null\n");
+        }
+        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getState()))
+        {
+            template.append("postalAddress: state="+user.getIdentity().getCompanyAddress().getState()+"\n");
+        }
+        else
+        {
+            template.append("postalAddress: state=null\n");
+        }
+        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getPostalCode()))
+        {
+            template.append("postalAddress: postalCode="+user.getIdentity().getCompanyAddress().getPostalCode()+"\n");
+        }
+        else
+        {
+            template.append("postalAddress: postalCode=null\n");
+        }
+        if(!Util.isEmpty(user.getIdentity().getCompanyAddress().getCountry()))
+        {
+            template.append("postalAddress: country="+user.getIdentity().getCompanyAddress().getCountry()+"\n");
+        }
+        else
+        {
+            template.append("postalAddress: country=null\n");
+        }
+        
+        template.append("\n");
+        
+        String userObject = MessageFormat.format(template.toString(),
+        new Object[]{
+            user.getIdentity().getUserName(),
+            user.getIdentity().getUserName(),
+            user.getIdentity().isActive(),
+            !Util.isEmpty(user.getIdentity().getCompanyName())?user.getIdentity().getCompanyName():"null",
+            !Util.isEmpty(user.getIdentity().getSecretQuestion())?user.getIdentity().getSecretQuestion():"null",
+            !Util.isEmpty(user.getIdentity().getSecretAnswer())?user.getIdentity().getSecretAnswer():"null",
+            user.getIdentity().getRegistrationDate()!=null?simpleDateFormat.format(user.getIdentity().getRegistrationDate()):simpleDateFormat.format(new Date()),
+            !Util.isEmpty(user.getIdentity().getCompanyRole())?user.getIdentity().getCompanyRole():"null",
+            !Util.isEmpty(user.getIdentity().getCompanyTitle())?user.getIdentity().getCompanyTitle():"null",
+            !Util.isEmpty(user.getIdentity().getFullName())?user.getIdentity().getFullName():"null",
+            !Util.isEmpty(user.getIdentity().getFullName())?user.getIdentity().getFullName():"null",
+            new String(user.getIdentity().getPassword())
+        }
+        );
+        
+        os.write(userObject.getBytes());
+        os.flush();
+    }
+    //----------role sync------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     */
+    private void performRoleSync() throws Exception
+    {
+        log.info("Starting synchronization from NukesRoles to PortalRoles....");
+        
+        //add the defaultRoles
+        this.createDefaultRoles(this.ldifos);
+        
+        //testing the Hibernate setup to look into the Nukes database
+        Session session = Tools.getCurrentSession();
+        
+        session.beginTransaction();
+        
+        //read a NukeRoleBean
+        Query query = session.createQuery("from NukeRoleBean as u");        
+        
+        int counter = 1;
+        for(Iterator itr=query.iterate();itr.hasNext();)
+        {
+            NukeRoleBean role = (NukeRoleBean)itr.next();
+            Role portalRole = new Role();
+            
+            //skip the specified roles
+            if(
+                    role.getName().equalsIgnoreCase("users") ||
+                    role.getName().equalsIgnoreCase("admins") ||
+                    role.getName().equalsIgnoreCase("jboss-html") ||
+                    role.getName().equalsIgnoreCase("jboss-blog") ||
+                    role.getName().equalsIgnoreCase("jbosside") ||
+                    role.getName().equalsIgnoreCase("nukes") ||
+                    role.getName().equalsIgnoreCase("memberplus")
+            )
+            {
+                continue;
+            }
+                                    
+            System.out.println("Synchronizing........"+role.getName()+" ("+counter+")");
+            portalRole.setName("jboss.com_"+role.getName().toLowerCase());
+            
+            for(Iterator userItr=role.getUsers().iterator();userItr.hasNext();)
+            {
+                NukeUserBean user = (NukeUserBean)userItr.next();
+                System.out.println("User="+user.getId()+","+user.getUserName());
+                portalRole.getIdentities().add(user.getUserName());
+            }                        
+            
+            
+            //now persist the portalRole into the LDAP repo
+            this.saveLDIF(portalRole,this.ldifos);
+            
+            counter++;
+        }                
+        log.info("Synchronization from NukesRoles to PortalRoles successfully finished....");
+    }  
+    
+    /**
+     * 
+     * @param role
+     * @param os
+     */
+    private void saveLDIF(Role role,OutputStream os) throws Exception
+    {
+        StringBuffer buffer = new StringBuffer();
+        
+        buffer.append("dn: cn="+role.getName()+",ou=role,dc=jboss,dc=com\n");
+        buffer.append("cn: "+role.getName()+"\n");
+        buffer.append("objectClass: groupOfUniqueNames\n");
+        if(!Util.isEmpty(role.getIdentities()))
+        {
+            for(Iterator itr=role.getIdentities().iterator();itr.hasNext();)
+            {
+                String identity = (String)itr.next();
+                buffer.append("uniqueMember: cn="+identity+"\n");
+            }
+        }
+        else
+        {
+            buffer.append("uniqueMember: cn=null\n");
+        }
+        buffer.append("\n");
+        
+        os.write(buffer.toString().getBytes());
+        os.flush();
+    }
+    
+    /**
+     * 
+     * @param os
+     * @throws Exception
+     */
+    private void createDefaultRoles(OutputStream os) throws Exception
+    {
+        StringBuffer buffer = new StringBuffer();
+        
+        buffer.append("dn: cn=Admin,ou=role,dc=jboss,dc=com\n");
+        buffer.append("cn: Admin\n");
+        buffer.append("uniqueMember: cn=admin\n");
+        buffer.append("objectClass: groupOfUniqueNames\n");
+        buffer.append("\n");
+        
+        buffer.append("dn: cn=User,ou=role,dc=jboss,dc=com\n");
+        buffer.append("cn: User\n");
+        buffer.append("uniqueMember: cn=null\n");
+        buffer.append("objectClass: groupOfUniqueNames\n");
+        buffer.append("\n");
+        
+        os.write(buffer.toString().getBytes());
+        os.flush();
+    }
+    //-------------------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     * 
+     * @throws Exception
+     */
+    private void initLDIF(OutputStream os) throws Exception
+    {
+        StringBuffer buffer = new StringBuffer();
+        
+        buffer.append("dn: dc=jboss,dc=com\n");
+        buffer.append("dc: jboss\n");
+        buffer.append("objectClass: dcObject\n");
+        buffer.append("objectClass: organizationalUnit\n");
+        buffer.append("ou: JBoss Dot Com\n");
+        buffer.append("\n");
+        buffer.append("dn: ou=role,dc=jboss,dc=com\n");
+        buffer.append("ou: role\n");
+        buffer.append("objectClass: organizationalUnit\n");
+        buffer.append("\n");
+        buffer.append("dn: ou=jbosssso,dc=jboss,dc=com\n");
+        buffer.append("ou: jbosssso\n");
+        buffer.append("objectClass: organizationalUnit\n");
+        buffer.append("\n");
+        
+        os.write(buffer.toString().getBytes());
+        os.flush();
+    }
+}

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,98 +0,0 @@
-package org.jboss.website.user.migration;
-
-
-import javax.naming.InitialContext;
-
-import org.apache.log4j.Logger;
-
-import org.hibernate.cfg.Configuration;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-
-public class Tools 
-{
-	private static final Logger log = Logger.getLogger(Tools.class);
-	
-	//hibernate configuration relation information
-	private static SessionFactory sessionFactory = null;
-	private static Configuration cfg = null;
-	private static boolean autoClose = false;
-	
-	static
-	{
-		//load the SessionFactory
-		try
-		{
-			Tools.cfg = new Configuration();
-			Tools.cfg.configure("/nukes.cfg.xml");
-			String autoCloseProperty = Tools.cfg.getProperty("hibernate.transaction.auto_close_session");
-			Tools.autoClose = Boolean.parseBoolean(autoCloseProperty);
-		}
-		catch(Exception e)
-		{
-			Tools.cfg = null;
-			Tools.sessionFactory = null;			
-			Tools.log.error("Tools",e);
-		}
-	}
-	
-    /**
-     * 
-     *
-     */
-	public static void init()
-	{
-		try
-		{
-			//just to initialize the session factory
-			Tools.sessionFactory = (SessionFactory)new InitialContext().lookup("java:jbwebsite/NukesSessionFactory");
-		}
-		catch(Exception e)
-		{
-			Tools.sessionFactory = Tools.cfg.buildSessionFactory();
-		}		
-	}
-    
-    //---------------------------------------------------------------------------------------------------------------------------------------------------
-	
-    /**
-     * 
-     * @return
-     */
-	public static Session getCurrentSession()
-	{
-        if(Tools.sessionFactory==null)
-        {
-            Tools.init();
-        }
-		Session session = Tools.sessionFactory.getCurrentSession();
-		return session;
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	public static Session getOpenSession()
-	{
-        if(Tools.sessionFactory==null)
-        {
-            Tools.init();
-        }
-		Session session = Tools.sessionFactory.openSession();
-		return session;
-	}
-	
-	/**
-     * 
-     * @param session
-	 */	
-	public static void closeSession(Session session)
-	{
-		if(session!=null && !Tools.autoClose)
-		{			
-			session.close();
-		}
-	}	
-}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/java/org/jboss/website/user/migration/Tools.java	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,98 @@
+package org.jboss.website.user.migration;
+
+
+import javax.naming.InitialContext;
+
+import org.apache.log4j.Logger;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+
+public class Tools 
+{
+	private static final Logger log = Logger.getLogger(Tools.class);
+	
+	//hibernate configuration relation information
+	private static SessionFactory sessionFactory = null;
+	private static Configuration cfg = null;
+	private static boolean autoClose = false;
+	
+	static
+	{
+		//load the SessionFactory
+		try
+		{
+			Tools.cfg = new Configuration();
+			Tools.cfg.configure("/nukes.cfg.xml");
+			String autoCloseProperty = Tools.cfg.getProperty("hibernate.transaction.auto_close_session");
+			Tools.autoClose = Boolean.parseBoolean(autoCloseProperty);
+		}
+		catch(Exception e)
+		{
+			Tools.cfg = null;
+			Tools.sessionFactory = null;			
+			Tools.log.error("Tools",e);
+		}
+	}
+	
+    /**
+     * 
+     *
+     */
+	public static void init()
+	{
+		try
+		{
+			//just to initialize the session factory
+			Tools.sessionFactory = (SessionFactory)new InitialContext().lookup("java:jbwebsite/NukesSessionFactory");
+		}
+		catch(Exception e)
+		{
+			Tools.sessionFactory = Tools.cfg.buildSessionFactory();
+		}		
+	}
+    
+    //---------------------------------------------------------------------------------------------------------------------------------------------------
+	
+    /**
+     * 
+     * @return
+     */
+	public static Session getCurrentSession()
+	{
+        if(Tools.sessionFactory==null)
+        {
+            Tools.init();
+        }
+		Session session = Tools.sessionFactory.getCurrentSession();
+		return session;
+	}
+	
+    /**
+     * 
+     * @return
+     */
+	public static Session getOpenSession()
+	{
+        if(Tools.sessionFactory==null)
+        {
+            Tools.init();
+        }
+		Session session = Tools.sessionFactory.openSession();
+		return session;
+	}
+	
+	/**
+     * 
+     * @param session
+	 */	
+	public static void closeSession(Session session)
+	{
+		if(session!=null && !Tools.autoClose)
+		{			
+			session.close();
+		}
+	}	
+}

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!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.website.user.migration.NukeRoleBean"
-        table="nuke_groups"
-        lazy="true"
-    >
-        <!--  id -->
-        <id
-            name="id"
-            column="pn_gid"
-            type="long"
-        >
-            <generator class="native"/>
-        </id>
-        
-        <!--  associations -->
-        <set name="users"
-              table="nuke_group_membership"
-              lazy="true"           
-        >
-        	<key column="pn_gid"/>
-        	<many-to-many class="org.jboss.website.user.migration.NukeUserBean" column="pn_uid" not-found="ignore"/>
-        </set>
-        
-        <!--  map the properties -->                
-        <!--  strings -->
-        <property
-            name="name"
-            column="pn_name"
-            type="string"
-        />        
-    </class>
-</hibernate-mapping>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeRoleBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!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.website.user.migration.NukeRoleBean"
+        table="nuke_groups"
+        lazy="true"
+    >
+        <!--  id -->
+        <id
+            name="id"
+            column="pn_gid"
+            type="long"
+        >
+            <generator class="native"/>
+        </id>
+        
+        <!--  associations -->
+        <set name="users"
+              table="nuke_group_membership"
+              lazy="true"           
+        >
+        	<key column="pn_gid"/>
+        	<many-to-many class="org.jboss.website.user.migration.NukeUserBean" column="pn_uid" not-found="ignore"/>
+        </set>
+        
+        <!--  map the properties -->                
+        <!--  strings -->
+        <property
+            name="name"
+            column="pn_name"
+            type="string"
+        />        
+    </class>
+</hibernate-mapping>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!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.website.user.migration.NukeUserBean"
-        table="nuke_users"
-        lazy="true"
-    >
-        <!--  id -->
-        <id
-            name="id"
-            column="pn_uid"
-            type="long"
-        >
-            <generator class="native"/>
-        </id>
-        
-        <!--  map the properties -->        
-        <property
-            name="regDate"
-            column="pn_user_regdate"
-            type="timestamp"
-            lazy="true"
-        />
-        <property
-            name="prevLastVisit"
-            column="pn_prev_last_visit"
-            type="timestamp"
-            lazy="true"
-        />
-        <property
-            name="lastVisit"
-            column="pn_last_visit"
-            type="timestamp"
-            lazy="true"
-        />
-        <property
-            name="memberPlusDate"
-            column="pn_memberplusdate"
-            type="timestamp"
-            lazy="true"
-        />        
-        
-        <!--  integers -->
-        <property
-            name="commentMax"
-            column="pn_commentmax"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="userLang"
-            column="pn_user_lang"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="thold"
-            column="pn_thold"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="newsletter"
-            column="pn_newsletter"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="enabled"
-            column="pn_enabled"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="salesContact"
-            column="pn_salescontact"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="supportContact"
-            column="pn_supportcontact"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="uorder"
-            column="pn_uorder"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="userViewEmail"
-            column="pn_user_viewemail"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="noScore"
-            column="pn_noscore"
-            type="integer"
-            lazy="true"
-        />
-        <property
-            name="timezoneOffset"
-            column="pn_timezone_offset"
-            type="integer"
-            lazy="true"
-        />
-        
-        <!--  strings -->
-        <property
-            name="userName"
-            column="pn_uname"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="answer"
-            column="pn_answer"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="bio"
-            column="pn_bio"
-            type="string"
-            lazy="true"
-        />       
-        <property
-            name="question"
-            column="pn_question"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="umode"
-            column="pn_umode"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="usingSince"
-            column="pn_usingsince"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="companySize"
-            column="pn_companysize"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userOcc"
-            column="pn_user_occ"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userFrom"
-            column="pn_user_from"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="street"
-            column="pn_street"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userIcq"
-            column="pn_user_icq"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userInterest"
-            column="pn_user_intrest"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userAim"
-            column="pn_user_aim"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="firstHear"
-            column="pn_firsthear"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="zip"
-            column="pn_zip"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="interestInJboss"
-            column="pn_interestinjboss"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="role"
-            column="pn_role"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userType"
-            column="pn_usertype"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userYim"
-            column="pn_user_yim"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userMsnm"
-            column="pn_user_msnm"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="url"
-            column="pn_url"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userSig"
-            column="pn_user_sig"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="theme"
-            column="pn_theme"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="userAvatar"
-            column="pn_user_avatar"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="phone"
-            column="pn_phone"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="state"
-            column="pn_state"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="pass"
-            column="pn_pass"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="hardware"
-            column="pn_hardware"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="os"
-            column="pn_os"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="title"
-            column="pn_title"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="fname"
-            column="pn_fname"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="lname"
-            column="pn_lname"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="name"
-            column="pn_name"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="femail"
-            column="pn_femail"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="email"
-            column="pn_email"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="city"
-            column="pn_city"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="country"
-            column="pn_country"
-            type="string"
-            lazy="true"
-        />
-        <property
-            name="cname"
-            column="pn_cname"
-            type="string"
-            lazy="true"
-        />
-    </class>
-
-</hibernate-mapping>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/NukeUserBean.hbm.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!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.website.user.migration.NukeUserBean"
+        table="nuke_users"
+        lazy="true"
+    >
+        <!--  id -->
+        <id
+            name="id"
+            column="pn_uid"
+            type="long"
+        >
+            <generator class="native"/>
+        </id>
+        
+        <!--  map the properties -->        
+        <property
+            name="regDate"
+            column="pn_user_regdate"
+            type="timestamp"
+            lazy="true"
+        />
+        <property
+            name="prevLastVisit"
+            column="pn_prev_last_visit"
+            type="timestamp"
+            lazy="true"
+        />
+        <property
+            name="lastVisit"
+            column="pn_last_visit"
+            type="timestamp"
+            lazy="true"
+        />
+        <property
+            name="memberPlusDate"
+            column="pn_memberplusdate"
+            type="timestamp"
+            lazy="true"
+        />        
+        
+        <!--  integers -->
+        <property
+            name="commentMax"
+            column="pn_commentmax"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="userLang"
+            column="pn_user_lang"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="thold"
+            column="pn_thold"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="newsletter"
+            column="pn_newsletter"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="enabled"
+            column="pn_enabled"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="salesContact"
+            column="pn_salescontact"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="supportContact"
+            column="pn_supportcontact"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="uorder"
+            column="pn_uorder"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="userViewEmail"
+            column="pn_user_viewemail"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="noScore"
+            column="pn_noscore"
+            type="integer"
+            lazy="true"
+        />
+        <property
+            name="timezoneOffset"
+            column="pn_timezone_offset"
+            type="integer"
+            lazy="true"
+        />
+        
+        <!--  strings -->
+        <property
+            name="userName"
+            column="pn_uname"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="answer"
+            column="pn_answer"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="bio"
+            column="pn_bio"
+            type="string"
+            lazy="true"
+        />       
+        <property
+            name="question"
+            column="pn_question"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="umode"
+            column="pn_umode"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="usingSince"
+            column="pn_usingsince"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="companySize"
+            column="pn_companysize"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userOcc"
+            column="pn_user_occ"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userFrom"
+            column="pn_user_from"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="street"
+            column="pn_street"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userIcq"
+            column="pn_user_icq"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userInterest"
+            column="pn_user_intrest"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userAim"
+            column="pn_user_aim"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="firstHear"
+            column="pn_firsthear"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="zip"
+            column="pn_zip"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="interestInJboss"
+            column="pn_interestinjboss"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="role"
+            column="pn_role"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userType"
+            column="pn_usertype"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userYim"
+            column="pn_user_yim"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userMsnm"
+            column="pn_user_msnm"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="url"
+            column="pn_url"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userSig"
+            column="pn_user_sig"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="theme"
+            column="pn_theme"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="userAvatar"
+            column="pn_user_avatar"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="phone"
+            column="pn_phone"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="state"
+            column="pn_state"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="pass"
+            column="pn_pass"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="hardware"
+            column="pn_hardware"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="os"
+            column="pn_os"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="title"
+            column="pn_title"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="fname"
+            column="pn_fname"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="lname"
+            column="pn_lname"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="name"
+            column="pn_name"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="femail"
+            column="pn_femail"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="email"
+            column="pn_email"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="city"
+            column="pn_city"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="country"
+            column="pn_country"
+            type="string"
+            lazy="true"
+        />
+        <property
+            name="cname"
+            column="pn_cname"
+            type="string"
+            lazy="true"
+        />
+    </class>
+
+</hibernate-mapping>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,39 +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 name="java:jbwebsite/NukesSessionFactory">
-         
-      <!--  properties when deployed in J2EE app server) -->     
-      <!--property name="connection.datasource">java:PortalDS</property>      
-      <property name="show_sql">true</property>      
-      <property name="hibernate.transaction.flush_before_completion">true</property>
-      <property name="hibernate.transaction.auto_close_session">true</property>
-      <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
-      <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property-->
-            
-      <!--  properties for testing stuff locally -->        
-      <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-      <property name="connection.url">jdbc:mysql://localhost:3306/nukes3?autoReconnectForPools=true&amp;maintainTimeStats=false&amp;cacheResultSetMetaData=true&amp;zeroDateTimeBehavior=convertToNull</property>
-      <property name="connection.username">nukes3</property>
-      <property name="connection.password">nukes3</property>  
-      <property name="hibernate.current_session_context_class">thread</property>      
-      <property name="show_sql">true</property>
-      <property name="cache.use_second_level_cache">false</property>
-      <property name="cache.use_query_cache">false</property>
-      <property name="hibernate.cglib.use_reflection_optimizer">false</property>
-                 
-      
-      <!--  caching properties -->
-      <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-      
-      <!--  set the dialect for MySQLInnoDB -->
-      <!-- Force the dialect instead of using autodetection -->
-      <property name="dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
-                        
-      <!-- Mapping files -->  
-      <mapping resource="NukeUserBean.hbm.xml"/>    
-      <mapping resource="NukeRoleBean.hbm.xml"/>      
-   </session-factory>
-</hibernate-configuration>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/classes/nukes.cfg.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,39 @@
+<?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 name="java:jbwebsite/NukesSessionFactory">
+         
+      <!--  properties when deployed in J2EE app server) -->     
+      <!--property name="connection.datasource">java:PortalDS</property>      
+      <property name="show_sql">true</property>      
+      <property name="hibernate.transaction.flush_before_completion">true</property>
+      <property name="hibernate.transaction.auto_close_session">true</property>
+      <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+      <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property-->
+            
+      <!--  properties for testing stuff locally -->        
+      <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+      <property name="connection.url">jdbc:mysql://localhost:3306/nukes3?autoReconnectForPools=true&amp;maintainTimeStats=false&amp;cacheResultSetMetaData=true&amp;zeroDateTimeBehavior=convertToNull</property>
+      <property name="connection.username">nukes3</property>
+      <property name="connection.password">nukes3</property>  
+      <property name="hibernate.current_session_context_class">thread</property>      
+      <property name="show_sql">true</property>
+      <property name="cache.use_second_level_cache">false</property>
+      <property name="cache.use_query_cache">false</property>
+      <property name="hibernate.cglib.use_reflection_optimizer">false</property>
+                 
+      
+      <!--  caching properties -->
+      <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+      
+      <!--  set the dialect for MySQLInnoDB -->
+      <!-- Force the dialect instead of using autodetection -->
+      <property name="dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
+                        
+      <!-- Mapping files -->  
+      <mapping resource="NukeUserBean.hbm.xml"/>    
+      <mapping resource="NukeRoleBean.hbm.xml"/>      
+   </session-factory>
+</hibernate-configuration>
\ No newline at end of file

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<jboss-web>
-   <context-root>migrate</context-root>   
-</jboss-web>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/jboss-web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-web>
+   <context-root>migrate</context-root>   
+</jboss-web>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,181 +0,0 @@
-<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"
-  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>forge</shortname>
-   <info>Forge tags</info>
-   
-   <tag>
-      <name>pageURL</name>
-      <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass>
-      <attribute>
-         <name>page</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>form</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-		<name>tagmeButton</name>
-		<tagclass>org.jboss.forge.common.taglib.TagMeTag</tagclass>
-		<attribute>
-	         <name>div</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-      	</attribute>
-      	<attribute>
-	         <name>service</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-      	<attribute>
-	         <name>user</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-      	<attribute>
-	         <name>path</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-	    <attribute>
-	         <name>id</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-	    <attribute>
-	         <name>website</name>
-	         <required>true</required>
-	         <rtexprvalue>true</rtexprvalue>
-	    </attribute>
-   </tag>
-   
-   <tag>
-      <name>param</name>
-      <tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass>
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>wikiURL</name>
-      <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
-      <attribute>
-         <name>page</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>freezoneURL</name>
-      <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
-      <attribute>
-         <name>page</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>projectURL</name>
-      <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
-      <attribute>
-         <name>project</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>page</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>form</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   
-   <tag>
-      <name>selectedProject</name>
-      <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass>
-   </tag>
-   
-   <tag>
-      <name>imagePath</name>
-      <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass>
-      <attribute>
-         <name>src</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-      <attribute>
-         <name>project</name>
-         <required>false</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>attrValue</name>
-      <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass>
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-   <tag>
-      <name>attrIf</name>
-      <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass>
-      <attribute>
-         <name>name</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-    <tag>
-      <name>ifEmpty</name>
-      <tagclass>org.jboss.forge.common.taglib.IfEmptyTag</tagclass>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-    <tag>
-      <name>ifNotEmpty</name>
-      <tagclass>org.jboss.forge.common.taglib.IfNotEmptyTag</tagclass>
-      <attribute>
-         <name>value</name>
-         <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
-      </attribute>
-   </tag>
-   
-</taglib>

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/tld/forge.tld	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,181 @@
+<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"
+  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>forge</shortname>
+   <info>Forge tags</info>
+   
+   <tag>
+      <name>pageURL</name>
+      <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass>
+      <attribute>
+         <name>page</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>form</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+		<name>tagmeButton</name>
+		<tagclass>org.jboss.forge.common.taglib.TagMeTag</tagclass>
+		<attribute>
+	         <name>div</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+      	</attribute>
+      	<attribute>
+	         <name>service</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+      	<attribute>
+	         <name>user</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+      	<attribute>
+	         <name>path</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	         <name>id</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	         <name>website</name>
+	         <required>true</required>
+	         <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+   </tag>
+   
+   <tag>
+      <name>param</name>
+      <tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass>
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>wikiURL</name>
+      <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
+      <attribute>
+         <name>page</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>freezoneURL</name>
+      <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+      <attribute>
+         <name>page</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>projectURL</name>
+      <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
+      <attribute>
+         <name>project</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>page</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>form</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   
+   <tag>
+      <name>selectedProject</name>
+      <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass>
+   </tag>
+   
+   <tag>
+      <name>imagePath</name>
+      <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass>
+      <attribute>
+         <name>src</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>project</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>attrValue</name>
+      <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass>
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>attrIf</name>
+      <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass>
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+    <tag>
+      <name>ifEmpty</name>
+      <tagclass>org.jboss.forge.common.taglib.IfEmptyTag</tagclass>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+    <tag>
+      <name>ifNotEmpty</name>
+      <tagclass>org.jboss.forge.common.taglib.IfNotEmptyTag</tagclass>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+</taglib>

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml	2007-08-27 11:11:53 UTC (rev 14634)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
-
-    <filter>
-        <filter-name>FilterRedirector</filter-name>
-        <filter-class>org.apache.cactus.server.FilterTestRedirector</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>FilterRedirector</filter-name>
-        <url-pattern>/FilterRedirector</url-pattern>
-    </filter-mapping>
-
-    <servlet>
-        <servlet-name>ServletRedirector</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JspRedirector</servlet-name>
-        <jsp-file>/jspRedirector.jsp</jsp-file>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>ServletRedirector</servlet-name>
-        <url-pattern>/ServletRedirector</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>JspRedirector</servlet-name>
-        <url-pattern>/JspRedirector</url-pattern>
-    </servlet-mapping>
-
-</web-app>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml)
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml	                        (rev 0)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbwebsite-user-migration/src/web/WEB-INF/web.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+
+<web-app>
+
+    <filter>
+        <filter-name>FilterRedirector</filter-name>
+        <filter-class>org.apache.cactus.server.FilterTestRedirector</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>FilterRedirector</filter-name>
+        <url-pattern>/FilterRedirector</url-pattern>
+    </filter-mapping>
+
+    <servlet>
+        <servlet-name>ServletRedirector</servlet-name>
+        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JspRedirector</servlet-name>
+        <jsp-file>/jspRedirector.jsp</jsp-file>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>ServletRedirector</servlet-name>
+        <url-pattern>/ServletRedirector</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>JspRedirector</servlet-name>
+        <url-pattern>/JspRedirector</url-pattern>
+    </servlet-mapping>
+
+</web-app>
\ No newline at end of file

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/local (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/local)

Deleted: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/local/velocity-1.4.jar
===================================================================
(Binary files differ)

Copied: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/local/velocity-1.4.jar (from rev 14634, labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/local/velocity-1.4.jar)
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/maven.xml	2007-08-27 12:44:04 UTC (rev 14639)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/maven.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -24,6 +24,8 @@
         <ant:aopc verbose="false">
             <ant:src path="${maven.build.dest}" />
             <ant:include name="**/*.class" />
+            <!--TODO: figure out issues with weaving here. For now, just exclude these new classes -->
+            <ant:exclude name="org/jboss/website/**/*.class"/>
             <ant:aopclasspath path="../shotoku/shotoku-aop/target/shotoku-aop.jar" />
             <ant:classpath>
                 <ant:path refid="maven.dependency.classpath"/>
@@ -133,6 +135,9 @@
 		<ant:copy todir="${maven.repo.local}/jboss/jars" overwrite="true">
 			<ant:fileset dir="binaries/portal/to-copy/jboss-portal.sar/lib" />
 		</ant:copy>
+		<ant:copy todir="${maven.repo.local}/jboss/jars" overwrite="true">
+			<ant:fileset dir="binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib" />
+		</ant:copy>
 
 		<ant:exec dir="${basedir}/shotoku" executable="maven">
 			<ant:arg line="all" />
@@ -146,6 +151,34 @@
 				<ant:include name="*.jar" />
 			</ant:fileset>
 		</ant:copy>
+		
+		<!-- setup the jbwebsitesecurity/jbwebsite common package -->
+		<maven:reactor includes="jbwebsite-security/project.xml" excludes="" basedir="." 
+			banner="Making jbwebsite-security for the repo" 
+			goals="clean,jar" ignoreFailures="false" />
+		<ant:copy todir="${maven.repo.local}/jbosswebsite/jars">
+			<ant:fileset dir="jbwebsite-security/target">
+				<ant:include name="*.jar" />
+			</ant:fileset>			    
+		</ant:copy>
+		
+		<maven:reactor includes="jbwebsite-common/project.xml" excludes="" basedir="." 
+			banner="Making jbwebsite-common for the repo" 
+			goals="clean,build" ignoreFailures="false" />
+		<ant:copy todir="${maven.repo.local}/jbosswebsite/jars">
+			<ant:fileset dir="jbwebsite-common/target">
+				<ant:include name="*.jar" />
+			</ant:fileset>			    
+		</ant:copy>
+		
+		<maven:reactor includes="jbwebsite-user-admin/project.xml" excludes="" basedir="." 
+			banner="Making jbwebsite-user-admin for the repo" 
+			goals="clean,build" ignoreFailures="false" />
+		<ant:copy todir="${maven.repo.local}/jbosswebsite/jars">
+			<ant:fileset dir="jbwebsite-user-admin/target">
+				<ant:include name="*.jar" />
+			</ant:fileset>			    
+		</ant:copy>
 	</goal>
 
 	<!-- Default project install goal - empty -->

Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-08-27 12:44:04 UTC (rev 14639)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-08-27 12:54:34 UTC (rev 14640)
@@ -725,4 +725,31 @@
          </page>
       </portal>
    </deployment>
+	
+	<deployment>
+      <if-exists>overwrite</if-exists>
+      <parent-ref>default</parent-ref>
+      <page>
+      	  <page-name>usercp</page-name>
+	      <window>
+	         <window-name>usercp</window-name>
+	         <instance-ref>UserControlPanelInstance</instance-ref>
+	         <region>center</region>
+	         <height>1</height>
+	      </window>
+      </page>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <parent-ref>default</parent-ref>
+      <page>
+      	  <page-name>register</page-name>
+	      <window>
+	         <window-name>register</window-name>
+	         <instance-ref>UserRegistrationInstance</instance-ref>
+	         <region>center</region>
+	         <height>1</height>
+	      </window>
+      </page>
+   </deployment>
 </deployments>