6:30 a.m.
Author: emuckenhuber
Date: 2007-09-19 07:30:20 -0400 (Wed, 19 Sep 2007)
New Revision: 8355
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
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/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml
Log:
- missing changes
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-19 10:03:56 UTC (rev
8354)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-19 11:30:20 UTC (rev
8355)
@@ -322,8 +322,12 @@
<path refid="junit.junit.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-portlet.classpath"/>
+ <path refid="jboss.portal-identity.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal-test.classpath"/>
<path refid="oswego.concurrent.classpath" />
<path refid="apache.xerces.classpath"/>
<pathelement
location="${build.lib}/portal-core-identity-ui-lib.jar"/>
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-19
10:03:56 UTC (rev 8354)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-19
11:30:20 UTC (rev 8355)
@@ -57,7 +57,7 @@
.identity-ui ul.topnav {
margin-left: 0;
padding: 4px 0px 3px;
- border-bottom: 1px solid #dfe8ed;
+ border-bottom: 1px solid #b3c0c7;
}
.identity-ui ul.topnav li {
@@ -66,7 +66,7 @@
margin: 0;
padding: 3px 0.5em;
margin-left: 5px;
- border: 1px solid #dfe8ed;
+ border: 1px solid #b3c0c7;
border-bottom: none;
background-color: #f2f4f5;
}
@@ -83,6 +83,7 @@
.identity-ui ul.topnav li#currentTab a:hover {
}
+
/* Object path. */
.identity-ui ul.objectpath {
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-19
10:03:56 UTC (rev 8354)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-19
11:30:20 UTC (rev 8355)
@@ -56,6 +56,9 @@
/** . */
private List roles = new ArrayList();
+
+ /** . */
+ private List defaultRoles = null;
/** . */
private IdentityUIUser uiUser = new IdentityUIUser();
@@ -95,6 +98,7 @@
public void setDefaultRoles(List roles)
{
this.roles = roles;
+ this.defaultRoles = roles;
}
public IdentityUserBean getIdentityUserBean()
@@ -126,6 +130,13 @@
{
this.metaDataService = metaDataService;
}
+
+ public String cancelRegistration()
+ {
+ this.uiUser = new IdentityUIUser();
+ this.roles = defaultRoles;
+ return "start";
+ }
public void register(ActionEvent ev)
{
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-19
10:03:56 UTC (rev 8354)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-19
11:30:20 UTC (rev 8355)
@@ -34,7 +34,8 @@
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_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify
your registration.
+IDENTITY_REGISTER_REQUIRED_INFORMATION=indicates a required field.
IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data?
IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19
10:03:56 UTC (rev 8354)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19
11:30:20 UTC (rev 8355)
@@ -10,7 +10,7 @@
<hr/>
<h:graphicImage url="/jcaptcha" />
<h:panelGrid columns="2">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA}" />
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" />
<h:inputText id="validateCaptcha" value=""
required="true">
<f:validator validatorId="CaptchaValidator" />
</h:inputText>