September 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8386 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/services and 19 other directories.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-09-20 12:31:12 -0400 (Thu, 20 Sep 2007) New Revision: 8386 Added: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml Modified: trunk/core-identity/src/bin/portal-identity-war/style.css trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml Log: - validate workflow configuration - added non tabbed container for user portlets - edit profile redirect when not maximized Modified: trunk/core-identity/src/bin/portal-identity-war/style.css =================================================================== --- trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-20 16:31:12 UTC (rev 8386) @@ -1,3 +1,8 @@ +/* No border container for user portlets */ +div.identity-ui div.no-tab-container{ + padding: 15px 0 10px 0; +} + /* Redefine spacing for tables. */ a { Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -63,7 +63,9 @@ public static final String REGISTRATION_PENDING = "registration_pending"; public static final String VALIDATION_FAILED = "validation_failed"; public static final String VALIDATION_VALIDATED = "validated"; + public static final String VALIDATION_ERROR = "validation_error"; + /** jBPM process variables */ public static final String PORTAL_URL = "portalURL"; public static final String VALIDATION_HASH = "validationHash"; Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -27,6 +27,7 @@ import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; import org.jboss.portal.core.identity.services.IdentityCommandFactory; import org.jboss.portal.core.identity.services.IdentityConstants; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.workflow.ValidateEmailService; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; import org.jboss.portal.portlet.PortletParametersStateString; @@ -72,10 +73,18 @@ { String bpmId = aRequest[0]; String hash = aRequest[1]; - // Validating email + try + { + // Validating email String status = validateEmailService.validateEmail(bpmId, hash); // Passing status to portlet render parameters operation = status; + } + catch(CoreIdentityConfigurationException e) + { + log.error(e); + operation = IdentityConstants.VALIDATION_ERROR; + } } } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -48,10 +48,12 @@ * @return WorkflowService * @throws NamingException */ - WorkflowService getWorkflowService(); + WorkflowService getWorkflowService() throws CoreIdentityConfigurationException; void setWorkflowService(WorkflowService workflowService); + boolean isValidConfiguration() throws CoreIdentityConfigurationException; + void startWorkflow() throws Exception; void stopWorkflow() throws Exception; Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -87,11 +87,9 @@ // Loading workflow if subscriptionmodes != automatic if (this.configuration.enableWorkflow()) { + + this.isValidConfiguration(); - this.workflowService = this.getWorkflowService(); - if (this.workflowService == null) - throw new CoreIdentityConfigurationException("Workflowservice must not be null."); - String subscriptionMode = this.configuration.getSubscriptionMode(); String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode(); String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name; @@ -201,8 +199,12 @@ this.userProfileModule = userProfileModule; } - public WorkflowService getWorkflowService() + public WorkflowService getWorkflowService() throws CoreIdentityConfigurationException { + if ( workflowService == null ) + { + throw new CoreIdentityConfigurationException("Workflow service not found. Make sure that the workflow service is deploy."); + } return workflowService; } @@ -336,11 +338,20 @@ { throw new CoreIdentityConfigurationException("Could not parse configuration file."); } - catch (Exception e) + catch (Throwable e) { - throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or minor please check the wiki."); + throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or minor please check the jboss portal wiki."); } } + + public boolean isValidConfiguration() throws CoreIdentityConfigurationException + { + if (this.configuration.enableWorkflow() ) + { + this.getWorkflowService(); + } + return true; + } protected InputStream getResource(String path) throws IOException { Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -26,6 +26,8 @@ import java.util.Locale; import java.util.Map; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; + /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -45,7 +47,7 @@ * @param adminFlag * @return */ - String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag); + String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag) throws CoreIdentityConfigurationException; /** * Approve or reject a registration @@ -54,7 +56,7 @@ * @param approve * @return */ - String approve(String id, boolean approve); + String approve(String id, boolean approve) throws CoreIdentityConfigurationException; /** * Get pending users @@ -62,7 +64,7 @@ * @param nodeName * @return */ - List getPendingUsers(String nodeName); + List getPendingUsers(String nodeName) throws CoreIdentityConfigurationException; /** * Check for a existing username in the jBPM context @@ -70,13 +72,13 @@ * @param username * @return */ - boolean checkUsername(String username); + boolean checkUsername(String username) throws CoreIdentityConfigurationException; /** * Get pending users count * * @return */ - int getPendingCount(); + int getPendingCount() throws CoreIdentityConfigurationException; } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -24,6 +24,7 @@ import java.util.Locale; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.identity.User; /** @@ -33,9 +34,27 @@ public interface ValidateEmailService { - String changeEmail(String url, User user, String email, Locale locale); + /** + * Change e-mail + * + * @param url + * @param user + * @param email + * @param locale + * @return + * @throws CoreIdentityConfigurationException + */ + String changeEmail(String url, User user, String email, Locale locale) throws CoreIdentityConfigurationException; - String validateEmail(String processId, String registrationHash); + /** + * Validate e-mail + * + * @param processId + * @param registrationHash + * @return + * @throws CoreIdentityConfigurationException + */ + String validateEmail(String processId, String registrationHash) throws CoreIdentityConfigurationException; } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -34,6 +34,7 @@ import org.jboss.portal.common.io.IOTools; import org.jboss.portal.core.identity.services.IdentityConstants; import org.jboss.portal.core.identity.services.IdentityUserManagementService; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration; import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService; import org.jboss.portal.core.identity.services.workflow.RegistrationService; @@ -107,7 +108,7 @@ } } - public WorkflowService getWorkflowService() + public WorkflowService getWorkflowService() throws CoreIdentityConfigurationException { if (this.workflowService == null) { @@ -151,8 +152,8 @@ this.identityUserManagementService = identityManagementService; } - public String registerUser(String url, String username, String password, Map profileMap, List roles, Locale locale, - boolean adminFlag) + public String registerUser(String url, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag) + throws CoreIdentityConfigurationException { if (adminFlag) @@ -190,7 +191,7 @@ } } - private void registerUserWorkflow(String url, UserContainer user, Locale locale, String processName) + private void registerUserWorkflow(String url, UserContainer user, Locale locale, String processName) throws CoreIdentityConfigurationException { JbpmContext jbpmContext = null; ProcessInstance processInstance = null; @@ -214,12 +215,6 @@ token.signal(); success = true; } - catch (Exception e) - { - success = false; - log.error("Exception in Workflow"); - throw new RuntimeException(e); - } finally { if (processInstance != null && success) @@ -230,7 +225,7 @@ } } - public String approve(String id, boolean approve) + public String approve(String id, boolean approve) throws CoreIdentityConfigurationException { // return registered if workflow is disabled if (!this.identityUIConfigurationService.getConfiguration().enableWorkflow()) @@ -261,10 +256,6 @@ } } } - catch (Exception e) - { - log.error("", e); - } finally { IOTools.safeClose(jbpmContext); @@ -272,7 +263,7 @@ return IdentityConstants.REGISTRATION_PENDING; } - public int getPendingCount() + public int getPendingCount() throws CoreIdentityConfigurationException { int count = 0; JbpmContext jbpmContext = null; @@ -307,10 +298,6 @@ } } } - catch (NamingException e) - { - log.error("failed to get pending users count", e); - } finally { IOTools.safeClose(jbpmContext); @@ -318,7 +305,7 @@ return count; } - public List getPendingUsers(String nodeName) + public List getPendingUsers(String nodeName) throws CoreIdentityConfigurationException { List queue = new ArrayList(); JbpmContext jbpmContext = null; @@ -340,10 +327,6 @@ } } } - catch (NamingException e) - { - log.error("failed to get pending users", e); - } finally { IOTools.safeClose(jbpmContext); @@ -394,7 +377,7 @@ return queue; } - public boolean checkUsername(String username) + public boolean checkUsername(String username) throws CoreIdentityConfigurationException { JbpmContext jbpmContext = null; try @@ -417,10 +400,6 @@ } } } - catch (NamingException e) - { - log.error("failed to check username", e); - } finally { IOTools.safeClose(jbpmContext); @@ -454,7 +433,7 @@ return usernameTaken; } - private List getProcessInstances(JbpmContext jbpmContext, String processName) throws NamingException + private List getProcessInstances(JbpmContext jbpmContext, String processName) throws CoreIdentityConfigurationException { List processInstances = new ArrayList(); if (!IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC.equals(processName)) Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -28,6 +28,7 @@ import org.jboss.portal.common.io.IOTools; import org.jboss.portal.core.identity.services.IdentityConstants; import org.jboss.portal.core.identity.services.IdentityUserManagementService; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService; import org.jboss.portal.core.identity.services.workflow.UserContainer; import org.jboss.portal.core.identity.services.workflow.ValidateEmailService; @@ -90,7 +91,7 @@ } } - public WorkflowService getWorkflowService() + public WorkflowService getWorkflowService() throws CoreIdentityConfigurationException { if ( workflowService == null) { @@ -134,7 +135,7 @@ this.identityUserManagementService = identityUserManagementService; } - public String changeEmail(String url, User user, String email, Locale locale) + public String changeEmail(String url, User user, String email, Locale locale) throws CoreIdentityConfigurationException { if (! this.identityUIConfigurationService.getConfiguration().enableWorkflow()) { @@ -148,7 +149,7 @@ } } - public void changeEmailWorkflow(String url, User user, String email, Locale locale) + public void changeEmailWorkflow(String url, User user, String email, Locale locale) throws CoreIdentityConfigurationException { JbpmContext jbpmContext = null; ProcessInstance processInstance = null; @@ -169,12 +170,6 @@ token.signal(); success = true; } - catch (Exception e) - { - success = false; - log.error("Exception in Workflow", e); - // throw new WorkflowException(e); - } finally { if (processInstance != null && success) @@ -185,7 +180,7 @@ } } - public String validateEmail(String id, String registrationHash) + public String validateEmail(String id, String registrationHash) throws CoreIdentityConfigurationException { String success = IdentityConstants.VALIDATION_FAILED; if (!this.identityUIConfigurationService.getConfiguration().enableWorkflow()) @@ -214,10 +209,6 @@ } } } - catch (Exception e) - { - log.error("", e); - } finally { IOTools.safeClose(jbpmContext); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -38,6 +38,7 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; import org.jboss.portal.core.identity.services.IdentityConstants; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.workflow.RegistrationService; import org.jboss.portal.core.identity.ui.IdentityUIUser; import org.jboss.portal.core.identity.ui.common.IdentityUserBean; @@ -185,9 +186,10 @@ } } - catch (Exception e) + catch(CoreIdentityConfigurationException e) { log.error("", e); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_REGISTRATION"))); } } /* Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -44,6 +44,7 @@ import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; +import org.jboss.portlet.JBossRenderRequest; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> @@ -185,6 +186,15 @@ } return "editProfile"; } + + public String getCurrentWindowState() + { + FacesContext ctx = FacesContext.getCurrentInstance(); + ExternalContext ectx = ctx.getExternalContext(); + + JBossRenderRequest request = (JBossRenderRequest) ectx.getRequest(); + return request.getWindowState().toString(); + } public String adminEditProfile() { @@ -229,7 +239,7 @@ JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse(); response.setWindowState(windowState); } - catch(Exception e) + catch(WindowStateException e) { log.error("", e); } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -38,6 +38,7 @@ import org.jboss.logging.Logger; import org.jboss.portal.core.identity.services.IdentityConstants; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.workflow.RegistrationService; import org.jboss.portal.core.identity.services.workflow.UserContainer; import org.jboss.portal.core.identity.ui.IdentityUIUser; @@ -296,7 +297,15 @@ public int getPendingCount() { - return this.registrationService.getPendingCount(); + try + { + return this.registrationService.getPendingCount(); + } + catch (CoreIdentityConfigurationException e) + { + log.error("", e); + return -1; + } } public int getUserCount() @@ -319,8 +328,15 @@ public List getPendingUsers() { - if ( this.registrationService != null && this.pendingUsers == null) - this.pendingUsers = this.registrationService.getPendingUsers(displayNode); + try + { + if ( this.registrationService != null && this.pendingUsers == null) + this.pendingUsers = this.registrationService.getPendingUsers(displayNode); + } + catch (CoreIdentityConfigurationException e) + { + log.error("", e); + } return pendingUsers; } @@ -377,19 +393,31 @@ Map params = ectx.getRequestParameterMap(); String processId = (String) params.get("processId"); String action = (String) params.get("action"); - if (processId != null && action != null) + try { - if (action.equals("approve")) + if (processId != null && action != null) { - this.registrationService.approve(processId, true); + if (action.equals("approve")) + { + this.registrationService.approve(processId, true); + } + else if (action.equals("reject")) + { + this.registrationService.approve(processId, false); + } } - else if (action.equals("reject")) - { - this.registrationService.approve(processId, false); - } } + catch (CoreIdentityConfigurationException e) + { + log.error("", e); + return "userAdmin"; + } this.pendingUsers = null; - return "pendingUsers"; + this.getPendingUsers(); + if (this.pendingUsers.size() > 0) + return "pendingUsers"; + else + return "userAdmin"; } public String approveList() @@ -432,18 +460,25 @@ public String confirmPendingAction() { - for(Iterator i = pendingActionList.iterator(); i.hasNext(); ) + try { - UserContainer user = (UserContainer) i.next(); - if (this.pendingUserAction.equals("approve")) + for(Iterator i = pendingActionList.iterator(); i.hasNext(); ) { - this.registrationService.approve(user.getProcessId(), true); + UserContainer user = (UserContainer) i.next(); + if (this.pendingUserAction.equals("approve")) + { + this.registrationService.approve(user.getProcessId(), true); + } + else if (this.pendingUserAction.equals("reject")) + { + this.registrationService.approve(user.getProcessId(), false); + } } - else if (this.pendingUserAction.equals("reject")) - { - this.registrationService.approve(user.getProcessId(), false); - } } + catch(CoreIdentityConfigurationException e) + { + log.error("", e); + } this.pendingActionList = null; this.pendingUsers = null; return "success"; Added: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java (rev 0) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -0,0 +1,76 @@ +/****************************************************************************** + * 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.portal.core.identity.ui.common; + +import org.jboss.logging.Logger; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; +import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration; +import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService; + +/** + * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @version $Revision$ + */ +public class ConfigurationBean +{ + + /** The identityUIConfiguration */ + private IdentityUIConfiguration configuration; + + /** The identityUIConfigurationService */ + private IdentityUIConfigurationService identityUIConfigurationService; + + /** the logger */ + private static final Logger log = Logger.getLogger(ConfigurationBean.class); + + public IdentityUIConfiguration getConfiguration() + { + return configuration; + } + + public IdentityUIConfigurationService getIdentityUIConfigurationService() + { + return identityUIConfigurationService; + } + + public void setIdentityUIConfigurationService(IdentityUIConfigurationService identityUIConfigurationService) + { + this.identityUIConfigurationService = identityUIConfigurationService; + this.configuration = identityUIConfigurationService.getConfiguration(); + } + + public boolean isValidConfiguration() + { + try + { + this.identityUIConfigurationService.isValidConfiguration(); + } + catch(CoreIdentityConfigurationException e) + { + log.error("", e); + return false; + } + return true; + } +} + Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -26,13 +26,8 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.portlet.PortletException; -import javax.portlet.UnavailableException; import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration; -import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService; import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration; import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.faces.el.dynamic.DynamicBean; @@ -47,27 +42,21 @@ { /** The map */ Map map = null; - - /** . */ - private IdentityUIConfigurationService identityUIConfigurationService; - public MetaDataServiceBean() throws UnavailableException - { - try - { - this.identityUIConfigurationService = (IdentityUIConfigurationService) new InitialContext().lookup("java:/portal/IdentityUIConfigurationService"); - IdentityUIConfiguration cf = identityUIConfigurationService.getConfiguration(); - this.map = cf.getUiComponents(); - } - catch (Exception e) - { - throw new UnavailableException("Configuration service not available. Please check your configuration files and the logs."); - } + public MetaDataServiceBean() + { + FacesContext ctx = FacesContext.getCurrentInstance(); + ConfigurationBean cfb = (ConfigurationBean) ctx.getApplication().createValueBinding(("#{configurationbean}")).getValue(ctx); + IdentityUIConfiguration cf = cfb.getConfiguration(); + this.map = cf.getUiComponents(); } - + public Class getType(Object propertyName) throws IllegalArgumentException { - return UIComponentConfiguration.class; + if (propertyName != null && propertyName.equals("identityUIConfiguration")) + return IdentityUIConfiguration.class; + else + return UIComponentConfiguration.class; } public PropertyValue getValue(Object propertyName) throws IllegalArgumentException @@ -81,6 +70,7 @@ return true; } + /** used on for building the url after validating email */ public String getPortalContextPath() { ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext(); @@ -88,5 +78,4 @@ ServerInvocationContext invocationContext = request.getControllerContext().getServerInvocation().getServerContext(); return invocationContext.getPortalContextPath(); } - } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-20 16:31:12 UTC (rev 8386) @@ -30,6 +30,7 @@ import javax.faces.validator.ValidatorException; import javax.portlet.PortletContext; +import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.workflow.RegistrationService; import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.NoSuchUserException; @@ -84,5 +85,9 @@ { throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"))); } + catch (CoreIdentityConfigurationException e) + { + throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"))); + } } } Modified: trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-20 16:31:12 UTC (rev 8386) @@ -58,7 +58,6 @@ <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> portal:service=Module,type=IdentityServiceController </depends> - <depends>portal:service=Workflow,type=WorkflowService</depends> <attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute> </mbean> Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-20 16:31:12 UTC (rev 8386) @@ -21,6 +21,8 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ +IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet not available. Please check your configuration and the error log for further information. + IDENTITY_WELCOME=Welcome IDENTITY_REGISTER=Register IDENTITY_LOST_PASSWORD=Lost Password @@ -156,6 +158,7 @@ IDENTITY_VERIFICATION_RETURN=Return to portal IDENTITY_VERIFICATION_LOGIN=Login +IDENTITY_VERIFICATION_STATUS_EROOR=Error while validating e-mail address. IDENTITY_VERIFICATION_STATUS_FAILED=Can not validate the e-mail address. IDENTITY_VERIFICATION_STATUS_VALIDATED=E-Mail address validated. IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Your account has been activated. You may log in now. Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 16:31:12 UTC (rev 8386) @@ -34,6 +34,15 @@ </application> <managed-bean> + <managed-bean-name>configurationbean</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>identityUIConfigurationService</property-name> + <value>#{applicationScope.IdentityUIConfigurationService}</value> + </managed-property> + </managed-bean> + <managed-bean> <managed-bean-name>metadataservice</managed-bean-name> <managed-bean-class>org.jboss.portal.core.identity.ui.common.MetaDataServiceBean</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> @@ -92,7 +101,7 @@ </managed-property> <managed-property> <property-name>defaultRoles</property-name> - <value>#{applicationScope.IdentityUIConfigurationService.configuration.defaultRoles}</value> + <value>#{configurationbean.configuration.defaultRoles}</value> </managed-property> <managed-property> <property-name>registrationService</property-name> @@ -118,11 +127,11 @@ <managed-bean-scope>session</managed-bean-scope> <managed-property> <property-name>subscriptionMode</property-name> - <value>#{applicationScope.IdentityUIConfigurationService.configuration.subscriptionMode}</value> + <value>#{configurationbean.configuration.subscriptionMode}</value> </managed-property> <managed-property> <property-name>adminSubscriptionMode</property-name> - <value>#{applicationScope.IdentityUIConfigurationService.configuration.adminSubscriptionMode}</value> + <value>#{configurationbean.configuration.adminSubscriptionMode}</value> </managed-property> <managed-property> <property-name>identityUserBean</property-name> @@ -161,7 +170,7 @@ <managed-bean-scope>request</managed-bean-scope> <managed-property> <property-name>passwordCharacters</property-name> - <value>#{applicationScope.IdentityUIConfigurationService.configuration.passwordGenerationCharacters}</value> + <value>#{configurationbean.configuration.passwordGenerationCharacters}</value> </managed-property> <managed-property> <property-name>identityUserBean</property-name> @@ -276,14 +285,14 @@ <from-view-id>/WEB-INF/jsf/index.xhtml</from-view-id> <navigation-case> <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/editProfile.xhtml</to-view-id> + <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>/WEB-INF/jsf/profile/*</from-view-id> <navigation-case> <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/editProfile.xhtml</to-view-id> + <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id> </navigation-case> </navigation-rule> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -7,7 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> <h:form> <ul class="topnav"> <li> @@ -31,5 +32,9 @@ <ui:insert name="content">Content</ui:insert> </ui:define> </ui:decorate> - + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -7,7 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> <h:form> <ul class="topnav"> <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li> @@ -31,5 +32,9 @@ </ui:define> </ui:decorate> - + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -9,7 +9,7 @@ <c:if test="#{portletPreferenceValue.captcha == true}"> <hr/> <div id="captchaContainer" style="width: 200px; height: 100px"> - <h:graphicImage id="jcaptchaimp" url="/jcaptcha" /> + <h:graphicImage id="jcaptcha" url="/jcaptcha" /> </div> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" /> Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -0,0 +1,10 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <div class="no-tab-container"> + <ui:insert name="tab-container-content"/> + </div> + +</ui:composition> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -206,9 +206,12 @@ </h:panelGrid> <hr/> -<p style="text-align: right;"> - <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> - <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> -</p> + <p style="text-align: left;"> + <h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" /> + </p> + <p style="text-align: right;"> + <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + </p> </h:form> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -45,16 +45,12 @@ <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> <hr/> - <table style="width: 100%"> - <tr> - <td style="text-align: left;"> + <p style="text-align: left;"> <h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" /> - </td> - <td style="text-align: right;"> + </p> + <p style="text-align: right;"> <h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - </td> - </tr> - </table> + </p> </h:form> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -7,7 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> <h:form> <ul class="topnav"> <li> @@ -21,7 +22,8 @@ </li> </ul> </h:form> - + <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:define name="tab-container-content">  <ul class="objectpath"> <li class="selected"> @@ -31,4 +33,11 @@ <br/>  <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -8,20 +8,18 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> -<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> + <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> + <ui:define name="title"> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> + </li> + </ui:define> + <ui:define name="content"> + <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml"> + <ui:param name="manager" value="#{editprofilemgr}"/> + <ui:param name="adminMode" value="false"/> + </ui:decorate> + </ui:define> + </ui:composition> -<ui:define name="title"> - <li class="selected"> - <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> - </li> -</ui:define> - -<ui:define name="content"> - <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml"> - <ui:param name="manager" value="#{editprofilemgr}"/> - <ui:param name="adminMode" value="false"/> - </ui:decorate> -</ui:define> - -</ui:composition> </div> Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -0,0 +1,21 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + class="identity-ui"> + + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> + +<c:choose> +<c:when test="#{editprofilemgr.currentWindowState == 'maximized'}"> +  + <ui:include src="/WEB-INF/jsf/profile/editProfile.xhtml" /> +</c:when> +<c:otherwise> +  + <ui:include src="/WEB-INF/jsf/profile/viewProfile.xhtml" /> +</c:otherwise> +</c:choose> +</div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -7,25 +7,34 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - - <h:form> - <ul class="topnav"> - <li> - <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/> - </li> - <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li> - </ul> - </h:form> - -  + +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> <h:form> - <ul class="objectpath"> + <ul class="topnav"> + <li> + <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/> + </li> + <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li> + </ul> + </h:form> + <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:define name="tab-container-content"> +  + <h:form> + <ul class="objectpath"> <ui:insert name="title">Title</ui:insert> - </ul> - </h:form> - <br/> -  - <ui:insert name="content">Content</ui:insert> + </ul> + </h:form> + <br/> +  + <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> - </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -7,7 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> <h:form> <ul class="topnav"> <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></li> @@ -16,7 +17,8 @@ </li> </ul> </h:form> - + <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:define name="tab-container-content">  <ul class="objectpath"> <li class="selected"> @@ -26,6 +28,12 @@ <br/>  <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> - </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -8,6 +8,8 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> <h:form> <ul class="topnav"> <li> @@ -24,7 +26,8 @@ </c:if> </ul> </h:form> - + <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:define name="tab-container-content">  <ul class="objectpath"> <li class="selected"> @@ -34,4 +37,11 @@ <br/>  <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -8,30 +8,40 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - <h:form> - <ul class="topnav"> - <li id="currentTab"> - <h:outputText value="#{bundle.IDENTITY_WELCOME}"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/> - </li> +<c:choose> + <c:when test="#{configurationbean.validConfiguration}"> + <h:form> + <ul class="topnav"> + <li id="currentTab"> + <h:outputText value="#{bundle.IDENTITY_WELCOME}"/> + </li> + <li> + <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/> + </li>  - <c:if test="#{portletPreferenceValue.lostPassword == true}"> - <li> - <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/> - </li> - </c:if> - </ul> - </h:form> - -  - <ul class="objectpath"> - <li class="selected"> - <ui:insert name="title">Title</ui:insert> - </li> - </ul> - <br/> -  - <ui:insert name="content">Content</ui:insert> + <c:if test="#{portletPreferenceValue.lostPassword == true}"> + <li> + <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/> + </li> + </c:if> + </ul> + </h:form> + <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:define name="tab-container-content"> +  + <ul class="objectpath"> + <li class="selected"> + <ui:insert name="title">Title</ui:insert> + </li> + </ul> + <br/> +  + <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> + </c:when> + <c:otherwise> + <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span> + </c:otherwise> +</c:choose> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-20 16:31:12 UTC (rev 8386) @@ -12,6 +12,9 @@ <b> <c:choose> + <c:when test="#{portletRenderParameter.operation == 'validation_error'}"> + <h:outputText value="#{bundle.IDENTITY_VERIFICATION_STATUS_ERROR}" /> + </c:when> <c:when test="#{portletRenderParameter.operation == 'validation_failed'}"> <h:outputText value="#{bundle.IDENTITY_VERIFICATION_STATUS_FAILED}" /> </c:when> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-20 16:26:53 UTC (rev 8385) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-20 16:31:12 UTC (rev 8386) @@ -50,7 +50,7 @@ <preference>  <name>captcha</name> - <value>true</value> + <value>false</value> </preference> <preference>  <name>lostPassword</name> - <value>true</value> + <value>false</value> </preference> </portlet-preferences> </portlet> @@ -92,7 +92,7 @@ requires correct mail service configuration --> <name>resetPassword</name> - <value>true</value> + <value>false</value> </preference> </portlet-preferences> </portlet>

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8385 - in modules: common/trunk/mc and 25 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 12:26:53 -0400 (Thu, 20 Sep 2007) New Revision: 8385 Added: modules/portlet/trunk/.classpath modules/portlet/trunk/.project modules/portlet/trunk/.settings/ modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs modules/portlet/trunk/build/local.properties modules/test/trunk/.classpath modules/test/trunk/.project modules/test/trunk/.settings/ modules/test/trunk/.settings/org.eclipse.jdt.core.prefs modules/web/trunk/.classpath modules/web/trunk/.project modules/web/trunk/.settings/ modules/web/trunk/.settings/org.eclipse.jdt.core.prefs Modified: modules/common/trunk/.classpath modules/common/trunk/.project modules/common/trunk/mc/ modules/common/trunk/portal/ modules/identity/trunk/.classpath modules/identity/trunk/.project modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java modules/portlet/trunk/ modules/portlet/trunk/bridge/ modules/portlet/trunk/federation/ modules/portlet/trunk/jsr168api/ modules/portlet/trunk/management/ modules/portlet/trunk/portlet/ modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml modules/portlet/trunk/test/ modules/test/trunk/ modules/test/trunk/build/ modules/test/trunk/test/ modules/web/trunk/ modules/web/trunk/build/ modules/web/trunk/web/ Log: - Update Eclipse classpath - Fix portlet.xml so that they are valid against the DTD (It passes the testsuite) Modified: modules/common/trunk/.classpath =================================================================== --- modules/common/trunk/.classpath 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/common/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385) @@ -1,19 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="common/src/main"/> - <classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/> - <classpathentry kind="lib" path="/tools/lib/cargo-core-uberjar-0.8.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/> - <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> - <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> + <classpathentry kind="src" path="mc/src/main/java"/> + <classpathentry kind="src" path="portal/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar" sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: modules/common/trunk/.project =================================================================== --- modules/common/trunk/.project 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/common/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>common_module</name> + <name>module-common</name> <comment></comment> <projects> </projects> Property changes on: modules/common/trunk/mc ___________________________________________________________________ Name: svn:ignore + output Property changes on: modules/common/trunk/portal ___________________________________________________________________ Name: svn:ignore + output Modified: modules/identity/trunk/.classpath =================================================================== --- modules/identity/trunk/.classpath 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/identity/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385) @@ -1,19 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="identity/src/main"/> + <classpathentry kind="src" path="sso/src/main"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbosssx.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> - <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-opends/lib/OpenDS.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/> + <classpathentry kind="lib" path="thirdparty/cas/lib/cas-server-3.0.7.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> + <classpathentry kind="lib" path="thirdparty/opensso/lib/amclientsdk.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> + <classpathentry kind="lib" path="thirdparty/spring/lib/spring-2.0.3.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/> + <classpathentry kind="lib" path="thirdparty/hibernate/lib/hibernate3.jar"/> + <classpathentry kind="lib" path="thirdparty/cas/lib/casclient.jar"/> + <classpathentry kind="lib" path="thirdparty/josso/lib/josso-1.5.jar"/> + <classpathentry kind="lib" path="thirdparty/josso/lib/josso-tomcat55-plugin-1.5.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> + <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosssx.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-opends/lib/OpenDS.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: modules/identity/trunk/.project =================================================================== --- modules/identity/trunk/.project 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/identity/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>identity-module</name> + <name>module-identity</name> <comment></comment> <projects> </projects> Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java 2007-09-20 16:26:53 UTC (rev 8385) @@ -21,17 +21,16 @@ */ package org.jboss.portal.identity.auth; -import org.jboss.security.auth.spi.DatabaseServerLoginModule; +import java.security.Principal; +import java.security.acl.Group; +import java.util.Map; import javax.security.auth.Subject; -import javax.security.auth.login.LoginException; import javax.security.auth.callback.CallbackHandler; -import java.util.Map; -import java.util.Collections; -import java.util.Arrays; -import java.security.Principal; -import java.security.acl.Group; +import javax.security.auth.login.LoginException; +import org.jboss.security.auth.spi.DatabaseServerLoginModule; + /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java 2007-09-20 16:26:53 UTC (rev 8385) @@ -70,9 +70,6 @@ private MembershipModule membershipModule; private UserProfileModule userProfileModule; - private String userName; - private String password; - public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { super.initialize(subject, callbackHandler, sharedState, options); Property changes on: modules/portlet/trunk ___________________________________________________________________ Name: svn:ignore + thirdparty Added: modules/portlet/trunk/.classpath =================================================================== --- modules/portlet/trunk/.classpath (rev 0) +++ modules/portlet/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="portlet/src/main"/> + <classpathentry kind="src" path="bridge/src/main"/> + <classpathentry kind="src" path="federation/src/main"/> + <classpathentry kind="src" path="jsr168api/src/main"/> + <classpathentry kind="src" path="management/src/main"/> + <classpathentry kind="src" path="test/src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/> + <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/> + <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/jsp-api.jar"/> + <classpathentry kind="lib" path="thirdparty/portals-bridges/lib/portals-bridges-common.jar"/> + <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: modules/portlet/trunk/.project =================================================================== --- modules/portlet/trunk/.project (rev 0) +++ modules/portlet/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>module-portlet</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,12 @@ +#Wed Sep 12 11:19:13 CEST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 Property changes on: modules/portlet/trunk/bridge ___________________________________________________________________ Name: svn:ignore + output Added: modules/portlet/trunk/build/local.properties =================================================================== --- modules/portlet/trunk/build/local.properties (rev 0) +++ modules/portlet/trunk/build/local.properties 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,48 @@ +### ====================================================================== ### +## ## +## Local project properties. ## +## ## +## Define properties that are local to your environment here. This ## +## file (local.properties) should not be checked in. Modify the ## +## example to affect all users. ## +## ## +### ====================================================================== ### + +### General compiler configuration ### + +#build.compiler=jikes +#build.warnings=true +#build.pedantic=true +#javac.depend=on + +### Javac/Jikes compiler configuration ### + +javac.optimize=off +javac.debug=on +javac.deprecation=on + +### Enable verbose build output ### + +#init.verbose=true + +### JavaDoc ### +#docs-javadocs.disable=true + +### Do we build xdoclet or get it from thirdparty ### +### uncomment for thirdparty: comment to use xdoclet module. +### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml +#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet + +# Portal database, for now : hsqldb, mysql, postgresql are the possible values +portal.database=mysql +# The datasource name used in the JNDI binding +portal.datasource.name=PortalDS +# Context root for the portal main servlet +portal.web.context-root=/portal +# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default +portal.deploy.dir=default/deploy +portal-ha.deploy.dir=all/deploy +# Show SQL or not +portal.sql.show=false +# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable +#jboss.home= Property changes on: modules/portlet/trunk/federation ___________________________________________________________________ Name: svn:ignore + output Property changes on: modules/portlet/trunk/jsr168api ___________________________________________________________________ Name: svn:ignore + output Property changes on: modules/portlet/trunk/management ___________________________________________________________________ Name: svn:ignore + output Property changes on: modules/portlet/trunk/portlet ___________________________________________________________________ Name: svn:ignore + output Modified: modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml 2007-09-20 16:26:53 UTC (rev 8385) @@ -265,24 +265,6 @@ </portlet> --> - <security-constraint> - <portlet-collection> - <portlet-name>Portlet1</portlet-name> - </portlet-collection> - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - </security-constraint> - <security-constraint> - <portlet-collection> - <portlet-name>Portlet1</portlet-name> - <portlet-name>Portlet4</portlet-name> - </portlet-collection> - <user-data-constraint> - <transport-guarantee>INTEGRAL</transport-guarantee> - </user-data-constraint> - </security-constraint> - <custom-portlet-mode> <description>first mode</description> <description xml:lang="fr">premier mode</description> @@ -310,4 +292,23 @@ <description>second attribute</description> <name>att2</name> </user-attribute> + + <security-constraint> + <portlet-collection> + <portlet-name>Portlet1</portlet-name> + </portlet-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> + <security-constraint> + <portlet-collection> + <portlet-name>Portlet1</portlet-name> + <portlet-name>Portlet4</portlet-name> + </portlet-collection> + <user-data-constraint> + <transport-guarantee>INTEGRAL</transport-guarantee> + </user-data-constraint> + </security-constraint> + </portlet-app> Modified: modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml 2007-09-20 16:26:53 UTC (rev 8385) @@ -21,12 +21,8 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<portlet-app> -<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - version="1.0"> - <portlet> <portlet-name>UniversalTestPortletA</portlet-name> <session-config> Modified: modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml 2007-09-20 16:26:53 UTC (rev 8385) @@ -71,7 +71,7 @@ <short-title>short-title</short-title> <keywords>keywords</keywords> </portlet-info> - <portlet-preference> + <portlet-preferences> <preference> <name>localized_pref</name> <value>std_localized_value</value> @@ -96,12 +96,13 @@ <value>multi_pref_value_2</value> <read-only>true</read-only> </preference> - </portlet-preference> + </portlet-preferences> </portlet> <portlet> <portlet-name>CachePortlet</portlet-name> <portlet-class>org.jboss.portal.test.portlet.info.universal.SimplePortlet</portlet-class> + <expiration-cache>65</expiration-cache> <supports> <mime-type>text/html</mime-type> </supports> @@ -110,7 +111,6 @@ <short-title>short-title</short-title> <keywords>keywords</keywords> </portlet-info> - <expiration-cache>65</expiration-cache> </portlet> <portlet> Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml 2007-09-20 16:26:53 UTC (rev 8385) @@ -41,9 +41,6 @@ <portlet> <portlet-name>TestUniversalPortletB</portlet-name> <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class> - <supports> - <mime-type>text/html</mime-type> - </supports> <init-param> <name>InitParamA</name> <value>InitParamAValue</value> @@ -52,6 +49,9 @@ <name>InitParamB</name> <value>InitParamBValue</value> </init-param> + <supports> + <mime-type>text/html</mime-type> + </supports> <portlet-info> <title></title> </portlet-info> Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml 2007-09-20 12:47:58 UTC (rev 8384) +++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml 2007-09-20 16:26:53 UTC (rev 8385) @@ -34,10 +34,6 @@ <supports> <mime-type>text/html</mime-type> </supports> - <custom-window-state> - <description>Some unmapped by portal state</description> - <name>UNMAPPED_STATE</name> - </custom-window-state> <portlet-info> <title></title> </portlet-info> @@ -54,6 +50,10 @@ </portlet-info> </portlet> + <custom-window-state> + <description>Some unmapped by portal state</description> + <window-state>UNMAPPED_STATE</window-state> + </custom-window-state> </portlet-app> Property changes on: modules/portlet/trunk/test ___________________________________________________________________ Name: svn:ignore + output Property changes on: modules/test/trunk ___________________________________________________________________ Name: svn:ignore + thirdparty Added: modules/test/trunk/.classpath =================================================================== --- modules/test/trunk/.classpath (rev 0) +++ modules/test/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="test/src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> + <classpathentry kind="lib" path="test/selenium-java-client-driver.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/> + <classpathentry kind="lib" path="thirdparty/hibernate/lib/hibernate3.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jnp-client.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jnpserver.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-transaction.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-system.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-opends/lib/OpenDS.jar"/> + <classpathentry kind="lib" path="thirdparty/codehaus/cargo/lib/cargo-core-uberjar-0.9.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: modules/test/trunk/.project =================================================================== --- modules/test/trunk/.project (rev 0) +++ modules/test/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>module-test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: modules/test/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- modules/test/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ modules/test/trunk/.settings/org.eclipse.jdt.core.prefs 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,12 @@ +#Thu Sep 20 15:11:39 CEST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 Property changes on: modules/test/trunk/build ___________________________________________________________________ Name: svn:ignore + local.properties Property changes on: modules/test/trunk/test ___________________________________________________________________ Name: svn:ignore + output Property changes on: modules/web/trunk ___________________________________________________________________ Name: svn:ignore + thirdparty Added: modules/web/trunk/.classpath =================================================================== --- modules/web/trunk/.classpath (rev 0) +++ modules/web/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="web/src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-util.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: modules/web/trunk/.project =================================================================== --- modules/web/trunk/.project (rev 0) +++ modules/web/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>module-web</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: modules/web/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- modules/web/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ modules/web/trunk/.settings/org.eclipse.jdt.core.prefs 2007-09-20 16:26:53 UTC (rev 8385) @@ -0,0 +1,12 @@ +#Thu Sep 20 15:12:51 CEST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 Property changes on: modules/web/trunk/build ___________________________________________________________________ Name: svn:ignore + local.properties Property changes on: modules/web/trunk/web ___________________________________________________________________ Name: svn:ignore + output

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8384 - in docs/trunk: referenceGuide/en/modules and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 08:47:58 -0400 (Thu, 20 Sep 2007) New Revision: 8384 Modified: docs/trunk/common/en/modules/overview.xml docs/trunk/referenceGuide/en/modules/installation.xml docs/trunk/referenceGuide/en/modules/supported.xml docs/trunk/referenceGuide/en/modules/tutorials.xml Log: Minor Modified: docs/trunk/common/en/modules/overview.xml =================================================================== --- docs/trunk/common/en/modules/overview.xml 2007-09-20 10:32:08 UTC (rev 8383) +++ docs/trunk/common/en/modules/overview.xml 2007-09-20 12:47:58 UTC (rev 8384) @@ -32,8 +32,7 @@ <para>The JBoss Portal framework and architecture includes the portal container and supports a wide range of features including standard portlets, single sign-on, clustering and internationalization. Portal themes and layouts are configurable. Fine-grained security - administration down to portlet permissions rounds out the security model. JBoss Portal - includes a rich content management system and message board support.</para> + administration down to portlet permissions rounds out the security model.</para> <para> <emphasis role="bold">JBoss Portal Resources:</emphasis> <orderedlist> Modified: docs/trunk/referenceGuide/en/modules/installation.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/installation.xml 2007-09-20 10:32:08 UTC (rev 8383) +++ docs/trunk/referenceGuide/en/modules/installation.xml 2007-09-20 12:47:58 UTC (rev 8384) @@ -148,7 +148,8 @@ <xref linkend="install_binarydownload"/> contains pre-configured datasource descriptors, you can use for most popular RDBMS under the <emphasis>setup</emphasis> - directory. + directory. For more details about the datasource descriptor or if your database server is not part + of the pre-built descriptors, please refer to: <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=CreateAJDBCDataSource">the dedicated wiki page.</ulink> <mediaobject> <imageobject> <imagedata align="center" valign="middle" fileref="images/setup/dsfiles.png"/> @@ -557,7 +558,7 @@ <para> <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/default_ss.jpg"/> + <imagedata align="center" valign="middle" fileref="images/frontpage.png"/> </imageobject> </mediaobject> </para> Modified: docs/trunk/referenceGuide/en/modules/supported.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/supported.xml 2007-09-20 10:32:08 UTC (rev 8383) +++ docs/trunk/referenceGuide/en/modules/supported.xml 2007-09-20 12:47:58 UTC (rev 8384) @@ -40,7 +40,7 @@ <title>JBoss Application Server</title> <para>JBoss Portal 2.6.2 is tested with JBoss AS 4.0.5, JBoss AS 4.2.1 and JBoss EAP 4.2. It is highly recommended to use JBoss Portal 2.6.2 with JBoss Enterprise Application Platform 4.2 for - all who have access to it through the support portal and JBoss AS 4.2.1 for everybody else.</para> + customers who have access to it through the support portal and JBoss AS 4.2.1 for everybody else.</para> <warning> <para> Versions before 4.0.4 of JBoss Application Server are not supported with this version of JBoss Portal. And JBoss AS 4.0.5 will not be supported in newer release of JBoss Portal. Modified: docs/trunk/referenceGuide/en/modules/tutorials.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/tutorials.xml 2007-09-20 10:32:08 UTC (rev 8383) +++ docs/trunk/referenceGuide/en/modules/tutorials.xml 2007-09-20 12:47:58 UTC (rev 8384) @@ -18,21 +18,21 @@ </chapterinfo> <title>Portlet Primer</title> <sect1 id="portlet_primer"> - <title>JSR 168 Overview</title> - <para>The JSR 168 specification aims at defining porlets that can be used by any JSR168 portlet container also + <title>JSR-168 Overview</title> + <para>The JSR-168 specification aims at defining porlets that can be used by any JSR-168 portlet container also called portals. There are different portals out there with commercial and non-commercial licences. In this chapter we will briefly describe such portlets but for more details you should read the specifications available on the web.</para> <para> <note>This section is a brief overview of the - <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR 168 Portlet Specification</ulink> + <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink> , and it does not cover the topics in great detail. We strongly encourage portlet developers to read the Specification that can be found <ulink url="http://www.jcp.org/en/jsr/detail?id=168">here</ulink> . </note> </para> - <para>As of today, JBoss portal is fully JSR168 1.0 compliant, that means that any JSR168 portlet will behave + <para>As of today, JBoss portal is fully JSR-168 compliant, that means that any JSR-168 portlet will behave as it should inside the portal.</para> <sect2> <title>Portal Pages</title> @@ -89,7 +89,7 @@ <para>This section will introduce the reader to deploying his first portlet in JBoss Portal. It requires you download the HelloWorldPortlet from PortletSwap.com, using this <ulink - url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">link</ulink>. + url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">link</ulink>. </para> </sect3> <sect3>

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8383 - branches/JBoss_Portal_Branch_2_6/build.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 06:32:08 -0400 (Thu, 20 Sep 2007) New Revision: 8383 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml Log: oups Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-20 10:11:11 UTC (rev 8382) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-20 10:32:08 UTC (rev 8383) @@ -256,7 +256,7 @@ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/> </copy> <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> @@ -289,7 +289,7 @@ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/> </copy> <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar">

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8382 - branches/JBoss_Portal_Branch_2_6/build.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 06:11:11 -0400 (Thu, 20 Sep 2007) New Revision: 8382 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml Log: Include samples-users in the distrib Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-20 09:12:30 UTC (rev 8381) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-20 10:11:11 UTC (rev 8382) @@ -256,6 +256,7 @@ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.war/**"/> </copy> <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> @@ -288,6 +289,7 @@ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.war/**"/> </copy> <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar">

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8381 - branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 05:12:30 -0400 (Thu, 20 Sep 2007) New Revision: 8381 Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp Log: minor Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp 2007-09-20 08:12:15 UTC (rev 8380) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp 2007-09-20 09:12:30 UTC (rev 8381) @@ -27,7 +27,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<div class="box" align="center"> +<div class="box"> <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> <tr> <td colspan="1"> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2007-09-20 08:12:15 UTC (rev 8380) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2007-09-20 09:12:30 UTC (rev 8381) @@ -27,7 +27,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<div class="box" align="center"> +<div class="box"> <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> <tr> <td colspan="1"> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2007-09-20 08:12:15 UTC (rev 8380) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2007-09-20 09:12:30 UTC (rev 8381) @@ -27,7 +27,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<div class="box" align="center"> +<div class="box"> <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> <tr> <td colspan="1">

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8380 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 04:12:15 -0400 (Thu, 20 Sep 2007) New Revision: 8380 Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml Log: - Back to automatic mode Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-20 07:46:02 UTC (rev 8379) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-20 08:12:15 UTC (rev 8380) @@ -30,7 +30,7 @@ - jbp_identity_validation_workflow: Email verification, No admin approval - jbp_identity_validation_approval_workflow: Email verification, Admin approval --> - <subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode> + <subscription-mode>automatic</subscription-mode>

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8379 - docs/trunk/userGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 03:46:02 -0400 (Thu, 20 Sep 2007) New Revision: 8379 Modified: docs/trunk/userGuide/en/modules/dynamicity.xml Log: minor Modified: docs/trunk/userGuide/en/modules/dynamicity.xml =================================================================== --- docs/trunk/userGuide/en/modules/dynamicity.xml 2007-09-20 07:40:20 UTC (rev 8378) +++ docs/trunk/userGuide/en/modules/dynamicity.xml 2007-09-20 07:46:02 UTC (rev 8379) @@ -31,10 +31,12 @@ portlet, allowing for dynamic customization of any of the above components.</listitem> </itemizedlist> </para> +  </sect1> <sect1 id="management_portlet"> <title>Management Portlet</title> @@ -117,7 +119,7 @@ <para> In the next sections we will demonstrate the functionality of the management portlet by drilling - progressively further down this hiearchy to look at the default portal, one of its pages, show + progressively further down this hierarchy to look at the default portal, one of its pages, show how to configure content on a page and finally, look at a specific window information. </para> </sect3> @@ -150,18 +152,18 @@ </para> <para> + It is also possible to designate one of the portal page as the default page that users are directed + to when they first access the portal instance. This is done by clicking on the <literal>Make Default</literal> + action. + </para> + + <para> It is possible to create new pages using the page creation form located under the portal-wide operation links. Enter the new page name and click on <literal>Add</literal> and the new page will appear in the pages list, ready to be configured. </para> <para> - It is also possible to designate one of the portal page as the default page that users are directed - to when they first access the portal instance. This is done by selecting the page via the page - selection drop-down menu and then click on <literal>Update</literal>. - </para> - - <para> Finally, a table displaying the list of available pages for this portal instance is located at the bottom of this screen. The first column shows the page name, which you can click to drill down the hierachy and display the information specific to that particular page. The second column, on the other

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8377 - docs/trunk/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-20 03:24:04 -0400 (Thu, 20 Sep 2007) New Revision: 8377 Modified: docs/trunk/referenceGuide/en/modules/portalapi.xml Log: Bug is gone Modified: docs/trunk/referenceGuide/en/modules/portalapi.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/portalapi.xml 2007-09-20 04:26:05 UTC (rev 8376) +++ docs/trunk/referenceGuide/en/modules/portalapi.xml 2007-09-20 07:24:04 UTC (rev 8377) @@ -540,8 +540,6 @@ newEvent = new WindowActionEvent(windowB); newEvent.setParameters(wae.getParameters()); - // Due to a bug those 2 following lines are required but have no meaning for now - // See: http://jira.jboss.com/jira/browse/JBPORTAL-1604 newEvent.setMode(wae.getMode()); newEvent.setWindowState(WindowState.MAXIMIZED);

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8376 - modules/identity/trunk/sso.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-09-20 00:26:05 -0400 (Thu, 20 Sep 2007) New Revision: 8376 Modified: modules/identity/trunk/sso/build.xml Log: sso build cleanup Modified: modules/identity/trunk/sso/build.xml =================================================================== --- modules/identity/trunk/sso/build.xml 2007-09-20 02:00:51 UTC (rev 8375) +++ modules/identity/trunk/sso/build.xml 2007-09-20 04:26:05 UTC (rev 8376) @@ -208,17 +208,43 @@ <mkdir dir="${build.lib}"/> <jar jarfile="${build.lib}/portal-identity-sso-lib.jar"> <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/> - </jar> + </jar> + +  + <copy todir="${build.resources}/portal-cas-sso.sar" overwrite="true"> + <fileset dir="${build.resources}/portal-cas-sso-sar"/> + </copy> + <copy todir="${build.resources}/portal-cas-sso.sar/lib" overwrite="true"> + <fileset dir="${cas.cas.lib}" includes="casclient.jar"/> + <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> + </copy> + <jar jarfile="${build.lib}/portal-cas.sar"> + <fileset dir="${build.resources}/portal-cas-sso.sar"/> + </jar> + + <copy todir="${build.resources}/portal-caslenient-sso.sar/META-INF" overwrite="true"> + <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF" includes="jboss-service.xml"/> + </copy> + <copy todir="${build.resources}/portal-caslenient-sso.sar/lib" overwrite="true"> + <fileset dir="${cas.cas.lib}" includes="casclient-lenient.jar"/> + <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> + </copy> + <jar jarfile="${build.lib}/portal-cas-lenient.sar"> + <fileset dir="${build.resources}/portal-caslenient-sso.sar"/> + </jar> + +  + <copy todir="${build.resources}/portal-josso-sso.sar" overwrite="true"> + <fileset dir="${build.resources}/portal-josso-sso-sar"/> + </copy> + <copy todir="${build.resources}/portal-josso-sso.sar/lib" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> + </copy> + <jar jarfile="${build.lib}/portal-josso.sar"> + <fileset dir="${build.resources}/portal-josso-sso.sar"/> + </jar> </target> - <target name="package-tests" depends="output"> - <jar jarfile="${build.lib}/portal-identity-sso-test-lib.jar"> - <fileset dir="${build.classes}"/> - <fileset dir="${build.resources}/portal-identity-test-jar"/> - </jar> - </target> - -    @@ -245,7 +271,17 @@ <target name="main" depends="most"/> <target name="all" depends="_default:all"/> <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> +  + <target name="help"> + <echo>Clean Build = ant clean main</echo> + <echo>Deploy the CAS Integration = ant deploy-cas</echo> + <echo>Deploy the CAS Integration (Lenient Version) = ant deploy-cas-lenient</echo> + <echo>Deploy the JOSSO Integration = ant deploy-josso</echo> + <echo>Run the test suite = ant tests</echo> + <echo>Run the test suite and produce a report = ant tests reports</echo> + </target>   @@ -262,16 +298,12 @@ --> <target name="deploy-cas" depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib/casclient-lenient.jar"/> + <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-lenient.sar"/>  - <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/META-INF" overwrite="true"> - <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF" includes="jboss-service.xml"/> - </copy> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib" overwrite="true"> - <fileset dir="${cas.cas.lib}" includes="casclient.jar"/> - <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> - </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-cas.sar"/> + </copy>  <copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib" overwrite="true"> @@ -288,16 +320,12 @@ </target> <target name="deploy-cas-lenient" depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib/casclient.jar"/> + <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cas.sar"/>  - <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/META-INF" overwrite="true"> - <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF" includes="jboss-service.xml"/> - </copy> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib" overwrite="true"> - <fileset dir="${cas.cas.lib}" includes="casclient-lenient.jar"/> - <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> - </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-cas-lenient.sar"/> + </copy>  <copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib" overwrite="true"> @@ -313,7 +341,7 @@ </copy> </target> -  <target name="deploy-josso" depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> +  - <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-josso-sso.sar/META-INF" overwrite="true"> - <fileset dir="${build.resources}/portal-josso-sso-sar/META-INF" includes="jboss-service.xml"/> - </copy> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-josso-sso.sar/lib" overwrite="true"> - <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> - </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-josso.sar"/> + </copy>  <copy todir="${jboss.home}/server/${portal.deploy.dir}/../conf" overwrite="true"> @@ -361,10 +387,14 @@   -  -  +  + <target name="package-tests" depends="output"> + <jar jarfile="${build.lib}/portal-identity-sso-test-lib.jar"> + <fileset dir="${build.classes}"/> + <fileset dir="${build.resources}/portal-identity-test-jar"/> + </jar> + </target> + <target name="tests" depends="package-tests"> <execute-tests>  + </target> <target name="reports" depends="init"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.reports}/html"/>

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits September 2007