Author: channa
Date: Wed Apr 30 03:46:18 2008
New Revision: 16381
Log:
Adding OpenID support - WIP.
Modified:
trunk/mashup/java/modules/core/conf/web_root.xml
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardHandler.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
trunk/mashup/java/modules/www/infocard.jsp
trunk/mashup/java/modules/www/js/utils.js
trunk/mashup/java/modules/www/openidsubmit.jsp
trunk/mashup/java/modules/www/register_self.jsp
trunk/mashup/java/modules/www/register_self_infocard.jsp
trunk/mashup/java/modules/www/signin.jsp
trunk/mashup/java/modules/www/taskbar.jsp
Modified: trunk/mashup/java/modules/core/conf/web_root.xml
==============================================================================
--- trunk/mashup/java/modules/core/conf/web_root.xml (original)
+++ trunk/mashup/java/modules/core/conf/web_root.xml Wed Apr 30 03:46:18 2008
@@ -106,8 +106,8 @@
</init-param>
<!-- Upadate with full URL to validate.jsp page -->
<init-param>
- <param-name>registration_validation_url</param-name>
- <param-value>validate.jsp</param-value>
+ <param-name>webapp_url</param-name>
+ <param-value>http://localhost:7443/</param-value>
</init-param>
<init-param>
<param-name>email_from_address</param-name>
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
Wed Apr 30 03:46:18 2008
@@ -63,12 +63,13 @@
public static final String SECURITY_CONFIG_KEYSTORE_KEYPASSWORD =
"KeyPassword";
public static final String EMAIL_RELAY_HOST = "email_relay_host";
- public static final String REG_VALIDATION_URL =
"registration_validation_url";
+ public static final String WEBAPP_URL = "webapp_url";
public static final String EMAIL_FROM_ADDRESS = "email_from_address";
public static final String EMAIL_SUBJECT = "email_subject";
public static final String EMAIL_BODY = "email_body";
public static final String EMAIL_FOOTER = "email_footer";
public static final String EMAIL_GREETING = "email_greeting";
+ public static final String EMAIL_VALIDATION_PAGE = "validate.jsp";
public static final String USER_REGISTRY = "user_registry";
public static final String MASHUP_MEDIA_TYPE = "wso2_mashup";
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
Wed Apr 30 03:46:18 2008
@@ -64,9 +64,9 @@
String relayHost =
servletConfig.getInitParameter(MashupConstants.EMAIL_RELAY_HOST);
String fromEmail =
servletConfig.getInitParameter(MashupConstants.EMAIL_FROM_ADDRESS);
String greeting =
servletConfig.getInitParameter(MashupConstants.EMAIL_GREETING);
+ String webappUrl =
servletConfig.getInitParameter(MashupConstants.WEBAPP_URL);
verifierConfig.setHost(relayHost);
-
verifierConfig.setRegistrationServiceEPR(servletConfig.getInitParameter(
- MashupConstants.REG_VALIDATION_URL));
+ verifierConfig.setRegistrationServiceEPR(webappUrl +
MashupConstants.EMAIL_VALIDATION_PAGE);
verifierConfig.setFromAddress(fromEmail);
verifierConfig.setReplyTo(fromEmail);
verifierConfig.setSubject(servletConfig.getInitParameter(
@@ -80,6 +80,7 @@
servletContext.setAttribute(MashupConstants.EMAIL_RELAY_HOST,
relayHost);
servletContext.setAttribute(MashupConstants.EMAIL_FROM_ADDRESS,
fromEmail);
servletContext.setAttribute(MashupConstants.EMAIL_GREETING, greeting);
+ servletContext.setAttribute(MashupConstants.WEBAPP_URL, webappUrl);
try {
EmailVerifier.init(realm, verifierConfig);
} catch (UserStoreException e) {
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardHandler.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardHandler.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardHandler.java
Wed Apr 30 03:46:18 2008
@@ -32,6 +32,7 @@
import org.wso2.registry.users.UserStoreReader;
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.relyingparty.TokenVerifierConstants;
+import org.wso2.solutions.identity.util.IdentityUtil;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -67,7 +68,7 @@
try {
String identifier = (String)
(MashupConstants.INFOCARD.equals(authMethod) ?
request.getAttribute(IdentityConstants.CLAIM_PPID) :
-
request.getAttribute(IdentityConstants.OpenId.SimpleRegAttributes.FULL_NAME));
//todo - put correct
+
request.getAttribute(IdentityConstants.OpenId.OPENID_IDENTIFIER));
String userName = MashupUtils.login(identifier,
session.getId());
UserRegistry userRegistry =
RegistryUtils.createUserRegistry(userName,
embeddedRegistry);
@@ -110,7 +111,7 @@
if (MashupConstants.INFOCARD.equals(authMethod)) {
identifier = (String)
request.getAttribute(IdentityConstants.CLAIM_PPID);
} else {
- identifier = (String)
request.getAttribute(IdentityConstants.OpenId.SimpleRegAttributes.FULL_NAME);
//todo - use correct
+ identifier = (String)
request.getAttribute(IdentityConstants.OpenId.OPENID_IDENTIFIER);
}
// Add only if this identifier has not been associated with a
user.
@@ -164,8 +165,12 @@
for (int cards = 0; cards < cardCount; cards++) {
String ppid = userProperties.get(MashupConstants.INFOCARD_PPID
+ cards).toString();
- // todo - get the freindly identifier here using
IdentityproviderUtil
- cardIds[cards] = ppid;
+ // Try to get a friendly identifier, but if not possible, show
the long version.
+ try {
+ cardIds[cards] = IdentityUtil.getPPIDDisplayValue(ppid);
+ } catch (Exception e) {
+ cardIds[cards] = ppid;
+ }
}
}
return cardIds;
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
Wed Apr 30 03:46:18 2008
@@ -170,7 +170,7 @@
// Get the details from the infocard and add to session for
persistance.
if (TokenVerifierConstants.STATE_SUCCESS.equals(auth)) {
- identifier = (String)
request.getAttribute(IdentityConstants.OpenId.SimpleRegAttributes.FULL_NAME);
// todo
+ identifier = (String)
request.getAttribute(IdentityConstants.OpenId.OPENID_IDENTIFIER);
session.setAttribute(IDENTIFIER, identifier);
fullName = (String)
request.getAttribute(IdentityConstants.OpenId.SimpleRegAttributes.FULL_NAME);
session.setAttribute(FULL_NAME, fullName);
Modified: trunk/mashup/java/modules/www/infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/infocard.jsp (original)
+++ trunk/mashup/java/modules/www/infocard.jsp Wed Apr 30 03:46:18 2008
@@ -30,7 +30,7 @@
</head>
<body>
<form name="frm" id="frm" method="post" action="<%=
"true".equals(fromSelfReg) ? "register_self_infocard.jsp" :
"infocardaccept.jsp"%>">
- <input type="hidden" name="InfoCardSignin" value="Log
in" /><br/>
+ <input type="hidden" name="FromIdentityProvider"
value="true" /><br/>
<input type="hidden" name="<%=
MashupConstants.AUTHENTICATION_METHOD %>" value="infocard" /><br/>
<input type="hidden" name="bounceback" value="<%=bounceback%>"/>
<OBJECT type="application/x-informationCard" name="xmlToken">
Modified: trunk/mashup/java/modules/www/js/utils.js
==============================================================================
--- trunk/mashup/java/modules/www/js/utils.js (original)
+++ trunk/mashup/java/modules/www/js/utils.js Wed Apr 30 03:46:18 2008
@@ -144,4 +144,46 @@
greeting = ("Good " + display);
return greeting;
-}
\ No newline at end of file
+}
+
+function showHideCommon(divxName){
+ divx=document.getElementById(divxName);
+
+ /* show the intialy hidden object */
+ if(divx.style.display=='none'){
+ if(divx.nodeName == 'DIV')
+ divx.style.display='block';
+ if(divx.nodeName == 'IMG')
+ try {
+ divx.style.display='inline';
+ } catch(e) {
+ divx.style.display = 'block';
+ }
+
+ if(divx.nodeName == 'TR'){
+ try {
+ divx.style.display='table-row';
+ } catch(e) {
+ divx.style.display = 'block';
+ }
+ }
+ if(divx.nodeName == 'TD')
+ divx.style.display='table-cell';
+ if(divx.nodeName == 'A')
+ divx.style.display='inline';
+ if(divx.nodeName == 'SPAN')
+ divx.style.display='inline';
+ if(divx.nodeName == 'INPUT')
+ divx.style.display='inline';
+ if(divx.nodeName == 'P')
+ divx.style.display='block';
+ if(divx.nodeName == 'TABLE')
+ divx.style.display='block';
+ //link.innerHTML=textHidden;
+ }
+ /* hide the initaly shown object */
+ else
+ {
+ divx.style.display='none';
+ }
+}
\ No newline at end of file
Modified: trunk/mashup/java/modules/www/openidsubmit.jsp
==============================================================================
--- trunk/mashup/java/modules/www/openidsubmit.jsp (original)
+++ trunk/mashup/java/modules/www/openidsubmit.jsp Wed Apr 30 03:46:18 2008
@@ -33,9 +33,13 @@
// you need to set an absolute url as the return url.
// once the user authenticated successfully or failed at the OpenID
// Provider, the browser will be redirected to this url
- String pageName = "registration".equals(calledFrom) ?
"register_self_infocard.jsp" : "infocardaccept.jsp";
- openIDAuthRequest.setReturnUrl(pageName + "?calledfrom=" + calledFrom + "&"
+
- MashupConstants.AUTHENTICATION_METHOD + "=openid");
+ StringBuffer returnUrl = new StringBuffer();
+ returnUrl.append(request.getSession().getServletContext().getAttribute(
+ MashupConstants.WEBAPP_URL));
+ returnUrl.append("registration".equals(calledFrom) ?
"register_self_infocard.jsp" : "infocardaccept.jsp");
+ returnUrl.append("?calledfrom=" + calledFrom + "&" +
MashupConstants.AUTHENTICATION_METHOD +
+ "=openid&FromIdentityProvider=true");
+ openIDAuthRequest.setReturnUrl(returnUrl.toString());
// Use Simple Attribute Registration 1.1
openIDAuthRequest.addRequestType(OpenIDRequestType.SIMPLE_REGISTRATION);
Modified: trunk/mashup/java/modules/www/register_self.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self.jsp (original)
+++ trunk/mashup/java/modules/www/register_self.jsp Wed Apr 30 03:46:18 2008
@@ -108,123 +108,133 @@
</head>
<body>
<div id="page">
- <% String thisPage = "register_self.jsp"; %>
- <%@ include file="header.jsp" %>
- <div id="search"></div>
- <div id="content" style="height:400px; ">
- <% if (RegistrationBean.isSelfRegistrationEnabled()) { %>
- <div class="mashup_title">Self Registration - will be verified via
e-mail</div>
- <br />
- <form name="formRegisterSelf" method='post'
action="register_self.jsp" onsubmit="return validateInput();">
- <input type="hidden" name="bounceback"
value="<%=bounceback%>"/>
- <table>
- <tr>
- <td>
- <table width="100%" border="0" cellpadding="3"
cellspacing="0" >
- <tr>
- <td width="130"><label><strong>User Name:<font
color="#FF0000">*</font></strong></label></td>
- <td><input type="text" name="userName"
-
value="<%=registrationHandler.getUserName()%>"/>
- <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("userName")%></font>
- </td>
- </tr>
- <tr>
- <td width="130"><label><strong>Full Name:<font
color="#FF0000">*</font></strong></label></td>
- <td><input type="text" name="fullName"
-
value="<%=registrationHandler.getFullName()%>"/>
- <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("fullName")%></font>
- </td>
- </tr>
- <tr>
- <td width="130"><label><strong>E-mail:<font
color="#FF0000">*</font></strong></label></td>
- <td><input type="text" name="emailId"
-
value="<%=registrationHandler.getEmailId()%>"/>
- <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("emailId")%></font>
- </td>
- </tr>
- <tr>
- <td><label><strong>Password:<font
color="#FF0000">*</font></strong></label></td>
- <td><input type="password" name="password"
-
value="<%=registrationHandler.getPassword()%>"/>
- <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("password")%></font>
- </td>
- </tr>
- <tr>
- <td><label><strong>Confirmation Password:<font
color="#FF0000">*</font></strong></label></td>
- <td><input type="password"
-
name="confirmedPassword"<%=registrationHandler
- .getConfirmedPassword()%>"/>
- <br><font
color="#FF0000"><%=registrationHandler
-
.getErrorMessage("confirmedPassword")%></font>
- </td>
- </tr>
- <%
- ServerConfiguration serverConfig =
- ServerConfiguration.getInstance();
- String captchaStatus =
- serverConfig
- .getFirstProperty(
-
MashupConstants.CAPTCHA_CONFIG + "." +
- MashupConstants
-
.CAPTCHA_CONFIG_STATUS);
- if (captchaStatus.equalsIgnoreCase("true")) {
- %>
- <tr>
- <td>
- <div align="center"><img
src="captcha.jsp"/></div>
- </td>
- <td>
- <br/>
- <label>Type the text you see in the image
here<font
- color="#FF0000">*</font></label>
- <br/>
- <input type="text" name="captcha"
-
value="<%=registrationHandler.getCaptcha()%>"/>
- <br><font
color="#FF0000"><%=registrationHandler
- .getErrorMessage("captcha")%>
- </font>
- </td>
- </tr>
- <%
- }
- %>
- <tr>
- <td> </td>
- <td><input type="submit" value="Register"/>
<input type="button" value="Cancel" onclick="document.location = '<%=
bounceback %>';"></td>
- </tr>
- <tr>
- <td> </td>
- <td align="center"></td>
- </tr>
- </table>
- </td>
- <td align="center" valign="top" height="175">
- <a
href="infocard.jsp?fromselfreg=true&bounceback=<%=URLEncoder.encode(bounceback,"UTF-8")%>"><img
src="images/infocard_92x64.png" border="0"></a>
- <br/>
- Fill up your details using your personal
or managed infocard.
- <br/>
- <br/>
- <a
href="http://wso2.org/projects/solutions/identity";
- target="_blank"><img
src="images/powered_identity.gif"
- border="0"></a>
- </td>
- </tr>
- </table>
- <strong><font color="#FF0000">*</font></strong>
Required fields
- </form>
+<% String thisPage = "register_self.jsp"; %>
+<%@ include file="header.jsp" %>
+<div id="search"></div>
+<div id="content" style="height:400px; ">
+<% if (RegistrationBean.isSelfRegistrationEnabled()) { %>
+<div class="mashup_title">Self Registration - will be verified via e-mail</div>
+<br/>
+<table>
+<tr>
+ <td>
+ <form name="formRegisterSelf" method='post' action="register_self.jsp"
onsubmit="return validateInput();">
+ <input type="hidden" name="bounceback" value="<%=bounceback%>"/>
+ <table width="100%" border="0" cellpadding="3" cellspacing="0">
+ <tr>
+ <td width="130"><label><strong>User Name:<font
color="#FF0000">*</font></strong></label></td>
+ <td><input type="text" name="userName"
+ value="<%=registrationHandler.getUserName()%>"/>
+ <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("userName")%>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td width="130"><label><strong>Full Name:<font
color="#FF0000">*</font></strong></label></td>
+ <td><input type="text" name="fullName"
+ value="<%=registrationHandler.getFullName()%>"/>
+ <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("fullName")%>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td width="130"><label><strong>E-mail:<font
color="#FF0000">*</font></strong></label></td>
+ <td><input type="text" name="emailId"
+ value="<%=registrationHandler.getEmailId()%>"/>
+ <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("emailId")%>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td><label><strong>Password:<font
color="#FF0000">*</font></strong></label></td>
+ <td><input type="password" name="password"
+ value="<%=registrationHandler.getPassword()%>"/>
+ <br><font
color="#FF0000"><%=registrationHandler.getErrorMessage("password")%>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td><label><strong>Confirmation Password:<font
color="#FF0000">*</font></strong></label></td>
+ <td><input type="password"
+ name="confirmedPassword"<%=registrationHandler
+ .getConfirmedPassword()%>"/>
+ <br><font color="#FF0000"><%=registrationHandler
+ .getErrorMessage("confirmedPassword")%>
+ </font>
+ </td>
+ </tr>
+ <%
+ ServerConfiguration serverConfig =
+ ServerConfiguration.getInstance();
+ String captchaStatus =
+ serverConfig
+ .getFirstProperty(
+ MashupConstants.CAPTCHA_CONFIG +
"." +
+ MashupConstants
+
.CAPTCHA_CONFIG_STATUS);
+ if (captchaStatus.equalsIgnoreCase("true")) {
+ %>
+ <tr>
+ <td>
+ <div align="center"><img src="captcha.jsp"/></div>
+ </td>
+ <td>
+ <br/>
+ <label>Type the text you see in the image here<font
+ color="#FF0000">*</font></label>
+ <br/>
+ <input type="text" name="captcha"
+ value="<%=registrationHandler.getCaptcha()%>"/>
+ <br><font color="#FF0000"><%=registrationHandler
+ .getErrorMessage("captcha")%>
+ </font>
+ </td>
+ </tr>
+ <%
+ }
+ %>
+ <tr>
+ <td> </td>
+ <td><input type="submit" value="Register"/> <input
type="button" value="Cancel"
+
onclick="document.location = '<%= bounceback %>';">
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align="center"></td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ <td align="center" valign="top" height="175">
+ <a
href="infocard.jsp?fromselfreg=true&bounceback=<%=URLEncoder.encode(bounceback,"UTF-8")%>"><img
+ src="images/infocard_92x64.png" border="0"></a>
+ <br/>
+ Fill up your details using your personal or managed infocard.
+ <br/>
+ <br/>
+ <a href="http://wso2.org/projects/solutions/identity";
+ target="_blank"><img src="images/powered_identity.gif"
+ border="0"></a>
+ </td>
+ <td align="center" valign="top" height="175">
<form name="openidsignin" id="openidsignin" method="post"
action="openidsubmit.jsp">
Enter Your OpenID Url for self registration:<input type="text"
name="openIdUrl"/>
<input type="hidden" name="calledfrom" value="registration"/>
- <input type="submit" name="submit" value="Login" />
+ <input type="submit" name="submit" value="Login"/>
</form>
- <br>
- <% } else { %>
- <div class="mashup_title">Self Registration Disabled</div>
- <div> Self-registration disabled. Please contact
administrator to register yourself.</div>
- <% } %>
- <br>
- </div>
- <%@ include file="footer.jsp" %>
+ </td>
+</tr>
+</table>
+<strong><font color="#FF0000">*</font></strong> Required fields
+<br>
+<% } else { %>
+<div class="mashup_title">Self Registration Disabled</div>
+<div> Self-registration disabled. Please contact administrator to
register yourself.</div>
+<% } %>
+<br>
+</div>
+<%@ include file="footer.jsp" %>
</div>
</body>
</html>
Modified: trunk/mashup/java/modules/www/register_self_infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self_infocard.jsp (original)
+++ trunk/mashup/java/modules/www/register_self_infocard.jsp Wed Apr 30
03:46:18 2008
@@ -24,7 +24,8 @@
UserRegistry userRegistry = RegistryUtils.getRegistry(request);
String bounceback = request.getParameter("bounceback");
- String infoCardPresented =
request.getParameter(MashupConstants.AUTHENTICATION_METHOD);
+ String fromIdentityProvider = request.getParameter("FromIdentityProvider");
+ String authMethod =
request.getParameter(MashupConstants.AUTHENTICATION_METHOD);
if (bounceback == null) {
bounceback = "index.jsp";
} else {
@@ -38,9 +39,12 @@
<%
boolean authenticatedDetailsRetrieved = false;
boolean identityAlreadyUsed = false;
- if ("Log in".equals(infoCardPresented)) {
- authenticatedDetailsRetrieved =
infoCardRegHandler.setInfoCardDetails(request);
-
+ if (MashupConstants.TRUE.equals(fromIdentityProvider)) {
+ if (MashupConstants.INFOCARD.equals(authMethod)) {
+ authenticatedDetailsRetrieved =
infoCardRegHandler.setInfoCardDetails(request);
+ } else {
+ authenticatedDetailsRetrieved =
infoCardRegHandler.setOpenIdDetails(request);
+ }
// If the details were successfully retrieved, check for duplication.
if (authenticatedDetailsRetrieved) {
identityAlreadyUsed =
InfoCardHandler.isIdentifierRegistered(request,
@@ -75,7 +79,8 @@
<div id="search"></div>
<div id="content" style="height:400px; ">
<% if (RegistrationBean.isSelfRegistrationEnabled()) {
- if ("Log in".equals(infoCardPresented) &&
(!authenticatedDetailsRetrieved || identityAlreadyUsed)) { %>
+ if (MashupConstants.TRUE.equals(fromIdentityProvider) &&
(!authenticatedDetailsRetrieved ||
+ identityAlreadyUsed)) { %>
<div class="mashup_title">Infocard Error</div>
<div> <%= identityAlreadyUsed ?
bundle.getString("register.self.infocardreused") :
bundle.getString("register.self.infocarderror") %>
Modified: trunk/mashup/java/modules/www/signin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp (original)
+++ trunk/mashup/java/modules/www/signin.jsp Wed Apr 30 03:46:18 2008
@@ -178,24 +178,27 @@
<table width="100%" height="400" border="0" cellspacing="0" cellpadding="5">
<tr>
<td valign="top">
- <form id="Login" onsubmit="return true;" method="post">
- <input type="hidden" name="firsttime" value="false"/>
- <input type="hidden" name="bounceback" value="<%=bounceback%>"/>
- <input type="hidden" id="rememberme" name="rememberme"
value="false"/>
- <input type="hidden" id="remembermeforever"
name="remembermeforever"
- value="false"/>
- <br/>
<table width="675" border="0" cellpadding="3" cellspacing="0"
class="box" align="center">
<tr>
- <th>Sign-in to <%= bundle.getString("main.title")%>
+ <th width="50%">Sign-in to <%=
bundle.getString("main.title")%>
+ </th>
+ <th width="25%">Use InfoCard to enter <%= bundle
+ .getString("main.title")%>
</th>
- <th width="50%">Use InfoCard to enter <%= bundle
+ <th width="25%">Use OpenID to enter <%= bundle
.getString("main.title")%>
</th>
</tr>
<tr>
<td height="175">
+ <form id="Login" onsubmit="return true;" method="post">
+ <input type="hidden" name="firsttime"
value="false"/>
+ <input type="hidden" name="bounceback"
value="<%=bounceback%>"/>
+ <input type="hidden" id="rememberme"
name="rememberme" value="false"/>
+ <input type="hidden" id="remembermeforever"
name="remembermeforever"
+ value="false"/>
+ <br/>
<% if (!success) { %>
<div class="error">Invalid user or password. Please
try again.
</div>
@@ -249,8 +252,9 @@
id="signin"
value="Sign In"/>
</div>
+ </form>
</td>
- <td height="175">
+ <td height="175" valign="top">
<a
href="infocard.jsp?bounceback=<%=URLEncoder.encode(bounceback,"UTF-8")%>"><img
src="images/infocard_92x64.png" border="0"></a>
<br/><br/>
@@ -261,6 +265,13 @@
target="_blank"><img
src="images/powered_identity.gif"
border="0"></a>
</td>
+ <td height="175" valign="top">
+ <form name="openidsignin" id="openidsignin"
method="post" action="openidsubmit.jsp">
+ Enter Your OpenID Url:<input type="text"
name="openIdUrl"/>
+ <input type="hidden" name="calledfrom"
value="signin"/>
+ <input type="submit" name="submit" value="Login" />
+ </form>
+ </td>
</tr>
<tr>
<td>
@@ -271,13 +282,6 @@
</table>
<br/>
<br/>
- </form>
- <form name="openidsignin" id="openidsignin" method="post"
action="openidsubmit.jsp">
- Enter Your OpenID Url:<input type="text" name="openIdUrl"/>
- <input type="hidden" name="calledfrom" value="signin"/>
- <input type="submit" name="submit" value="Login" />
- </form>
-
</td>
</tr>
</table>
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Wed Apr 30 03:46:18 2008
@@ -104,6 +104,7 @@
}
}
</script>
+<script language="javascript" src="js/utils.js"
type="text/javascript"></script>
<li id="redeploy-service">
<a href="#"
onclick="redeployService();">Re deploy this service</a>
@@ -198,6 +199,16 @@
<li>
<a href="infocard.jsp">Register your Infocard</a>
</li>
+<li>
+ <a href="#" onclick="showHideCommon('openIdPrompt')">Register your
OpenID</a>
+</li>
+<div id="openIdPrompt" style="display:none;">
+ <form name="openidsignin" id="openidsignin" method="post"
action="openidsubmit.jsp">
+ Enter Your OpenID Url:<input type="text" name="openIdUrl"/>
+ <input type="hidden" name="calledfrom" value="signin"/>
+ <input type="submit" name="submit" value="Add"/>
+ </form>
+</div>
<% } %>
<%
if (RegistryUtils.isPseudoUser(userRegistry)) { %>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
