JBoss Portal SVN: r8407 - modules/common/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 09:22:59 -0400 (Fri, 21 Sep 2007)
New Revision: 8407
Modified:
modules/common/trunk/build/build-thirdparty.xml
modules/common/trunk/build/build.xml
Log:
Version numbers
Modified: modules/common/trunk/build/build-thirdparty.xml
===================================================================
--- modules/common/trunk/build/build-thirdparty.xml 2007-09-21 13:18:04 UTC (rev 8406)
+++ modules/common/trunk/build/build-thirdparty.xml 2007-09-21 13:22:59 UTC (rev 8407)
@@ -33,7 +33,7 @@
<!-- Main Definition of dependencies -->
<build id="jbossportal-thirdparty"
impltitle="JBossPortal"
- implversion="jboss-portal-2.6.1.CR1"
+ implversion="1.0.0"
implvendor="JBoss, a division of Red Hat Inc."
implurl="http://www.jboss.org"
description="JBoss Portal"
Modified: modules/common/trunk/build/build.xml
===================================================================
--- modules/common/trunk/build/build.xml 2007-09-21 13:18:04 UTC (rev 8406)
+++ modules/common/trunk/build/build.xml 2007-09-21 13:22:59 UTC (rev 8407)
@@ -59,11 +59,11 @@
<!--| Project version information. |-->
<!--+==============================+-->
- <property name="version.major" value="2"/>
- <property name="version.minor" value="6"/>
+ <property name="version.major" value="1"/>
+ <property name="version.minor" value="0"/>
<property name="version.revision" value="0"/>
- <property name="version.tag" value="A"/>
- <property name="version.name" value="Ninja"/>
+ <property name="version.tag" value="GA"/>
+ <property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="HEAD"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8406 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/services/workflow/impl and 7 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 09:18:04 -0400 (Fri, 21 Sep 2007)
New Revision: 8406
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
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/templates/changeEmail/emailTemplate.tpl
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
Log:
cleanup
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-21 13:18:04 UTC (rev 8406)
@@ -193,7 +193,7 @@
// Generating message
this.generateEmailText();
- log.debug(this.emailText);
+ // log.debug(this.emailText);
// Sending mail
this.getMailModule().send(emailFrom, to , subject, emailText);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-21 13:18:04 UTC (rev 8406)
@@ -28,8 +28,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.naming.NamingException;
-
import org.jboss.logging.Logger;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.core.identity.services.IdentityConstants;
@@ -445,7 +443,13 @@
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition(processName);
if ( processDefinition != null )
+ {
processInstances = graphSession.findProcessInstances(processDefinition.getId());
+ }
+ else
+ {
+ throw new CoreIdentityConfigurationException("Could not find process definition for process name: "+ processName);
+ }
}
return processInstances;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-21 13:18:04 UTC (rev 8406)
@@ -30,7 +30,6 @@
import java.util.ResourceBundle;
import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java 2007-09-21 13:18:04 UTC (rev 8406)
@@ -31,7 +31,6 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
import org.jboss.logging.Logger;
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 13:18:04 UTC (rev 8406)
@@ -41,7 +41,7 @@
IDENTITY_REGISTER_REQUIRED_INFORMATION=indicates a required field.
IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data?
-IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password
+IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password.
IDENTITY_LOST_PASSWORD_ERROR=Failed to reset password.
IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=You will receive an e-mail with your new password.
IDENTITY_LOST_PASSWORD_STATUS_404=No account found.
@@ -118,7 +118,8 @@
IDENTITY_MANAGEMENT_DISABLE=Disable
IDENTITY_MANAGEMENT_ENABLE=Enable
IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
-IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent to his e-mail address.
IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assign roles
IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
@@ -164,7 +165,7 @@
IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Your account has been activated. You may log in now.
IDENTITY_VALIDATION_ERROR_REGISTRATION=Failed to register user.
-IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Sorry - This username is already taken.
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=This username is already taken.
IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating username.
IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=The passwords doesn't match.
IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Error while validating password.
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-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-21 13:18:04 UTC (rev 8406)
@@ -76,10 +76,6 @@
</ui-component>
<ui-component name="interests">
<property-ref>portal.user.interests</property-ref>
- <values>
- <value key="test">testing</value>
- <value key="test2">testing2</value>
- </values>
</ui-component>
<ui-component name="icq">
<property-ref>portal.user.im.icq</property-ref>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 2007-09-21 13:18:04 UTC (rev 8406)
@@ -1,11 +1,9 @@
Hello,
-you tried to change your email address on ${emailDomain}
+you tried to change your e-mail address on ${emailDomain}
-
Follow this link to verify your new address:
${activationLink}
-
Best regards,
${emailDomain}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-21 13:18:04 UTC (rev 8406)
@@ -61,7 +61,9 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
</f:facet>
- <h:outputText value="#{user.email}"/>
+ <a href="mailto:#{user.email}">
+ <h:outputText value="#{user.email}"/>
+ </a>
</h:column>
<h:column>
<f:facet name="header">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 13:18:04 UTC (rev 8406)
@@ -29,7 +29,7 @@
<div class="portlet-msg-body">
<h3>
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
- <h:outputText value="#{lostpasswordmgr.username}" />
+ <h:outputText value="#{lostpasswordmgr.username}" />.
</h3>
<p class="portlet-msg-alert">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-21 13:17:36 UTC (rev 8405)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-21 13:18:04 UTC (rev 8406)
@@ -87,4 +87,5 @@
</c:otherwise>
</c:choose>
</h:panelGrid>
+<br/>
</div>
\ No newline at end of file
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8404 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/services/workflow/impl and 7 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 09:14:29 -0400 (Fri, 21 Sep 2007)
New Revision: 8404
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.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/ui/admin/UserAdministrationBean.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
Log:
- disabled e-mail text logging
- cleanup
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-21 13:14:29 UTC (rev 8404)
@@ -193,7 +193,7 @@
// Generating message
this.generateEmailText();
- log.debug(this.emailText);
+ // log.debug(this.emailText);
// Sending mail
this.getMailModule().send(emailFrom, to , subject, emailText);
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-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-21 13:14:29 UTC (rev 8404)
@@ -28,8 +28,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.naming.NamingException;
-
import org.jboss.logging.Logger;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.core.identity.services.IdentityConstants;
@@ -445,7 +443,13 @@
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition(processName);
if ( processDefinition != null )
+ {
processInstances = graphSession.findProcessInstances(processDefinition.getId());
+ }
+ else
+ {
+ throw new CoreIdentityConfigurationException("Could not find process definition for process name: "+ processName);
+ }
}
return processInstances;
}
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-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-21 13:14:29 UTC (rev 8404)
@@ -30,7 +30,6 @@
import java.util.ResourceBundle;
import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java 2007-09-21 13:14:29 UTC (rev 8404)
@@ -31,7 +31,6 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
import org.jboss.logging.Logger;
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-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 13:14:29 UTC (rev 8404)
@@ -41,7 +41,7 @@
IDENTITY_REGISTER_REQUIRED_INFORMATION=indicates a required field.
IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data?
-IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password
+IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password.
IDENTITY_LOST_PASSWORD_ERROR=Failed to reset password.
IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=You will receive an e-mail with your new password.
IDENTITY_LOST_PASSWORD_STATUS_404=No account found.
@@ -118,7 +118,8 @@
IDENTITY_MANAGEMENT_DISABLE=Disable
IDENTITY_MANAGEMENT_ENABLE=Enable
IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
-IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent to his e-mail address.
IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assign roles
IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
@@ -164,7 +165,7 @@
IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Your account has been activated. You may log in now.
IDENTITY_VALIDATION_ERROR_REGISTRATION=Failed to register user.
-IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Sorry - This username is already taken.
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=This username is already taken.
IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating username.
IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=The passwords doesn't match.
IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Error while validating password.
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-21 13:14:29 UTC (rev 8404)
@@ -76,10 +76,6 @@
</ui-component>
<ui-component name="interests">
<property-ref>portal.user.interests</property-ref>
- <values>
- <value key="test">testing</value>
- <value key="test2">testing2</value>
- </values>
</ui-component>
<ui-component name="icq">
<property-ref>portal.user.im.icq</property-ref>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 2007-09-21 13:14:29 UTC (rev 8404)
@@ -1,11 +1,9 @@
Hello,
-you tried to change your email address on ${emailDomain}
+you tried to change your e-mail address on ${emailDomain}
-
Follow this link to verify your new address:
${activationLink}
-
Best regards,
${emailDomain}
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-21 13:14:29 UTC (rev 8404)
@@ -61,7 +61,9 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
</f:facet>
- <h:outputText value="#{user.email}"/>
+ <a href="mailto:#{user.email}">
+ <h:outputText value="#{user.email}"/>
+ </a>
</h:column>
<h:column>
<f:facet name="header">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 13:14:29 UTC (rev 8404)
@@ -29,7 +29,7 @@
<div class="portlet-msg-body">
<h3>
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
- <h:outputText value="#{lostpasswordmgr.username}" />
+ <h:outputText value="#{lostpasswordmgr.username}" />.
</h3>
<p class="portlet-msg-alert">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" />
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-21 12:50:09 UTC (rev 8403)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-21 13:14:29 UTC (rev 8404)
@@ -87,4 +87,5 @@
</c:otherwise>
</c:choose>
</h:panelGrid>
+<br/>
</div>
\ No newline at end of file
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8403 - docs/branches/JBoss_Portal_Branch_2_6.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 08:50:09 -0400 (Fri, 21 Sep 2007)
New Revision: 8403
Modified:
docs/branches/JBoss_Portal_Branch_2_6/
Log:
Removed link to docbook=support (i think)
Property changes on: docs/branches/JBoss_Portal_Branch_2_6
___________________________________________________________________
Name: svn:externals
- docbook-support http://anonsvn.jboss.org/repos/jbossas/trunk/docbook-support
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8402 - in docs/trunk: referenceGuide/en/images/ajax and 9 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 08:37:05 -0400 (Fri, 21 Sep 2007)
New Revision: 8402
Added:
docs/trunk/userGuide/en/src/
docs/trunk/userGuide/en/src/default_portal.svg
docs/trunk/userGuide/en/src/portals.svg
Modified:
docs/trunk/common/en/images/frontpage.png
docs/trunk/referenceGuide/en/images/ajax/partial-refresh-admin.png
docs/trunk/referenceGuide/en/images/content/cms.png
docs/trunk/referenceGuide/en/images/content/fs1.png
docs/trunk/referenceGuide/en/images/content/fs2.png
docs/trunk/referenceGuide/en/images/portletmodes/editor.png
docs/trunk/referenceGuide/en/images/wsrp/bea.png
docs/trunk/referenceGuide/en/images/wsrp/portlets.png
docs/trunk/referenceGuide/en/images/wsrp/result.png
docs/trunk/referenceGuide/en/modules/sso.xml
docs/trunk/userGuide/en/images/intro/adminportal.png
docs/trunk/userGuide/en/images/management/default_page.png
docs/trunk/userGuide/en/images/management/default_page_after.png
docs/trunk/userGuide/en/images/management/default_page_layout.png
docs/trunk/userGuide/en/images/management/default_page_rename.png
docs/trunk/userGuide/en/images/management/default_portal.png
docs/trunk/userGuide/en/images/management/default_portal_security.png
docs/trunk/userGuide/en/images/management/default_portal_theme.png
docs/trunk/userGuide/en/images/management/google_window.png
docs/trunk/userGuide/en/images/management/instances.png
docs/trunk/userGuide/en/images/management/layout_cms1.png
docs/trunk/userGuide/en/images/management/layout_cms2.png
docs/trunk/userGuide/en/images/management/layout_content.png
docs/trunk/userGuide/en/images/management/layout_final.png
docs/trunk/userGuide/en/images/management/layout_google1.png
docs/trunk/userGuide/en/images/management/layout_google2.png
docs/trunk/userGuide/en/images/management/layout_google3.png
docs/trunk/userGuide/en/images/management/layout_instance.png
docs/trunk/userGuide/en/images/management/layout_region.png
docs/trunk/userGuide/en/images/management/portals.png
docs/trunk/userGuide/en/images/management/portlets.png
docs/trunk/userGuide/en/images/management/wizard.png
docs/trunk/userGuide/en/modules/dynamicity.xml
Log:
Update to 2.6.2
Modified: docs/trunk/common/en/images/frontpage.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/ajax/partial-refresh-admin.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/content/cms.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/content/fs1.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/content/fs2.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/portletmodes/editor.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/bea.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/portlets.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/result.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/modules/sso.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/sso.xml 2007-09-21 11:58:37 UTC (rev 8401)
+++ docs/trunk/referenceGuide/en/modules/sso.xml 2007-09-21 12:37:05 UTC (rev 8402)
@@ -233,31 +233,29 @@
as follows:
<programlisting>
- <![CDATA[
-<property name="authenticationHandlers">
- <list>
- <!--
- | This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
- | a server side SSL certificate.
- +-->
- <bean
- class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler">
- <property
- name="httpClient"
- ref="httpClient" />
- </bean>
+ <![CDATA[<property name="authenticationHandlers">
+ <list>
+ <!--
+ | This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
+ | a server side SSL certificate.
+ +-->
+ <bean
+ class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler">
+ <property
+ name="httpClient"
+ ref="httpClient" />
+ </bean>
- <!--
- | This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS
- | into production. The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
- | where the username equals the password. You will need to replace this with an AuthenticationHandler that implements your
- | local authentication strategy. You might accomplish this by coding a new such handler and declaring
- | edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
- +-->
- <bean class="org.jboss.portal.identity.sso.cas.CASAuthenticationHandler" />
- </list>
-</property>
- ]]>
+ <!--
+ | This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS
+ | into production. The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
+ | where the username equals the password. You will need to replace this with an AuthenticationHandler that implements your
+ | local authentication strategy. You might accomplish this by coding a new such handler and declaring
+ | edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
+ +-->
+ <bean class="org.jboss.portal.identity.sso.cas.CASAuthenticationHandler" />
+ </list>
+</property>]]>
</programlisting>
</listitem>
</orderedlist>
Modified: docs/trunk/userGuide/en/images/intro/adminportal.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_page.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_page_after.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_page_layout.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_page_rename.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_portal.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_portal_security.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/default_portal_theme.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/google_window.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/instances.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_cms1.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_cms2.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_content.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_final.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_google1.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_google2.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_google3.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_instance.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/layout_region.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/portals.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/portlets.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/management/wizard.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/modules/dynamicity.xml
===================================================================
--- docs/trunk/userGuide/en/modules/dynamicity.xml 2007-09-21 11:58:37 UTC (rev 8401)
+++ docs/trunk/userGuide/en/modules/dynamicity.xml 2007-09-21 12:37:05 UTC (rev 8402)
@@ -319,7 +319,7 @@
</imageobject>
</mediaobject>
Note how the instances list is replaced by a list of Google widgets. The widget we want to use is
- located in the <literal>Technology</literal> category, so select it from the category drop-down menu:
+ located in the <literal>Fun & Games</literal> category, so select it from the category drop-down menu:
<mediaobject>
<imageobject>
<imagedata fileref="images/management/layout_google2.png" format="png" align="center"
@@ -327,7 +327,7 @@
</imageobject>
</mediaobject>
Press <literal>Search Gadgets</literal> and the widget list will be refreshed. The widget we want is
- <literal>MyIP</literal>:
+ <literal>Bejeweled</literal>:
<mediaobject>
<imageobject>
<imagedata fileref="images/management/layout_google3.png" format="png" align="center"
@@ -370,8 +370,7 @@
valign="middle"/>
</imageobject>
</mediaobject>
- If all went well, logging out of the Admin portal, you should see (IP address blurred to protect
- the guilty ^_^):
+ If all went well, logging out of the Admin portal, you should see:
<mediaobject>
<imageobject>
<imagedata fileref="images/management/default_page_after.png" format="png" align="center"
Added: docs/trunk/userGuide/en/src/default_portal.svg
===================================================================
--- docs/trunk/userGuide/en/src/default_portal.svg (rev 0)
+++ docs/trunk/userGuide/en/src/default_portal.svg 2007-09-21 12:37:05 UTC (rev 8402)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1052.3622"
+ height="744.09448"
+ id="svg2283"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home/theute"
+ sodipodi:docname="test2.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/theute/test.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3">
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ id="path14987"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.4) translate(10,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6237">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6239" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop6241" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient6243"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9156"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9160"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientTransform="translate(-3.6825839e-6,3.9228687e-8)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15182"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15188"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15194"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientTransform="scale(1.0716936,0.9331025)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient18369"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0716936,0,0,0.9331025,4.6200444e-6,8.2304494e-7)"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:document-units="mm"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.9936143"
+ inkscape:cx="522.85715"
+ inkscape:cy="380.30376"
+ inkscape:current-layer="layer1"
+ width="1052.3622px"
+ height="744.09448px"
+ inkscape:window-width="1280"
+ inkscape:window-height="953"
+ inkscape:window-x="0"
+ inkscape:window-y="24" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <image
+ y="207.82585"
+ x="123.30334"
+ id="image25451"
+ height="362"
+ width="788"
+ sodipodi:absref="/home/theute/tmp.png"
+ xlink:href="tmp.png" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.5433073;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect2355"
+ width="146.93829"
+ height="20.128536"
+ x="132.84833"
+ y="248.93254"
+ ry="6.5417743"
+ rx="6.5417747" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient9160);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="414.64783"
+ y="264.02893"
+ id="text5264"><tspan
+ sodipodi:role="line"
+ id="tspan5266"
+ x="414.64783"
+ y="264.02893"
+ style="fill:none;fill-opacity:0.51807233;stroke:#ff0000;stroke-opacity:1">Breadcrumbs</tspan></text>
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline"
+ d="M 280.38734,260.87787 L 407.23455,260.05597"
+ id="path12069"
+ inkscape:connector-type="polyline" />
+ <rect
+ rx="6.5417747"
+ ry="6.5417743"
+ y="307.30527"
+ x="132.84833"
+ height="25.160671"
+ width="269.72235"
+ id="rect15176"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.5433073;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816" />
+ <text
+ id="text15190"
+ y="301.77292"
+ x="504.77109"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient15194);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ xml:space="preserve"
+ transform="scale(0.9331025,1.0716936)"><tspan
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1"
+ y="301.77292"
+ x="504.77109"
+ id="tspan15192"
+ sodipodi:role="line">Operations on this portal instance</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path16423"
+ d="M 403.61322,320.25704 L 467.62016,319.43514"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031521;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330683;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect18363"
+ width="364.32648"
+ height="28.179951"
+ x="130.83548"
+ y="374.73584"
+ ry="6.5417747"
+ rx="6.5417743" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient18369);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="655.77246"
+ y="361.87527"
+ id="text18365"><tspan
+ sodipodi:role="line"
+ id="tspan18367"
+ x="655.77246"
+ y="361.87527"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Page creation form</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path19340"
+ d="M 495.76586,384.88974 L 599.57824,384.06784"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect19342"
+ width="770.92285"
+ height="150.964"
+ x="130.83548"
+ y="412.43829"
+ ry="6.5417752"
+ rx="6.5417743" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="834.15491"
+ y="345.38943"
+ id="text19344"><tspan
+ sodipodi:role="line"
+ id="tspan19346"
+ x="834.15491"
+ y="345.38943"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Pages list</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path21288"
+ d="M 796.32431,411.3508 L 809.66914,373.52098"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031473;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ </g>
+</svg>
Added: docs/trunk/userGuide/en/src/portals.svg
===================================================================
--- docs/trunk/userGuide/en/src/portals.svg (rev 0)
+++ docs/trunk/userGuide/en/src/portals.svg 2007-09-21 12:37:05 UTC (rev 8402)
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1052.3622"
+ height="744.09448"
+ id="svg2283"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home/theute"
+ sodipodi:docname="test.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ id="path14987"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.4) translate(10,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6237">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6239" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop6241" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient6243"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9156"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9160"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15182"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15188"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15194"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientTransform="matrix(1.0716936,0,0,0.9331025,5.8642201e-6,1.2089557e-7)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient18369"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0716936,0,0,0.9331025,4.6200444e-6,8.2304494e-7)"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:document-units="mm"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.9936143"
+ inkscape:cx="522.85715"
+ inkscape:cy="380.30376"
+ inkscape:current-layer="layer1"
+ width="1052.3622px"
+ height="744.09448px"
+ inkscape:window-width="1280"
+ inkscape:window-height="953"
+ inkscape:window-x="0"
+ inkscape:window-y="24" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <image
+ y="209.79073"
+ x="131.35715"
+ id="image2352"
+ height="308"
+ width="783"
+ sodipodi:absref="/home/theute/test.png"
+ xlink:href="test.png" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect2355"
+ width="56.359894"
+ height="16.102829"
+ x="137.88046"
+ y="252.95824"
+ ry="6.5417743"
+ rx="6.5417743" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient9160);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="280.79306"
+ y="263.02249"
+ id="text5264"><tspan
+ sodipodi:role="line"
+ id="tspan5266"
+ x="280.79306"
+ y="263.02249"
+ style="fill:none;fill-opacity:0.51807233;stroke:#ff0000;stroke-opacity:1">Breadcrumbs</tspan></text>
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline"
+ d="M 194.84105,260.87787 L 271.36692,260.05597"
+ id="path12069"
+ inkscape:connector-type="polyline" />
+ <rect
+ rx="6.5417743"
+ ry="6.5417743"
+ y="307.30527"
+ x="131.8419"
+ height="21.134964"
+ width="82.526985"
+ id="rect15176"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816" />
+ <text
+ id="text15190"
+ y="299.89471"
+ x="393.67725"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient15194);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ xml:space="preserve"
+ transform="scale(0.9331025,1.0716936)"><tspan
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1"
+ y="299.89471"
+ x="393.67725"
+ id="tspan15192"
+ sodipodi:role="line">To the properties page</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path16423"
+ d="M 215.41143,318.24419 L 353.89395,317.42229"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031521;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect18363"
+ width="364.32648"
+ height="29.186378"
+ x="130.83548"
+ y="369.70374"
+ ry="6.5417747"
+ rx="6.5417743" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient18369);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="655.77246"
+ y="361.87527"
+ id="text18365"><tspan
+ sodipodi:role="line"
+ id="tspan18367"
+ x="655.77246"
+ y="361.87527"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Portal creation form</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path19340"
+ d="M 495.76586,384.88974 L 599.57824,384.06784"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect19342"
+ width="786.01923"
+ height="104.66838"
+ x="130.83548"
+ y="406.43829"
+ ry="6.5417747"
+ rx="6.5417738" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="834.15491"
+ y="345.38943"
+ id="text19344"><tspan
+ sodipodi:role="line"
+ id="tspan19346"
+ x="834.15491"
+ y="345.38943"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Available portals list</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path21288"
+ d="M 800.35005,405.31224 L 818.72701,378.55312"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ </g>
+</svg>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8401 - in docs/trunk: userGuide/en/images/role and 1 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 07:58:37 -0400 (Fri, 21 Sep 2007)
New Revision: 8401
Added:
docs/trunk/userGuide/en/images/role/user_pending.png
Modified:
docs/trunk/referenceGuide/en/modules/identityportlets.xml
docs/trunk/userGuide/en/modules/user_role.xml
Log:
- identity portlet docs update
Modified: docs/trunk/referenceGuide/en/modules/identityportlets.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/identityportlets.xml 2007-09-21 11:11:51 UTC (rev 8400)
+++ docs/trunk/referenceGuide/en/modules/identityportlets.xml 2007-09-21 11:58:37 UTC (rev 8401)
@@ -25,7 +25,7 @@
Portlet contains all the functionality for managing users and roles.
</para>
<warning>
- The identity portlets will evolve over time, therefore usage and
+ The Identity portlets will evolve over time, therefore usage and
configuration might change.
</warning>
<sect2>
@@ -192,8 +192,8 @@
The subscription mode has to be defined in the configuration file as explained here: <xref linkend="identity_portlet_configuration_file"/>.
</note>
<warning>
- Make sure that the application server is restarted after changing the Identity Portlets. Hot re-deployment can result in a
- strange behavior with jBPM (e.g. empty pending user list).
+ Make sure that the application server is restarted after re-deploying the Identity Portlets. This is required to make sure that
+ the registration process works properly!
</warning>
<para></para>
<mediaobject>
@@ -392,7 +392,7 @@
<sect2 id="identity_portlet_configuration_example1">
<title>Example 1: required fields</title>
<para>
- This example explains how to changed optional properties to
+ This example explains how to change optional properties to
required properties, of course once this is done, we will also need to
add the corresponding fields in the registration page.
<sbr />
@@ -433,7 +433,7 @@
...]]></programlisting>
<para>
That's it - from now on the given name and family name will be
- required on registration. You may also want to add this piece of code on the edit profile page.
+ required on registration.
We dynamically obtain the values from the descriptor. Now if i just wanted to make them back to optional,
i would change the values only in the descriptor, letting the user enter or not those values.
</para>
@@ -544,8 +544,7 @@
]]></programlisting>
<note>
The property-ref must match a property from the
- <emphasis>profile-config.xml</emphasis>
- .
+ <emphasis>profile-config.xml</emphasis>.
</note>
<para>
<emphasis role="bold">step 3:</emphasis>
@@ -690,10 +689,10 @@
</sect1>
<sect1>
<title>Customizing the workflow</title>
- <note><para>For more details about jBPM please read the jBPM documentation</para></note>
+ <note><para>For more details about jBPM please read the <ulink url="http://docs.jboss.com/jbpm/v3/userguide/index.html">jBPM documentation</ulink></para></note>
<para>
The process definitions are located in:
- <emphasis>portal-identity.sar/conf/processes</emphasis>. To create a custom workflow , the workflow <emphasis>custom.xml</emphasis> can be extended.
+ <emphasis>portal-identity.sar/conf/processes</emphasis>. To create a custom workflow, you can extend the existing process description file: <emphasis>custom.xml</emphasis>.
</para>
<para>
Available variables in the business process:
@@ -707,7 +706,7 @@
<emphasis>java.lang.String</emphasis>
<sbr />
<emphasis role="bold">description:</emphasis>
- the full url of the portal e.g.
+ represents the full url of the portal e.g.
<emphasis>
http://localhost:8080/portal
</emphasis>
@@ -808,7 +807,7 @@
<para>
Due to the fact that the former user portlets are still
included in JBoss Portal 2.6.2 it is possible to activate
- it over the Portal Admin interface, by using the PortletInstances:
+ it in the Portal Admin interface, by using the PortletInstances:
<itemizedlist>
<listitem>
<emphasis>UserPortletInstance:</emphasis> The former user portlet
@@ -822,8 +821,8 @@
<title>Enabling the Identity Portlets</title>
<para>
When migrating from former versions of JBoss Portal the Identity User Portlets won't be displayed by default,
- but Windows can be created on basis of the existing Portlet Instances which are by default deployed. (The instances
- names being <literal>IdentityUserPortletInstance</literal> and <literal>IdentityAdminPortletInstance</literal>.
+ but Windows can be created on basis of the existing Portlet Instances which are deployed by default. (The instances
+ names being <literal>IdentityUserPortletInstance</literal> and <literal>IdentityAdminPortletInstance</literal>).
</para>
</sect2>
</sect1>
Added: docs/trunk/userGuide/en/images/role/user_pending.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/user_pending.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: docs/trunk/userGuide/en/modules/user_role.xml
===================================================================
--- docs/trunk/userGuide/en/modules/user_role.xml 2007-09-21 11:11:51 UTC (rev 8400)
+++ docs/trunk/userGuide/en/modules/user_role.xml 2007-09-21 11:58:37 UTC (rev 8401)
@@ -6,6 +6,11 @@
<surname>Russo</surname>
<email>roy(a)jboss.org</email>
</author>
+ <author>
+ <firstname>Emanuel</firstname>
+ <surname>Muckenhuber</surname>
+ <email>emuckenh(a)redhat.com</email>
+ </author>
</chapterinfo>
<title>Administration - Users and Roles</title>
<para>
@@ -23,17 +28,29 @@
<imageobject>
<imagedata fileref="images/role/memberspage.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ The Members page in the <xref linkend="adminportal"/>.
+ </para>
+ </caption>
</mediaobject>
</para>
<sect2>
<title>Actions</title>
<para>The first page of the user management portlet displays some user related actions (eg. Search users, Create new user account)
and some additional information (e.g. Registered users and Subscription mode). The registered users represent the count of all registered users
- and the subscription mode describes the required tasks for registering (i.e. first e-mail validation and then approval by the administrator).
+ and the subscription mode describes the required tasks for registering a user (i.e. first e-mail validation and then approval by the administrator).
+ The <emphasis>Subscription mode</emphasis> symbolizes the mode used in the User portlet. The <emphasis>Admin subscription mode</emphasis> represents
+ the mode used in the User management portlet.
<mediaobject>
<imageobject>
<imagedata fileref="images/role/user_management.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ The User management portlet.
+ </para>
+ </caption>
</mediaobject>
</para>
<sect3 id="searchingusers">
@@ -45,6 +62,11 @@
<imageobject>
<imagedata fileref="images/role/user_su.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ The search users page.
+ </para>
+ </caption>
</mediaobject>
</para>
</sect3>
@@ -57,6 +79,11 @@
<imageobject>
<imagedata fileref="images/role/edit_profile.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ Editing a users profile.
+ </para>
+ </caption>
</mediaobject>
</para>
</sect3>
@@ -64,11 +91,16 @@
<title>Updating User Roles</title>
<para>Clicking on the
<emphasis>Roles</emphasis>
- link in the search page allows you to modify the roles the specific user belongs to.
+ link in the search page allows you to modify the roles a specific user belongs to.
<mediaobject>
<imageobject>
<imagedata fileref="images/role/assign_roles.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ Assign roles to a user.
+ </para>
+ </caption>
</mediaobject>
</para>
</sect3>
@@ -82,6 +114,11 @@
<imageobject>
<imagedata fileref="images/role/create_user.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ Creating a user in the User management portlet.
+ </para>
+ </caption>
</mediaobject>
</para>
</sect3>
@@ -93,29 +130,43 @@
to approve or reject all selected users.
</para>
<para>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/role/user_pending.png" format="png" align="center" valign="middle"/>
- <caption>Normal state</caption>
</imageobject>
+ <caption>
+ <para>
+ Approve or reject pending registrations.
+ </para>
+ </caption>
+ </mediaobject>
</para>
+ <note>
+ By default the subscription modes are set to <emphasis>automatic</emphasis> and users will be created automatically. Furthermore the
+ link to <emphasis>Show pending registrations</emphasis> will only be displayed if a user needs to be approved by the administrator.
+ </note>
</sect3>
</sect2>
</sect1>
<sect1 id="roleadmin">
<title>Managing Roles</title>
<para>
- The User management portlet is also responsible to create and edit roles and it is accessible once logged in as described in the previous when clicking on the <emphasis>role management</emphasis>
+ The User management portlet is also responsible to create and edit roles and it is accessible once logged in - as described in previously - when clicking on the <emphasis>role management</emphasis>
link in the User management portlet.
</para>
<sect2>
<title>Introduction</title>
- <para> A role will be used to grant different permission level to different portlets, pages, or portal instances. A user can have several roles.
+ <para> A role will be used to grant different permission levels to different portlets, pages, or portal instances. A user can have several roles.
</para>
<para>
<imageobject>
<imagedata fileref="images/role/role_management.png" format="png" align="center" valign="middle"/>
- <caption>Normal state</caption>
</imageobject>
+ <caption>
+ <para>
+ Role management.
+ </para>
+ </caption>
</para>
</sect2>
<sect2>
@@ -133,6 +184,11 @@
<imageobject>
<imagedata fileref="images/role/create_role.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ Create a new role.
+ </para>
+ </caption>
</mediaobject>
To create a new role, you need to define a short name that will be used for
reference, and a display name for displaying to the user, for example
@@ -146,25 +202,35 @@
<sect3 id="editrole">
<title>Edit a role</title>
<para>
- Editting roles, is accomplished by clicking on <emphasis>Edit role</emphasis> in the row of the role you want to edit.
+ Editing roles, is accomplished by clicking on <emphasis>Edit role</emphasis> in the row of the role you want to edit.
<mediaobject>
<imageobject>
<imagedata fileref="images/role/edit_role.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ Edit an existing role.
+ </para>
+ </caption>
</mediaobject>
- While editing a role, you just need to pick an exising role then change the display name.
+ While editing a role, you just need to pick an existing role then change the display name.
</para>
</sect3>
<sect3 id="editrolemembers">
<title>Editing Role Members</title>
<para>
- Editting role members, is accomplished by first clicking the
+ Editing role members, is accomplished by first clicking the
<emphasis>Members</emphasis>
link at the role management page for the role you would like to modify.
<mediaobject>
<imageobject>
<imagedata fileref="images/role/role_members.png" format="png" align="center" valign="middle"/>
</imageobject>
+ <caption>
+ <para>
+ Show the members of an existing role.
+ </para>
+ </caption>
</mediaobject>
Allows for an administrator to search and modify the members' assigned roles.
</para>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8400 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/ui/common and 2 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 07:11:51 -0400 (Fri, 21 Sep 2007)
New Revision: 8400
Removed:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/test/
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
Log:
- disable portlet on configuration error
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21 11:09:27 UTC (rev 8399)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21 11:11:51 UTC (rev 8400)
@@ -65,6 +65,10 @@
{
this.identityUIConfigurationService.isValidConfiguration();
}
+ catch(NullPointerException e)
+ {
+ return false;
+ }
catch(CoreIdentityConfigurationException e)
{
log.error("", e);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 11:09:27 UTC (rev 8399)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 11:11:51 UTC (rev 8400)
@@ -81,7 +81,7 @@
<hr/>
<h:form>
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
- <h:panelGrid columns="4">
+ <h:panelGrid columns="3">
<h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" />
<h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
<h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21 11:09:27 UTC (rev 8399)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21 11:11:51 UTC (rev 8400)
@@ -13,8 +13,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
<h:outputText value="#{userregistermgr.uiUser.username}" />
</li>
</ui:define>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8399 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/ui/common and 2 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 07:09:27 -0400 (Fri, 21 Sep 2007)
New Revision: 8399
Removed:
trunk/core-identity/src/main/org/jboss/portal/core/identity/test/
Modified:
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/admin/roles/roleMembers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
Log:
- disable portlet on configuration error
-
Modified: 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 2007-09-21 10:29:43 UTC (rev 8398)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21 11:09:27 UTC (rev 8399)
@@ -65,6 +65,10 @@
{
this.identityUIConfigurationService.isValidConfiguration();
}
+ catch(NullPointerException e)
+ {
+ return false;
+ }
catch(CoreIdentityConfigurationException e)
{
log.error("", e);
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 10:29:43 UTC (rev 8398)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 11:09:27 UTC (rev 8399)
@@ -81,7 +81,7 @@
<hr/>
<h:form>
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
- <h:panelGrid columns="4">
+ <h:panelGrid columns="3">
<h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" />
<h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
<h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21 10:29:43 UTC (rev 8398)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21 11:09:27 UTC (rev 8399)
@@ -13,8 +13,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
<h:outputText value="#{userregistermgr.uiUser.username}" />
</li>
</ui:define>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8398 - in docs/trunk: userGuide/en/images/intro and 2 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 06:29:43 -0400 (Fri, 21 Sep 2007)
New Revision: 8398
Added:
docs/trunk/userGuide/en/images/intro/user_portlet.png
docs/trunk/userGuide/en/images/intro/user_portlet_lost.png
docs/trunk/userGuide/en/images/role/assign_roles.png
docs/trunk/userGuide/en/images/role/create_role.png
docs/trunk/userGuide/en/images/role/create_user.png
docs/trunk/userGuide/en/images/role/edit_profile.png
docs/trunk/userGuide/en/images/role/edit_role.png
docs/trunk/userGuide/en/images/role/memberspage.png
docs/trunk/userGuide/en/images/role/role_management.png
docs/trunk/userGuide/en/images/role/role_members.png
docs/trunk/userGuide/en/images/role/user_management.png
docs/trunk/userGuide/en/images/role/user_su.png
Removed:
docs/trunk/userGuide/en/images/intro/user_portlet.gif
docs/trunk/userGuide/en/images/intro/user_portlet_editinfo.gif
docs/trunk/userGuide/en/images/role/createrole.gif
docs/trunk/userGuide/en/images/role/createuser.gif
docs/trunk/userGuide/en/images/role/editprofile.gif
docs/trunk/userGuide/en/images/role/editrolemembers.gif
docs/trunk/userGuide/en/images/role/editrolename.gif
docs/trunk/userGuide/en/images/role/editroles.gif
docs/trunk/userGuide/en/images/role/edituserroles.gif
docs/trunk/userGuide/en/images/role/memberspage.gif
docs/trunk/userGuide/en/images/role/normalstate.gif
docs/trunk/userGuide/en/images/role/searchusers.gif
docs/trunk/userGuide/en/images/role/user_ss.gif
Modified:
docs/trunk/referenceGuide/en/images/identityportlets/lost_password.png
docs/trunk/referenceGuide/en/images/identityportlets/pending_users.png
docs/trunk/referenceGuide/en/images/identityportlets/user_register.png
docs/trunk/userGuide/en/images/intro/user_portlet_create.png
docs/trunk/userGuide/en/images/intro/user_portlet_loggedin.png
docs/trunk/userGuide/en/modules/intro.xml
docs/trunk/userGuide/en/modules/user_role.xml
Log:
- identity portlets update
Modified: docs/trunk/referenceGuide/en/images/identityportlets/lost_password.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/identityportlets/pending_users.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/identityportlets/user_register.png
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/intro/user_portlet.gif
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/intro/user_portlet.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/intro/user_portlet.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: docs/trunk/userGuide/en/images/intro/user_portlet_create.png
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/intro/user_portlet_editinfo.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/images/intro/user_portlet_loggedin.png
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/intro/user_portlet_lost.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/intro/user_portlet_lost.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/userGuide/en/images/role/assign_roles.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/assign_roles.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/userGuide/en/images/role/create_role.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/create_role.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/userGuide/en/images/role/create_user.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/create_user.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: docs/trunk/userGuide/en/images/role/createrole.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/role/createuser.gif
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/role/edit_profile.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/edit_profile.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/userGuide/en/images/role/edit_role.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/edit_role.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: docs/trunk/userGuide/en/images/role/editprofile.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/role/editrolemembers.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/role/editrolename.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/role/editroles.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/role/edituserroles.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/userGuide/en/images/role/memberspage.gif
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/role/memberspage.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/memberspage.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: docs/trunk/userGuide/en/images/role/normalstate.gif
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/role/role_management.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/role_management.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/userGuide/en/images/role/role_members.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/role_members.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: docs/trunk/userGuide/en/images/role/searchusers.gif
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/role/user_management.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/user_management.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: docs/trunk/userGuide/en/images/role/user_ss.gif
===================================================================
(Binary files differ)
Added: docs/trunk/userGuide/en/images/role/user_su.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/userGuide/en/images/role/user_su.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: docs/trunk/userGuide/en/modules/intro.xml
===================================================================
--- docs/trunk/userGuide/en/modules/intro.xml 2007-09-21 09:21:56 UTC (rev 8397)
+++ docs/trunk/userGuide/en/modules/intro.xml 2007-09-21 10:29:43 UTC (rev 8398)
@@ -275,7 +275,7 @@
<para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/intro/user_portlet.gif" format="gif" align="center"
+ <imagedata fileref="images/intro/user_portlet.png" format="png" align="center"
valign="middle"/>
</imageobject>
</mediaobject>
@@ -316,6 +316,14 @@
in the navigation of the portlet. Therfore the user needs to fill in his user name to receive an e-mail with his new
login credentials.
</para>
+ <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/intro/user_portlet_lost.png" format="png" align="center"
+ valign="middle"/>
+ </imageobject>
+ </mediaobject>
+ </para>
</listitem>
<listitem>
<para>
Modified: docs/trunk/userGuide/en/modules/user_role.xml
===================================================================
--- docs/trunk/userGuide/en/modules/user_role.xml 2007-09-21 09:21:56 UTC (rev 8397)
+++ docs/trunk/userGuide/en/modules/user_role.xml 2007-09-21 10:29:43 UTC (rev 8398)
@@ -21,7 +21,7 @@
For role management please see <xref linkend="roleadmin"/>.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/memberspage.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/memberspage.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -32,7 +32,7 @@
and the subscription mode describes the required tasks for registering (i.e. first e-mail validation and then approval by the administrator).
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/user_ss.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/user_management.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -43,7 +43,7 @@
criteria.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/user_ss.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/user_su.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -55,7 +55,7 @@
link on the search page will allow you to edit a user's profile data, and even reset his password.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/editprofile.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/edit_profile.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -67,7 +67,7 @@
link in the search page allows you to modify the roles the specific user belongs to.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/editroles.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/assign_roles.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -80,7 +80,7 @@
link on the main UserPortlet view, allows administrators to instantly create new users.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/createuser.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/create_user.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -92,6 +92,12 @@
You can approve or reject each user by clicking on the corresponding action or click on <emphasis>select all</emphasis>
to approve or reject all selected users.
</para>
+ <para>
+ <imageobject>
+ <imagedata fileref="images/role/user_pending.png" format="png" align="center" valign="middle"/>
+ <caption>Normal state</caption>
+ </imageobject>
+ </para>
</sect3>
</sect2>
</sect1>
@@ -107,7 +113,7 @@
</para>
<para>
<imageobject>
- <imagedata fileref="images/role/normalstate.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/role_management.png" format="png" align="center" valign="middle"/>
<caption>Normal state</caption>
</imageobject>
</para>
@@ -125,7 +131,7 @@
link in the portlet.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/createrole.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/create_role.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
To create a new role, you need to define a short name that will be used for
@@ -143,7 +149,7 @@
Editting roles, is accomplished by clicking on <emphasis>Edit role</emphasis> in the row of the role you want to edit.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/editrolename.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/edit_role.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
While editing a role, you just need to pick an exising role then change the display name.
@@ -157,7 +163,7 @@
link at the role management page for the role you would like to modify.
<mediaobject>
<imageobject>
- <imagedata fileref="images/role/edituserroles.gif" format="gif" align="center" valign="middle"/>
+ <imagedata fileref="images/role/role_members.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
Allows for an administrator to search and modify the members' assigned roles.
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8397 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 05:21:56 -0400 (Fri, 21 Sep 2007)
New Revision: 8397
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
br hack
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-21 08:43:05 UTC (rev 8396)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-21 09:21:56 UTC (rev 8397)
@@ -5,11 +5,10 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:jbp="http://www.jboss.org/portal"
xmlns:c="http://java.sun.com/jstl/core">
-
+<br />
<table width="100%">
<tr>
<td valign="top" width="50%">
-
<p class="portlet-area-header">Content Definition</p>
<div class="portlet-area-body">
16 years, 9 months
- 1
- 0