JBoss Portal SVN: r8225 - in trunk/core-identity/src: resources/portal-identity-sar/conf and 2 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 08:36:29 -0400 (Tue, 11 Sep 2007)
New Revision: 8225
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
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/roleMembers.xhtml
Log:
- fixed edit role members
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-11 12:15:05 UTC (rev 8224)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 12:36:29 UTC (rev 8225)
@@ -29,7 +29,6 @@
import javax.faces.application.FacesMessage;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import javax.portlet.WindowStateException;
@@ -45,7 +44,6 @@
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossActionResponse;
-import org.jboss.portlet.JBossRenderResponse;
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
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-11 12:15:05 UTC (rev 8224)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 12:36:29 UTC (rev 8225)
@@ -24,8 +24,8 @@
<identity-ui-configuration>
- <subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode>
- <overwrite-workflow>true</overwrite-workflow>
+ <subscription-mode>automatic</subscription-mode>
+ <overwrite-workflow>false</overwrite-workflow>
<email-domain>jboss.org</email-domain>
<email-from>do-no-reply(a)jboss.com</email-from>
<password-generation-characters>0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWyYzZ*#!+-/"</password-generation-characters>
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-11 12:15:05 UTC (rev 8224)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 12:36:29 UTC (rev 8225)
@@ -430,7 +430,18 @@
<from-action>#{lostpasswordmgr.doomed}</from-action>
<from-outcome>lostPassword</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>status</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>searchUsers</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
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-11 12:15:05 UTC (rev 8224)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 12:36:29 UTC (rev 8225)
@@ -44,7 +44,7 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.editProfile}">
+ <h:commandLink action="#{editprofilemgr.adminEditProfile}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8223 - in trunk/core-identity/src: resources/portal-identity-sar/conf/processes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 08:11:24 -0400 (Tue, 11 Sep 2007)
New Revision: 8223
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
Log:
Changed default values and fix bundle issue
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:30:06 UTC (rev 8222)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 12:11:24 UTC (rev 8223)
@@ -41,7 +41,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("core.bundles.Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
if (value != null)
{
if (!(value instanceof String))
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 11:30:06 UTC (rev 8222)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 12:11:24 UTC (rev 8223)
@@ -31,11 +31,11 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.UpdateEmailAction"/>
</transition>
<transition name="timedOut" to="end"/>
</state>
<end-state name="end"/>
-</process-definition>
\ No newline at end of file
+</process-definition>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 11:30:06 UTC (rev 8222)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 12:11:24 UTC (rev 8223)
@@ -31,7 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="3 days" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="admin_approval"/>
<transition name="timedOut" to="end"/>
</state>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 11:30:06 UTC (rev 8222)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 12:11:24 UTC (rev 8223)
@@ -31,11 +31,11 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="3 days" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
</transition>
<transition name="timedOut" to="end"/>
</state>
<end-state name="end"/>
-</process-definition>
\ No newline at end of file
+</process-definition>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8222 - branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 07:30:06 -0400 (Tue, 11 Sep 2007)
New Revision: 8222
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
Log:
Oups
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:26:28 UTC (rev 8221)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:30:06 UTC (rev 8222)
@@ -41,7 +41,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("core.bundles.Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
if (value != null)
{
if (!(value instanceof String))
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8221 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 07:26:28 -0400 (Tue, 11 Sep 2007)
New Revision: 8221
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
Log:
Default expiration to 2 days
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 11:21:05 UTC (rev 8220)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 11:26:28 UTC (rev 8221)
@@ -33,7 +33,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.UpdateEmailAction"/>
</transition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 11:21:05 UTC (rev 8220)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 11:26:28 UTC (rev 8221)
@@ -33,7 +33,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="3 days" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="admin_approval"/>
<transition name="timedOut" to="end"/>
</state>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 11:21:05 UTC (rev 8220)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 11:26:28 UTC (rev 8221)
@@ -33,7 +33,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
</transition>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8220 - in trunk/core-identity: src/main/org/jboss/portal/core/identity/services/impl and 13 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 07:21:05 -0400 (Tue, 11 Sep 2007)
New Revision: 8220
Added:
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties
Removed:
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties
trunk/core-identity/src/resources/resource-bundles/
Modified:
trunk/core-identity/build.xml
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.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/actions/LostPasswordAction.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
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/lostPassword/lostTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.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/status.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.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
Log:
Moved resource bundles
Modified: trunk/core-identity/build.xml
===================================================================
--- trunk/core-identity/build.xml 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/build.xml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -200,7 +200,6 @@
<!-- portal-core-identity-services-lib.jar -->
<jar jarfile="${build.lib}/portal-core-identity-services-lib.jar">
<fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**" />
- <fileset dir="${build.resources}/resource-bundles/" />
</jar>
<!-- portal-identity.war -->
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -169,7 +169,7 @@
this.locale = locale;
this.mailData.put(IdentityConstants.EMAIL_DOMAIN, emailDomain);
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", locale);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", locale);
String subject = null;
String to = (String) mailData.get(IdentityConstants.EMAIL_TO);
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -132,7 +132,7 @@
String registrationStatus = "failed";
FacesContext ctx = FacesContext.getCurrentInstance();
String adminSubscription = (String) ev.getComponent().getId();
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
if (uiUser.getUsername() != null && uiUser.getPassword() != null)
{
try
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -214,13 +214,13 @@
}
catch (RuntimeException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
catch (IdentityException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
@@ -242,7 +242,7 @@
public String changePassword()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
if (this.password != null)
{
try
@@ -277,7 +277,7 @@
public String changeEmail()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
if (this.email != null)
{
try
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -118,7 +118,7 @@
public String doomed()
{
User user = null;
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot()
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot()
.getLocale());
// Used by the user management to reset passwords
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -176,7 +176,7 @@
{
String key = (String) i.next();
String value = (String) uiComponent.getValues().get(key);
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
try
{
value = bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + key.toUpperCase());
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -42,7 +42,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
Boolean tester = Boolean.FALSE;
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
PortletRequest portletRequest = (PortletRequest) context.getExternalContext().getRequest();
String captchaId = portletRequest.getRequestedSessionId();
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -52,7 +52,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
PortletContext portletContext = (PortletContext) context.getExternalContext().getContext();
userModule = (UserModule) portletContext.getAttribute("UserModule");
this.currentUser = context.getExternalContext().getRemoteUser();
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -41,7 +41,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("core.bundles.Identity", context.getViewRoot().getLocale());
if (value != null)
{
if (!(value instanceof String))
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -39,7 +39,7 @@
{
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
UIComponent passwordComponent = component.findComponent("password");
if (passwordComponent != null && passwordComponent instanceof HtmlInputSecret)
{
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-11 11:21:05 UTC (rev 8220)
@@ -54,7 +54,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
String username = (String) value;
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
PortletContext portletContext = (PortletContext) context.getExternalContext().getContext();
userModule = (UserModule) portletContext.getAttribute("UserModule");
registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService");
Copied: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles (from rev 8219, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles)
Deleted: trunk/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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-11 11:21:05 UTC (rev 8220)
@@ -1,154 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat #
-# Copyright 2006, Red Hat Middleware, LLC, and individual #
-# contributors as indicated by the @authors tag. See the #
-# copyright.txt in the distribution for a full listing of #
-# individual contributors. #
-# #
-# This is free software; you can redistribute it and/or modify it #
-# under the terms of the GNU Lesser General Public License as #
-# published by the Free Software Foundation; either version 2.1 of #
-# the License, or (at your option) any later version. #
-# #
-# This software is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
-# Lesser General Public License for more details. #
-# #
-# You should have received a copy of the GNU Lesser General Public #
-# License along with this software; if not, write to the Free #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
-################################################################################
-
-IDENTITY_WELCOME=Welcome
-IDENTITY_REGISTER=Register
-IDENTITY_LOST_PASSWORD=Lost Password
-IDENTITY_NOT_LOGGED_IN=You are currently not logged in.
-IDENTITY_CREATE_ACCOUNT=You can create an account.
-IDENTITY_BUTTON_SUBMIT=Submit
-IDENTITY_BUTTON_EDIT=Edit
-IDENTITY_BUTTON_CANCEL=Cancel
-
-IDENTITY_REGISTER_TITLE=Basic user information
-IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation
-IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirm Password
-IDENTITY_REGISTER_SUCCESS_TITLE=Your account has been successfully created. You may want to login now.
-IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration.
-
-IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data?
-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.
-
-
-IDENTITY_EDIT_PROFILE_ERROR=Error while updating the profile.
-IDENTITY_EDIT_PASSWORD_TITLE=Change your password
-IDENTITY_EDIT_PASSWORD_CURRENT=Current password
-IDENTITY_EDIT_CHANGE_PASSWORD=Change password
-IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user:
-IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
-IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
-
-IDENTITY_EDIT_EMAIL_TITLE=Change your email address
-IDENTITY_EDIT_EMAIL_NEW=New email address
-IDENTITY_EDIT_CHANGE_EMAIL=Change email
-IDENTITY_EDIT_CHANGE_EMAIL_ERROR=Could not change e-mail address
-IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=An validation e-mail has been sent to your address.
-IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Your e-mail address has been changed.
-
-IDENTITY_EDIT_PROFILE_TITLE=Edit profile
-IDENTITY_VIEW_PROFILE_TITLE=View profile
-
-IDENTITY_USERNAME=Username
-IDENTITY_PASSWORD=Password
-IDENTITY_EMAIL=E-Mail
-IDENTITY_GIVENNAME=Firstname
-IDENTITY_FAMILYNAME=Lastname
-IDENTITY_SKYPE=Skype ID
-IDENTITY_LOCATION=Location
-IDENTITY_OCCUPATION=Occupation
-IDENTITY_EXTRA=Extra
-IDENTITY_SIGNATURE=Signature
-IDENTITY_INTERESTS=Interests
-IDENTITY_LOCALE=Locale
-IDENTITY_ICQ=Icq ID
-IDENTITY_AIM=Aim ID
-IDENTITY_MSNM= MSN messenger ID
-IDENTITY_YIM=Yahoo ID
-IDENTITY_XMMP=Xmmp ID
-IDENTITY_HOMEPAGE=Homepage
-IDENTITY_TIMEZONE=Time zone offset
-IDENTITY_THEME=Theme
-IDENTITY_SECURITY_QUESTION=Security Question
-IDENTITY_SECURITY_ANSWER=Security Answer
-IDENTITY_LAST_LOGIN=Last login
-IDENTITY_REIGSTRATION_DATE=Registration Date
-IDENTITY_ENABLED=Enabled
-
-IDENTITY_CATEGORY_GENERAL=General Preferences
-IDENTITY_CATEGORY_PERSONAL=Personal Information
-IDENTITY_CATEGORY_INSTANT=Instant Message Identities
-IDENTITY_CATEGORY_ADDITIONAL=Additional Information
-
-IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature of 255 characters max)
-IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 characters max.)
-
-IDENTITY_MANAGEMENT_ACTION=Actions
-IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Edit user
-IDENTITY_MANAGEMENT_ACTION_ROLES=Roles
-IDENTITY_MANAGEMENT_ACTION_DELETE=Delete
-IDENTITY_MANAGEMENT_USER_MANAGEMENT=User Management
-IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Role Management
-IDENTITY_MANAGEMENT_SEARCH_USER=Search users
-IDENTITY_MANAGEMENT_CREATE_USER=Create new user account
-IDENTITY_MANAGEMENT_ROLE=Role
-IDENTITY_MANAGEMENT_ROLE_DISPLAY=Display name
-IDENTITY_MANAGEMENT_ROLE_MEMBERS=Members
-IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Assigned roles
-IDENTITY_MANAGEMENT_CREATE_ROLE=Create new role
-IDENTITY_MANAGEMENT_EDIT_ROLE=Edit role
-IDENTITY_MANAGEMENT_CREATE_ROLE=Create role
-IDENTITY_MANAGEMENT_DISABLE=Disable
-IDENTITY_MANAGEMENT_ENABLE=Enable
-IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
-IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user:
-IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
-IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
-IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
-IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
-
-IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations
-IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
-IDENTITY_MANAGEMENT_PENDING_APPROVE=approve
-IDENTITY_MANAGEMENT_PENDING_REJECT=reject
-
-IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
-IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object
-IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
-
-IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
-IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration
-IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address
-
-IDENTITY_VERIFICATION_RETURN=Return to portal
-IDENTITY_VERIFICATION_LOGIN=Login
-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.
-IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Your e-mail address has been verified, but your account needs to be approved by the administrator.
-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_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.
-IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address.
-IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Invalid password
-IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect
-
-# Example usage for dynamic values
-#IDENTIY_DYNAMIC_VALUE_TEST=test label
-#IDENTIY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
Copied: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties (from rev 8219, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties)
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties (rev 0)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-11 11:21:05 UTC (rev 8220)
@@ -0,0 +1,154 @@
+################################################################################
+# 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. #
+################################################################################
+
+IDENTITY_WELCOME=Welcome
+IDENTITY_REGISTER=Register
+IDENTITY_LOST_PASSWORD=Lost Password
+IDENTITY_NOT_LOGGED_IN=You are currently not logged in.
+IDENTITY_CREATE_ACCOUNT=You can create an account.
+IDENTITY_BUTTON_SUBMIT=Submit
+IDENTITY_BUTTON_EDIT=Edit
+IDENTITY_BUTTON_CANCEL=Cancel
+
+IDENTITY_REGISTER_TITLE=Basic user information
+IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation
+IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirm Password
+IDENTITY_REGISTER_SUCCESS_TITLE=Your account has been successfully created. You may want to login now.
+IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration.
+
+IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data?
+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.
+
+
+IDENTITY_EDIT_PROFILE_ERROR=Error while updating the profile.
+IDENTITY_EDIT_PASSWORD_TITLE=Change your password
+IDENTITY_EDIT_PASSWORD_CURRENT=Current password
+IDENTITY_EDIT_CHANGE_PASSWORD=Change password
+IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user:
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
+
+IDENTITY_EDIT_EMAIL_TITLE=Change your email address
+IDENTITY_EDIT_EMAIL_NEW=New email address
+IDENTITY_EDIT_CHANGE_EMAIL=Change email
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=Could not change e-mail address
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=An validation e-mail has been sent to your address.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Your e-mail address has been changed.
+
+IDENTITY_EDIT_PROFILE_TITLE=Edit profile
+IDENTITY_VIEW_PROFILE_TITLE=View profile
+
+IDENTITY_USERNAME=Username
+IDENTITY_PASSWORD=Password
+IDENTITY_EMAIL=E-Mail
+IDENTITY_GIVENNAME=Firstname
+IDENTITY_FAMILYNAME=Lastname
+IDENTITY_SKYPE=Skype ID
+IDENTITY_LOCATION=Location
+IDENTITY_OCCUPATION=Occupation
+IDENTITY_EXTRA=Extra
+IDENTITY_SIGNATURE=Signature
+IDENTITY_INTERESTS=Interests
+IDENTITY_LOCALE=Locale
+IDENTITY_ICQ=Icq ID
+IDENTITY_AIM=Aim ID
+IDENTITY_MSNM= MSN messenger ID
+IDENTITY_YIM=Yahoo ID
+IDENTITY_XMMP=Xmmp ID
+IDENTITY_HOMEPAGE=Homepage
+IDENTITY_TIMEZONE=Time zone offset
+IDENTITY_THEME=Theme
+IDENTITY_SECURITY_QUESTION=Security Question
+IDENTITY_SECURITY_ANSWER=Security Answer
+IDENTITY_LAST_LOGIN=Last login
+IDENTITY_REIGSTRATION_DATE=Registration Date
+IDENTITY_ENABLED=Enabled
+
+IDENTITY_CATEGORY_GENERAL=General Preferences
+IDENTITY_CATEGORY_PERSONAL=Personal Information
+IDENTITY_CATEGORY_INSTANT=Instant Message Identities
+IDENTITY_CATEGORY_ADDITIONAL=Additional Information
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature of 255 characters max)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 characters max.)
+
+IDENTITY_MANAGEMENT_ACTION=Actions
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Edit user
+IDENTITY_MANAGEMENT_ACTION_ROLES=Roles
+IDENTITY_MANAGEMENT_ACTION_DELETE=Delete
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=User Management
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Role Management
+IDENTITY_MANAGEMENT_SEARCH_USER=Search users
+IDENTITY_MANAGEMENT_CREATE_USER=Create new user account
+IDENTITY_MANAGEMENT_ROLE=Role
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=Display name
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Members
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Assigned roles
+IDENTITY_MANAGEMENT_CREATE_ROLE=Create new role
+IDENTITY_MANAGEMENT_EDIT_ROLE=Edit role
+IDENTITY_MANAGEMENT_CREATE_ROLE=Create role
+IDENTITY_MANAGEMENT_DISABLE=Disable
+IDENTITY_MANAGEMENT_ENABLE=Enable
+IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user:
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
+IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=approve
+IDENTITY_MANAGEMENT_PENDING_REJECT=reject
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
+IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address
+
+IDENTITY_VERIFICATION_RETURN=Return to portal
+IDENTITY_VERIFICATION_LOGIN=Login
+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.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Your e-mail address has been verified, but your account needs to be approved by the administrator.
+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_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.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Invalid password
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect
+
+# Example usage for dynamic values
+#IDENTIY_DYNAMIC_VALUE_TEST=test label
+#IDENTIY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
Deleted: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:21:05 UTC (rev 8220)
@@ -1,25 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat #
-# Copyright 2006, Red Hat Middleware, LLC, and individual #
-# contributors as indicated by the @authors tag. See the #
-# copyright.txt in the distribution for a full listing of #
-# individual contributors. #
-# #
-# This is free software; you can redistribute it and/or modify it #
-# under the terms of the GNU Lesser General Public License as #
-# published by the Free Software Foundation; either version 2.1 of #
-# the License, or (at your option) any later version. #
-# #
-# This software is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
-# Lesser General Public License for more details. #
-# #
-# You should have received a copy of the GNU Lesser General Public #
-# License along with this software; if not, write to the Free #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
-################################################################################
-
-IDENTITY_WELCOME=Willkommen
-IDENTITY_VIEW_PROFILE_TITLE=Profilansicht
\ No newline at end of file
Copied: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties (from rev 8219, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties)
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties (rev 0)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:21:05 UTC (rev 8220)
@@ -0,0 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+IDENTITY_WELCOME=Willkommen
+IDENTITY_VIEW_PROFILE_TITLE=Profilansicht
\ No newline at end of file
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/viewProfileTemplate.xhtml">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
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-11 11:12:01 UTC (rev 8219)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-11 11:21:05 UTC (rev 8220)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<div style="height: 200px; padding-top: 30px; vertical-align:top; text-align: center;">
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8219 - in branches/JBoss_Portal_Branch_2_6/core-identity: src/main/org/jboss/portal/core/identity/services/impl and 13 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 07:12:01 -0400 (Tue, 11 Sep 2007)
New Revision: 8219
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/
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_de.properties
Removed:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/resource-bundles/
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
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/ui/actions/CreateUserAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml
Log:
Moved Resource bundles
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -198,7 +198,6 @@
<!-- portal-core-identity-services-lib.jar -->
<jar jarfile="${build.lib}/portal-core-identity-services-lib.jar">
<fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**" />
- <fileset dir="${build.resources}/resource-bundles/" />
</jar>
<!-- portal-identity.war -->
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-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -169,7 +169,7 @@
this.locale = locale;
this.mailData.put(IdentityConstants.EMAIL_DOMAIN, emailDomain);
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", locale);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", locale);
String subject = null;
String to = (String) mailData.get(IdentityConstants.EMAIL_TO);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -132,7 +132,7 @@
String registrationStatus = "failed";
FacesContext ctx = FacesContext.getCurrentInstance();
String adminSubscription = (String) ev.getComponent().getId();
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
if (uiUser.getUsername() != null && uiUser.getPassword() != null)
{
try
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -209,13 +209,13 @@
}
catch (RuntimeException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
catch (IdentityException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
@@ -225,7 +225,7 @@
public String changePassword()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
if (this.password != null)
{
try
@@ -260,7 +260,7 @@
public String changeEmail()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
if (this.email != null)
{
try
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -118,7 +118,7 @@
public String doomed()
{
User user = null;
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot()
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot()
.getLocale());
// Used by the user management to reset passwords
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -176,7 +176,7 @@
{
String key = (String) i.next();
String value = (String) uiComponent.getValues().get(key);
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
try
{
value = bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + key.toUpperCase());
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -42,7 +42,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
Boolean tester = Boolean.FALSE;
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
PortletRequest portletRequest = (PortletRequest) context.getExternalContext().getRequest();
String captchaId = portletRequest.getRequestedSessionId();
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -52,7 +52,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
PortletContext portletContext = (PortletContext) context.getExternalContext().getContext();
userModule = (UserModule) portletContext.getAttribute("UserModule");
this.currentUser = context.getExternalContext().getRemoteUser();
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -41,7 +41,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("core.bundles.Identity", context.getViewRoot().getLocale());
if (value != null)
{
if (!(value instanceof String))
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -39,7 +39,7 @@
{
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
UIComponent passwordComponent = component.findComponent("password");
if (passwordComponent != null && passwordComponent instanceof HtmlInputSecret)
{
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-11 11:12:01 UTC (rev 8219)
@@ -54,7 +54,7 @@
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
String username = (String) value;
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
PortletContext portletContext = (PortletContext) context.getExternalContext().getContext();
userModule = (UserModule) portletContext.getAttribute("UserModule");
registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService");
Added: 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 (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-11 11:12:01 UTC (rev 8219)
@@ -0,0 +1,154 @@
+################################################################################
+# 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. #
+################################################################################
+
+IDENTITY_WELCOME=Welcome
+IDENTITY_REGISTER=Register
+IDENTITY_LOST_PASSWORD=Lost Password
+IDENTITY_NOT_LOGGED_IN=You are currently not logged in.
+IDENTITY_CREATE_ACCOUNT=You can create an account.
+IDENTITY_BUTTON_SUBMIT=Submit
+IDENTITY_BUTTON_EDIT=Edit
+IDENTITY_BUTTON_CANCEL=Cancel
+
+IDENTITY_REGISTER_TITLE=Basic user information
+IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation
+IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirm Password
+IDENTITY_REGISTER_SUCCESS_TITLE=Your account has been successfully created. You may want to login now.
+IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration.
+
+IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data?
+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.
+
+
+IDENTITY_EDIT_PROFILE_ERROR=Error while updating the profile.
+IDENTITY_EDIT_PASSWORD_TITLE=Change your password
+IDENTITY_EDIT_PASSWORD_CURRENT=Current password
+IDENTITY_EDIT_CHANGE_PASSWORD=Change password
+IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user:
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
+
+IDENTITY_EDIT_EMAIL_TITLE=Change your email address
+IDENTITY_EDIT_EMAIL_NEW=New email address
+IDENTITY_EDIT_CHANGE_EMAIL=Change email
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=Could not change e-mail address
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=An validation e-mail has been sent to your address.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Your e-mail address has been changed.
+
+IDENTITY_EDIT_PROFILE_TITLE=Edit profile
+IDENTITY_VIEW_PROFILE_TITLE=View profile
+
+IDENTITY_USERNAME=Username
+IDENTITY_PASSWORD=Password
+IDENTITY_EMAIL=E-Mail
+IDENTITY_GIVENNAME=Firstname
+IDENTITY_FAMILYNAME=Lastname
+IDENTITY_SKYPE=Skype ID
+IDENTITY_LOCATION=Location
+IDENTITY_OCCUPATION=Occupation
+IDENTITY_EXTRA=Extra
+IDENTITY_SIGNATURE=Signature
+IDENTITY_INTERESTS=Interests
+IDENTITY_LOCALE=Locale
+IDENTITY_ICQ=Icq ID
+IDENTITY_AIM=Aim ID
+IDENTITY_MSNM= MSN messenger ID
+IDENTITY_YIM=Yahoo ID
+IDENTITY_XMMP=Xmmp ID
+IDENTITY_HOMEPAGE=Homepage
+IDENTITY_TIMEZONE=Time zone offset
+IDENTITY_THEME=Theme
+IDENTITY_SECURITY_QUESTION=Security Question
+IDENTITY_SECURITY_ANSWER=Security Answer
+IDENTITY_LAST_LOGIN=Last login
+IDENTITY_REIGSTRATION_DATE=Registration Date
+IDENTITY_ENABLED=Enabled
+
+IDENTITY_CATEGORY_GENERAL=General Preferences
+IDENTITY_CATEGORY_PERSONAL=Personal Information
+IDENTITY_CATEGORY_INSTANT=Instant Message Identities
+IDENTITY_CATEGORY_ADDITIONAL=Additional Information
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature of 255 characters max)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 characters max.)
+
+IDENTITY_MANAGEMENT_ACTION=Actions
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Edit user
+IDENTITY_MANAGEMENT_ACTION_ROLES=Roles
+IDENTITY_MANAGEMENT_ACTION_DELETE=Delete
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=User Management
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Role Management
+IDENTITY_MANAGEMENT_SEARCH_USER=Search users
+IDENTITY_MANAGEMENT_CREATE_USER=Create new user account
+IDENTITY_MANAGEMENT_ROLE=Role
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=Display name
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Members
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Assigned roles
+IDENTITY_MANAGEMENT_CREATE_ROLE=Create new role
+IDENTITY_MANAGEMENT_EDIT_ROLE=Edit role
+IDENTITY_MANAGEMENT_CREATE_ROLE=Create role
+IDENTITY_MANAGEMENT_DISABLE=Disable
+IDENTITY_MANAGEMENT_ENABLE=Enable
+IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user:
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
+IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=approve
+IDENTITY_MANAGEMENT_PENDING_REJECT=reject
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
+IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address
+
+IDENTITY_VERIFICATION_RETURN=Return to portal
+IDENTITY_VERIFICATION_LOGIN=Login
+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.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Your e-mail address has been verified, but your account needs to be approved by the administrator.
+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_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.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Invalid password
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect
+
+# Example usage for dynamic values
+#IDENTIY_DYNAMIC_VALUE_TEST=test label
+#IDENTIY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:12:01 UTC (rev 8219)
@@ -0,0 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+IDENTITY_WELCOME=Willkommen
+IDENTITY_VIEW_PROFILE_TITLE=Profilansicht
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<ui:composition template="/WEB-INF/jsf/profile/viewProfileTemplate.xhtml">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<h:form>
<ul class="topnav">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-11 11:12:01 UTC (rev 8219)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<div style="height: 200px; padding-top: 30px; vertical-align:top; text-align: center;">
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8218 - in trunk/core-identity/src: resources/portal-identity-sar/conf and 9 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 06:21:35 -0400 (Tue, 11 Sep 2007)
New Revision: 8218
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
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/resetPassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.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/lost.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/changeEmail.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
Log:
- UI changes
- jbpm process file changes
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 10:21:35 UTC (rev 8218)
@@ -77,6 +77,7 @@
/** . */
private static final Logger log = Logger.getLogger(EditProfileAction.class);
+ /** The EditProfileAction constructor */
public EditProfileAction()
{
FacesContext ctx = FacesContext.getCurrentInstance();
@@ -193,6 +194,7 @@
ExternalContext ectx = ctx.getExternalContext();
Map params = ectx.getRequestParameterMap();
this.currentUser = (String) params.get("currentUser");
+ this.windowState = null;
if (this.currentUser == null)
{
this.currentUser = ectx.getRemoteUser();
@@ -203,6 +205,7 @@
public String updateProfile()
{
+ FacesContext ctx = FacesContext.getCurrentInstance();
try
{
User user = identityUserBean.findUserByUserName(this.currentUser);
@@ -211,17 +214,29 @@
}
catch (RuntimeException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
catch (IdentityException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
- return "editProfile";
+ if ( windowState != null)
+ {
+ try
+ {
+ JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
+ response.setWindowState(windowState);
+ }
+ catch(Exception e)
+ {
+ log.error("", e);
+ }
+ }
+ return "start";
}
public String changePassword()
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -25,7 +25,7 @@
<identity-ui-configuration>
<subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode>
- <overwrite-workflow>false</overwrite-workflow>
+ <overwrite-workflow>true</overwrite-workflow>
<email-domain>jboss.org</email-domain>
<email-from>do-no-reply(a)jboss.com</email-from>
<password-generation-characters>0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWyYzZ*#!+-/"</password-generation-characters>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
-<process-definition name="custom">
+<process-definition name="custom"
+ xmlns="urn:jbpm.org:jpdl-3.1">
<start-state>
<transition to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -21,11 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Schema for correct timer usage broken in jBPM 3.1.x
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<process-definition name="jbp_identity_validate_email">
<start-state>
<transition to="validate_email">
@@ -33,7 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="25 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.UpdateEmailAction"/>
</transition>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -21,11 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Schema for correct timer usage broken in jBPM 3.1.x
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<process-definition name="jbp_identity_validation_approval_workflow">
<start-state>
<transition to="validate_email">
@@ -33,7 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="3 days" transition="timedOut" />
<transition name="validated" to="admin_approval"/>
<transition name="timedOut" to="end"/>
</state>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -21,11 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Schema for correct timer usage broken in jBPM 3.1.x
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<process-definition name="jbp_identity_validation_workflow">
<start-state>
<transition to="validate_email">
@@ -33,7 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="3 days" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
</transition>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -331,19 +331,25 @@
<from-outcome>adminChangePassword</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>start</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
<navigation-case>
+ <from-outcome>start</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <navigation-case>
<from-action>#{editprofilemgr.adminEditProfile}</from-action>
<from-outcome>editProfile</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id>
</navigation-case>
- <navigation-case>
- <from-action>#{editprofilemgr.updateProfile}</from-action>
- <from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
- </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -27,7 +27,7 @@
<portlet-app>
<portlet>
- <portlet-name>CoreIdentityUserPortlet</portlet-name>
+ <portlet-name>IdentityUserPortlet</portlet-name>
<ajax>
<partial-refresh>false</partial-refresh>
</ajax>
@@ -39,7 +39,7 @@
</header-content>
</portlet>
<portlet>
- <portlet-name>CoreIdentityAdminPortlet</portlet-name>
+ <portlet-name>IdentityAdminPortlet</portlet-name>
<ajax>
<partial-refresh>false</partial-refresh>
</ajax>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -19,7 +19,8 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
- <h:commandButton value="Submit" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -7,7 +7,9 @@
class="identity-ui">
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
-<ui:define name="title"/>
+<ui:define name="title">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+</ui:define>
<ui:define name="content">
<h:form>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -22,7 +22,8 @@
<h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
- <h:commandButton value="Submit" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -22,7 +22,8 @@
<h:inputText value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
- <h:commandButton value="Submit" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -7,7 +7,9 @@
class="identity-ui">
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
-<ui:define name="title" />
+<ui:define name="title">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+</ui:define>
<ui:define name="content">
<h:form>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -32,6 +32,7 @@
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
</h:form>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -19,7 +19,8 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
- <h:commandButton value="Submit" action="register" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -17,6 +17,7 @@
<h:form>
<p><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" /></p>
<hr/>
+ <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandLink action="#{lostpasswordmgr.doomed}">
<h:outputText value="#{bundle.IDENTITY_BUTTON_SUBMIT}" />
<f:param name="currentUser" value="#{editprofilemgr.uiUser.username}" />
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -29,6 +29,7 @@
</c:if>
<h:messages />
<hr/>
+ <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
<h:commandButton id="#{subscriptionMode}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" actionListener="#{manager.register}" action="registered" styleClass="portlet-form-button"/>
</h:form>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -36,7 +36,7 @@
<h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:outputText value="#{bundle.IDENTITY_LOCALE}"/>
- <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}">
+ <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}">
<f:selectItems value="#{metadataservice.locale.values}" />
</h:selectOneMenu>
<h:panelGroup />
@@ -148,6 +148,7 @@
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/>
</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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -42,6 +42,7 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
+ <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/>
</h:form>
</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -24,7 +24,8 @@
<!-- include captcha -->
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
- <hr/>
+ <hr/>
+ <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{lostpasswordmgr.doomed}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -17,7 +17,7 @@
<h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
</li>
<li id="currentTab">
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ <h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD}" />
</li>
</ul>
</h:form>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -30,6 +30,7 @@
<h:message for="email" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -38,6 +38,7 @@
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -19,21 +19,21 @@
<h:outputText value="#{bundle.IDENTITY_USERNAME}:"/>
<h:outputText value="#{editprofilemgr.uiUser.username}"/>
- <h:outputText value="#{bundle.IDENTITY_EMAIL}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.email}"/>
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}:" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.email}" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
- <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}"/>
+ <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
- <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}"/>
-
- <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}"/>
+ <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
- <h:outputText value="#{bundle.IDENTITY_LOCATION}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.location}"/>
+ <h:outputText value="#{bundle.IDENTITY_LOCATION}:" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.location}" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
+ <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
+
</h:panelGrid>
</ui:define>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -11,7 +11,7 @@
<h:form>
<ul class="topnav">
<li id="currentTab">
- <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/>
+ <h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
</li>
<li>
<h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -29,14 +29,14 @@
<deployments>
<deployment>
<instance>
- <instance-id>CoreIdentityUserPortletInstance</instance-id>
- <portlet-ref>CoreIdentityUserPortlet</portlet-ref>
+ <instance-id>IdentityUserPortletInstance</instance-id>
+ <portlet-ref>IdentityUserPortlet</portlet-ref>
</instance>
</deployment>
<deployment>
<instance>
- <instance-id>CoreIdentityAdminPortletInstance</instance-id>
- <portlet-ref>CoreIdentityAdminPortlet</portlet-ref>
+ <instance-id>IdentityAdminPortletInstance</instance-id>
+ <portlet-ref>IdentityAdminPortlet</portlet-ref>
<security-constraint>
<policy-permission>
<role-name>Admin</role-name>
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-11 09:13:37 UTC (rev 8217)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-11 10:21:35 UTC (rev 8218)
@@ -30,7 +30,7 @@
<portlet>
<description>User portlet</description>
- <portlet-name>CoreIdentityUserPortlet</portlet-name>
+ <portlet-name>IdentityUserPortlet</portlet-name>
<display-name>User portlet</display-name>
<portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
<init-param>
@@ -65,7 +65,7 @@
<portlet>
<description>User and role management portlet</description>
- <portlet-name>CoreIdentityAdminPortlet</portlet-name>
+ <portlet-name>IdentityAdminPortlet</portlet-name>
<display-name>User management portlet</display-name>
<portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
<init-param>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8217 - in branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf: processes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 05:13:37 -0400 (Tue, 11 Sep 2007)
New Revision: 8217
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/processes/jbp_identity_validate_email.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
Log:
Changed some default values
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-11 07:35:05 UTC (rev 8216)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 09:13:37 UTC (rev 8217)
@@ -24,7 +24,7 @@
<identity-ui-configuration>
- <subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode>
+ <subscription-mode>automatic</subscription-mode>
<overwrite-workflow>false</overwrite-workflow>
<email-domain>jboss.org</email-domain>
<email-from>do-no-reply(a)jboss.com</email-from>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 07:35:05 UTC (rev 8216)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 09:13:37 UTC (rev 8217)
@@ -33,7 +33,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="25 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.UpdateEmailAction"/>
</transition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 07:35:05 UTC (rev 8216)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 09:13:37 UTC (rev 8217)
@@ -33,7 +33,7 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="49 hours" transition="timedOut" />
+ <timer name="time_to_expire" duedate="3 days" transition="timedOut" />
<transition name="validated" to="admin_approval"/>
<transition name="timedOut" to="end"/>
</state>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8216 - in branches/JBoss_Portal_Branch_2_6: build/ide/intellij/idea60/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-11 03:35:05 -0400 (Tue, 11 Sep 2007)
New Revision: 8216
Removed:
branches/JBoss_Portal_Branch_2_6/bridge/
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/bridge/
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/forums/
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/
Log:
update 2.6 to use portlet bridge integration from portlet module
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8215 - in branches/JBoss_Portal_Branch_2_6: build/ide/intellij/idea60/modules/core-admin and 9 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-11 03:32:23 -0400 (Tue, 11 Sep 2007)
New Revision: 8215
Modified:
branches/JBoss_Portal_Branch_2_6/build/build.xml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml
branches/JBoss_Portal_Branch_2_6/core-admin/build.xml
branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_6/faces/build.xml
branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent
Log:
update 2.6 to use portlet bridge integration from portlet module
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -118,7 +118,6 @@
<module name="server"/>
<module name="portlet-server"/>
<module name="theme"/>
- <module name="bridge"/>
<module name="cms"/>
<module name="format"/>
<module name="core"/>
@@ -139,7 +138,7 @@
<group name="portal">
<include
- modules="api, jems, server, security, search, format, portlet-server, bridge, faces, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-identity, core-samples, widget"/>
+ modules="api, jems, server, security, search, format, portlet-server, faces, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-identity, core-samples, widget"/>
</group>
<group name="cms">
@@ -350,9 +349,6 @@
<packageset dir="../jems/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
- <packageset dir="../bridge/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
<packageset dir="../faces/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -107,7 +107,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="bridge" />
<orderEntry type="module" module-name="server" />
<orderEntryProperties />
</component>
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -75,7 +75,6 @@
</orderEntry>
<orderEntry type="module" module-name="api" />
<orderEntry type="module" module-name="server" />
- <orderEntry type="module" module-name="bridge" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -94,6 +93,24 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -318,10 +318,15 @@
<fileset dir="${jboss.portal-format.root}/lib" includes="portal-format-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-portal-lib.jar"/>
<fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
- <fileset dir="${jboss.portal/modules/portlet.lib}" includes="portal-portlet-lib.jar,portal-portlet-federation-lib.jar,portal-portlet-jsr168api-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/portlet.lib}">
+ <include name="portal-portlet-lib.jar"/>
+ <include name="portal-portlet-federation-lib.jar"/>
+ <include name="portal-portlet-jsr168api-lib.jar"/>
+ <include name="portal-portlet-management-lib.jar"/>
+ <include name="portal-portlet-bridge-lib.jar"/>
+ </fileset>
<fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-sso-lib.jar"/>
- <fileset dir="${jboss.portal-bridge.root}/lib" includes="portal-bridge-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
<fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/>
<fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -339,7 +339,7 @@
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.bridge.BridgeInterceptor"
+ code="org.jboss.portal.portlet.bridge.BridgeInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Bridge"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -108,7 +108,6 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portal-format.classpath"/>
<path refid="jboss.portal-faces.classpath"/>
- <path refid="jboss.portal-bridge.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-registration.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -115,7 +115,6 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portal-format.classpath"/>
<path refid="jboss.portal-faces.classpath"/>
- <path refid="jboss.portal-bridge.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-registration.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -109,7 +109,6 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portal-wsrp.classpath"/>
<path refid="jboss.portal-faces.classpath"/>
- <path refid="jboss.portal-bridge.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-registration.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/faces/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/faces/build.xml 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/faces/build.xml 2007-09-11 07:32:23 UTC (rev 8215)
@@ -103,7 +103,6 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-server.classpath"/>
- <path refid="jboss.portal-bridge.classpath"/>
</path>
<!--+=======================================+-->
Modified: branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-09-11 07:32:23 UTC (rev 8215)
@@ -28,6 +28,7 @@
import org.jboss.portal.portlet.PortletParameters;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.bridge.JBossServletContextProvider;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.portlet.invocation.ActionInvocation;
@@ -46,7 +47,6 @@
import org.jboss.portal.common.util.MarkupInfo;
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.bridge.JBossServletContextProvider;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent
===================================================================
--- branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-09-11 07:27:07 UTC (rev 8214)
+++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-09-11 07:32:23 UTC (rev 8215)
@@ -52,13 +52,6 @@
<pathelement path="${jboss.portal-portlet-server.lib}/portal-portlet-server-lib.jar"/>
</path>
- <!-- bridge -->
- <property name="jboss.portal-bridge.root" value="${project.root}/bridge/output"/>
- <property name="jboss.portal-bridge.lib" value="${jboss.portal-bridge.root}/lib"/>
- <path id="jboss.portal-bridge.classpath">
- <pathelement path="${jboss.portal-bridge.lib}/portal-bridge-lib.jar"/>
- </path>
-
<!-- format -->
<property name="jboss.portal-format.root" value="${project.root}/format/output"/>
<property name="jboss.portal-format.lib" value="${jboss.portal-format.root}/lib"/>
18 years, 8 months
- 1
- 0