You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by su...@apache.org on 2010/06/11 21:38:57 UTC
svn commit: r953882 - in /incubator/photark/trunk:
photark-jcr/src/main/java/org/apache/photark/jcr/security/
photark-jcr/src/main/java/org/apache/photark/jcr/security/authorization/
photark-security/src/main/java/org/apache/photark/security/authentica...
Author: suho
Date: Fri Jun 11 21:38:56 2010
New Revision: 953882
URL: http://svn.apache.org/viewvc?rev=953882&view=rev
Log:
Improvements to the registration framework
and I'm also adding back the openid.properties file back.
this facilitate the users to get registered using their google and yahoo email addresses
submitted by suho
Added:
incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authorization/services/SecurityServiceImpl.java
- copied, changed from r953873, incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/JCRSecurityServiceImpl.java
incubator/photark/trunk/photark-security/src/main/resources/openid.properties
Removed:
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/JCRSecurityServiceImpl.java
Modified:
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/authorization/JCRAccessManager.java
incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authentication/RegistrationFilter.java
incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html
incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html
incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html
incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html
incubator/photark/trunk/photark-ui-security/src/main/webapp/home/registration.html
incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/authorization/JCRAccessManager.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/authorization/JCRAccessManager.java?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/authorization/JCRAccessManager.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/authorization/JCRAccessManager.java Fri Jun 11 21:38:56 2010
@@ -19,23 +19,18 @@
package org.apache.photark.jcr.security.authorization;
-import java.util.ArrayList;
-
-import javax.jcr.LoginException;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
import org.apache.photark.jcr.JCRRepositoryManager;
import org.apache.photark.security.authorization.AccessList;
import org.apache.photark.security.authorization.User;
import org.apache.photark.security.authorization.UserInfo;
import org.apache.photark.security.authorization.services.AccessManager;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.*;
+
+import javax.jcr.LoginException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import java.util.ArrayList;
@Remotable
@Scope("COMPOSITE")
@@ -139,6 +134,12 @@ public class JCRAccessManager implements
User user = null;
try {
Session session = repositoryManager.getSession();
+// //to delete userStore
+// Node root = session.getRootNode();
+// Node userStoreT= root.getNode("userStore");
+// userStoreT.remove();
+// session.save();
+// //
Node allUsers = (Node) session.getItem("/userStore/allUsers");
Node userNode;
Modified: incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authentication/RegistrationFilter.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authentication/RegistrationFilter.java?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authentication/RegistrationFilter.java (original)
+++ incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authentication/RegistrationFilter.java Fri Jun 11 21:38:56 2010
@@ -19,17 +19,11 @@
package org.apache.photark.security.authentication;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.logging.Logger;
/**
@@ -64,7 +58,7 @@ public class RegistrationFilter implemen
if (httpReq.getSession().getAttribute("toRigester") != null
&& httpReq.getSession().getAttribute("toRigester").equals("true")) {
- httpReq.getSession().setAttribute("toRigester", "false");
+ //httpReq.getSession().setAttribute("toRigester", "false");
chain.doFilter(request, response);
} else {
// httpResp.sendRedirect(httpReq.getContextPath() +"/admin/upload.html");
Copied: incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authorization/services/SecurityServiceImpl.java (from r953873, incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/JCRSecurityServiceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authorization/services/SecurityServiceImpl.java?p2=incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authorization/services/SecurityServiceImpl.java&p1=incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/JCRSecurityServiceImpl.java&r1=953873&r2=953882&rev=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/security/JCRSecurityServiceImpl.java (original)
+++ incubator/photark/trunk/photark-security/src/main/java/org/apache/photark/security/authorization/services/SecurityServiceImpl.java Fri Jun 11 21:38:56 2010
@@ -17,15 +17,7 @@
* under the License.
*/
-package org.apache.photark.jcr.security;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package org.apache.photark.security.authorization.services;
import org.apache.photark.security.authorization.AccessList;
import org.apache.photark.security.authorization.User;
@@ -35,13 +27,21 @@ import org.oasisopen.sca.annotation.Refe
import org.oasisopen.sca.annotation.Scope;
import org.oasisopen.sca.annotation.Service;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
@Service(Servlet.class)
@Scope("COMPOSITE")
-public class JCRSecurityServiceImpl extends HttpServlet implements Servlet /*SecurityService*/ {
+public class SecurityServiceImpl extends HttpServlet implements Servlet /*SecurityService*/ {
/**
- *
+ *
*/
private static final long serialVersionUID = -6452934544772432330L;
private AccessManager accessManager;
@@ -64,49 +64,50 @@ public class JCRSecurityServiceImpl ext
StringBuffer sb = new StringBuffer();
String userId= accessList.getUserId();
User user ;
-
- if("get".equalsIgnoreCase(request.getParameter("userInfo").toString())){
-
+
+ if("get".equalsIgnoreCase(request.getParameter("userInfo"))){
+
user = accessManager.getUser(userId);
UserInfo userInfo= user.getUserInfo();
- if(accessManager.isUserStoredInRole(userId, "unRegisteredUserRole")){
-
+ if(accessManager.isUserStoredInRole(userId, "registeredUserRole")){
+ request.getSession().setAttribute("toRigester", "false");
/* sb.append("userId="+ userId);
sb.append(",displayName=" + userInfo.getDisplayName());
sb.append(",email=" + userInfo.getEmail());
sb.append(",realName=" + userInfo.getRealName());
sb.append(",webSite=" + userInfo.getWebsite());*/
- sb.append( "registered,"+userId+","+ userInfo.getRealName()+","+userInfo.getDisplayName()+","+ userInfo.getEmail()+","+userInfo.getWebsite());
+ sb.append("registered,").append(userId).append(",").append(userInfo.getRealName()).append(",").append(userInfo.getDisplayName()).append(",").append(userInfo.getEmail()).append(",").append(userInfo.getWebsite());
}else {
/*sb.append("userId="+ userId);
sb.append(",unRegistered=false");*/
- sb.append("unRegistered,"+userId+","+ userInfo.getRealName()+","+userInfo.getDisplayName()+","+ userInfo.getEmail()+","+userInfo.getWebsite());
+ sb.append("unRegistered,").append(userId).append(",").append(userInfo.getRealName()).append(",").append(userInfo.getDisplayName()).append(",").append(userInfo.getEmail()).append(",").append(userInfo.getWebsite());
}
- }else if("set".equalsIgnoreCase( request.getParameter("userInfo").toString())){
-
- user = new User(userId);
- UserInfo userInfo = new UserInfo(request.getParameter("displayName").toString(),
- request.getParameter("email").toString(),
- request.getParameter("realName").toString(),
- request.getParameter("webSite").toString());
- user.setUserInfo(userInfo);
-
- if(accessManager.isUserStoredInRole(userId, "unRegisteredUserRole")){
- accessManager.removeUserFromRole(userId,"unRegisteredUserRole");
- }
- if(!accessManager.isUserStoredInRole(userId, "registeredUserRole")){
- accessManager.addUserToRole(user,"registeredUserRole");
- }
- //sb.append("userId="+ userId);
- //sb.append(",unRegistered=false");
-
+ }else if("set".equalsIgnoreCase(request.getParameter("userInfo"))){
+ if(request.getParameter("displayName") !=null&& !request.getParameter("displayName").trim().equals("")){
+ request.getSession().setAttribute("toRigester", "false");
+ user = new User(userId);
+ UserInfo userInfo = new UserInfo(request.getParameter("displayName"),
+ request.getParameter("email"),
+ request.getParameter("realName"),
+ request.getParameter("webSite"));
+ user.setUserInfo(userInfo);
+
+ if(accessManager.isUserStoredInRole(userId, "unRegisteredUserRole")){
+ accessManager.removeUserFromRole(userId,"unRegisteredUserRole");
+ }
+ if(!accessManager.isUserStoredInRole(userId, "registeredUserRole")){
+ accessManager.addUserToRole(user,"registeredUserRole");
+ }
+ //sb.append("userId="+ userId);
+ //sb.append(",unRegistered=false");
+ }
}
PrintWriter out = response.getWriter();
out.write(sb.toString());
out.flush();
out.close();
-
+
}
}
Added: incubator/photark/trunk/photark-security/src/main/resources/openid.properties
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/src/main/resources/openid.properties?rev=953882&view=auto
==============================================================================
--- incubator/photark/trunk/photark-security/src/main/resources/openid.properties (added)
+++ incubator/photark/trunk/photark-security/src/main/resources/openid.properties Fri Jun 11 21:38:56 2010
@@ -0,0 +1,37 @@
+#defaults (No extra configuration)
+#openid.identifier.parameter = openid_identifier
+#openid.discovery = com.dyuproject.openid.DefaultDiscovery
+#openid.assocation = com.dyuproject.openid.DiffieHellmanAssociation
+#openid.httpconnector = com.dyuproject.openid.SimpleHttpConnector
+#openid.authredirection = com.dyuproject.openid.SimpleRedirection
+#openid.user.manager = com.dyuproject.openid.manager.HttpSessionUserManager
+
+# when the user is redirected to his provider and he somehow navigates away from his
+# provider and returns to your site ... the relying party will do an automatic redirect
+# back to his provider for authentication
+#openid.automatic_redirect = true
+
+# when the discovery fails, use the openid_identifer as the openid server/provider url.
+#openid.identifier_as_server = false
+
+# if identifier_select.properties is found in classpath, it will be loaded to the cache
+# this is especially usefull for google, yahoo where there is a generic id.
+# this cache bypasses the discovery w/c will make the openid process faster.
+#openid.user.cache = com.dyuproject.openid.IdentifierSelectUserCache
+
+#optional (comma-or-semicolon-separated values)
+openid.identifier.resolvers = com.dyuproject.openid.ext.EmailResolver
+
+#if this is used, add dyuproject-json to the classpath and provide the required params below
+#openid.user.manager = com.dyuproject.openid.manager.CookieBasedUserManager
+
+#then these are required:
+#openid.user.manager.cookie.name = openidservlet1
+#openid.user.manager.cookie.security.secret_key = secret
+
+#and these are optional:
+#openid.user.manager.cookie.path = /
+#openid.user.manager.cookie.domain = http://www.example.com
+#openid.user.manager.cookie.security_type = md5Signed (default: encrypted)
+#openid.user.manager.cookie.max_age = 900 (default: 600 seconds)
+#openid.user.manager.cookie.login_timeout = 90 (default: 60 seconds)
Modified: incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html (original)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html Fri Jun 11 21:38:56 2010
@@ -28,7 +28,7 @@
</head>
<body>
<div id="container">
- <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+ <div style="float:right;width:50%;font-size:0.7em;text-align:right;">
<div><span><a href="../">Gallery</a></span></div>
</div>
<div style="clear:both"></div>
@@ -50,5 +50,6 @@
</tr>
</table>
</form>
+ </div>
</body>
</html>
\ No newline at end of file
Modified: incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html (original)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html Fri Jun 11 21:38:56 2010
@@ -28,7 +28,7 @@
</head>
<body>
<div id="container">
- <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+ <div style="float:right;width:50%;font-size:0.7em;text-align:right;">
<div><span><a href="../">Gallery</a></span></div>
</div>
<div style="clear:both"></div>
@@ -49,5 +49,6 @@
</tr>
</table>
</form>
+ </div>
</body>
</html>
\ No newline at end of file
Modified: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html (original)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html Fri Jun 11 21:38:56 2010
@@ -46,7 +46,7 @@
</head>
<body onload="initOpenIDPage();">
<div id="container">
- <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+ <div style="float:right;width:50%;font-size:0.7em;text-align:right;">
<div><span><a href="../">Gallery</a></span></div>
</div>
<div style="clear:both"></div>
@@ -67,4 +67,4 @@
</div>
</body>
</html>
-
\ No newline at end of file
+
Modified: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html (original)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html Fri Jun 11 21:38:56 2010
@@ -46,7 +46,7 @@
</head>
<body onload="initOpenIDPage();">
<div id="container">
- <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+ <div style="float:right;width:50%;font-size:0.7em;text-align:right;">
<div><span><a href="../">Gallery</a></span></div>
</div>
<div style="clear:both"></div>
Modified: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/registration.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/registration.html?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/home/registration.html (original)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/home/registration.html Fri Jun 11 21:38:56 2010
@@ -19,115 +19,171 @@
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<title>Registration</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>Registration</title>
<script type="text/javascript" src="../js/constants.js"></script>
<script type="text/javascript" src="../dojo/dojo.js"></script>
-
-<script type="text/javascript">
-
- dojo.addOnLoad(function() {
- // dojo.require("dojo.rpc.JsonService");
- dojo.require("dojo._base.xhr");
- });
-
-
- function populateInfo() {
- dojo.xhrPost({
- url:"../security", //photark.constants.SecurityEndpoint,
- content:{userInfo:"get"},
- handleAs: "text",
- load: function(response, ioArgs){
- setUserInfo(response);
- },
- error: function(response, ioArgs){
- console.error("Error in getting user info");
- }
- });
- }
-
- function setUserInfo(response){
- var array = new Array();
- array =response.split(',');
- document.getElementById('userId').innerHTML=""+array[1];
- if(array[0]!=null && array[0]=="unRegistered"){
- document.getElementById('realName').value=array[2];
- document.getElementById('displayName').value=array[3];
- document.getElementById('email').value=array[4];
- document.getElementById('webSite').value=array[5];
- }else {
- }
-
- }
-
- function init() {
- try {
- populateInfo();
- } catch (e) {
- alert(e);
- }
- }
-
- function redirect(){
- window.location="../admin/upload.html";
- }
-
- function set(){
- dojo.xhrPost({
- url:"../security", //photark.constants.SecurityEndpoint,
- content:{userInfo:"set",
- realName:document.getElementById('realName').value,
- displayName:document.getElementById('displayName').value,
- email:document.getElementById('email').value,
- webSite:document.getElementById('webSite').value},
- handleAs: "text",
- load: function(response, ioArgs){
- redirect();
- },
- error: function(response, ioArgs){
- console.error("Error in getting user info");
- redirect();
- }
+
+ <script type="text/javascript">
+
+ dojo.addOnLoad(function() {
+ // dojo.require("dojo.rpc.JsonService");
+ dojo.require("dojo._base.xhr");
});
- }
-
-</script>
+
+ function populateInfo() {
+ dojo.xhrPost({
+ url:"../security", //photark.constants.SecurityEndpoint,
+ content:{userInfo:"get"},
+ handleAs: "text",
+ load: function(response, ioArgs) {
+ setUserInfo(response);
+ },
+ error: function(response, ioArgs) {
+ console.error("Error in getting user info");
+ }
+ });
+ }
+
+ function setUserInfo(response) {
+ var array = new Array();
+ array = response.split(',');
+ document.getElementById('userId').innerHTML = "" + array[1];
+ if (array[0] != null && array[0] == "unRegistered") {
+ document.getElementById('realName').value = array[2];
+ document.getElementById('displayName').value = array[3];
+ document.getElementById('email').value = array[4];
+ document.getElementById('webSite').value = array[5];
+ } else {
+ window.location = "/photark/home/registration.html"
+ }
+
+ }
+
+ function init() {
+ try {
+ populateInfo();
+ } catch (e) {
+ alert(e);
+ }
+ }
+
+ function save() {
+ if (document.getElementById('displayName').value != null && trimAll(document.getElementById('displayName').value) != "") {
+
+ set();
+ } else {
+ document.getElementById('displayName').style.borderColor = "red";
+ alert("Please enter a \"Display Name\"!");
+ document.getElementById('displayName').focus();
+ }
+ }
+
+ function trimAll(sString)
+ {
+ while (sString.substring(0, 1) == ' ')
+ {
+ sString = sString.substring(1, sString.length);
+ }
+ while (sString.substring(sString.length - 1, sString.length) == ' ')
+ {
+ sString = sString.substring(0, sString.length - 1);
+ }
+ return sString;
+ }
+
+ function set() {
+ dojo.xhrPost({
+ url:"../security", //photark.constants.SecurityEndpoint,
+ content:{userInfo:"set",
+ realName:document.getElementById('realName').value,
+ displayName:document.getElementById('displayName').value,
+ email:document.getElementById('email').value,
+ webSite:document.getElementById('webSite').value},
+ handleAs: "text",
+ load: function(response, ioArgs) {
+ window.location = "/photark/home/registration.html"
+ },
+ error: function(response, ioArgs) {
+ console.error("Error in getting user info");
+ window.location = "../logout";
+
+ }
+ });
+ }
+
+
+ </script>
+ <style type="text/css">
+ #container {
+ padding: 1em;
+ }
+
+ #container p {
+ font-size: 1.2em;
+ font-family: Tahoma,Verdana;
+ }
+
+
+ </style>
</head>
<body onload="init()">
-<h2>Get Registered With PhotArk</h2>
-
-<table border="0">
-<tr>
-<td>OpenID : </td>
-<td><div id="userId"></div></td>
-</tr>
-<tr>
-<td>Real Name : </td>
-<td><input id="realName" type="text" name="realName" /></td>
-</tr>
-<tr>
-<td>Display Name : </td>
-<td><input id="displayName" type="text" name="displayName" /></td>
-</tr>
-<tr>
-<td>E-mail : </td>
-<td><input id="email" type="text" name="email" /></td>
-</tr>
-<tr>
-<td>Website :</td>
-<td><input id="webSite" type="text" name="webSite" /></td>
-</tr>
-</tr>
-<tr>
-<td><button id="submit" type="button" onclick="set()">Register</button></td>
-<td><button id="cancel" type="button" onclick="redirect()">Cancel</button></td>
-</tr>
-</table>
+<div id="container" style="margin-left:5px">
+<div style="float:right;width:50%;font-size:0.7em;text-align:right;">
+ <div><span><a href="../">Gallery</a></span></div>
+</div>
+ <p>Get <span style="color:orange">registered</span> with PhotArk</p>
+
+
+ <table border="0">
+ <tr>
+ <td>OpenID :</td>
+ <td>
+ <div id="userId" style="color:green;"></div>
+ </td>
+ </tr>
+ <tr>
+ <td><span>Display Name </span><span style="color:red">*</span><span> : </span></td>
+ <td><label>
+ <input id="displayName" type="text" name="displayName" size="20"/>
+ </label></td>
+ </tr>
+ <tr>
+ <td>Real Name :</td>
+ <td><label>
+ <input id="realName" type="text" name="realName" size="35"/>
+ </label></td>
+ </tr>
+ <tr>
+ <td>E-mail :</td>
+ <td><label>
+ <input id="email" type="text" name="email" size="35"/>
+ </label></td>
+ </tr>
+ <tr>
+ <td>Website :</td>
+ <td><label>
+ <input id="webSite" type="text" name="webSite" size="35"/>
+ </label></td>
+ </tr>
+ <tr>
+ </tr>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+ <button id="submit" type="button" onclick="save()" style="margin-right:5px">Register</button>
+ <button id="cancel" type="button" onclick="redirect()">Cancel</button>
+ </td>
+ </tr>
+ </table>
+</div>
</body>
</html>
Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite?rev=953882&r1=953881&r2=953882&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite Fri Jun 11 21:38:56 2010
@@ -45,7 +45,7 @@
<!-- Component responsible for providing REST access to Security Data -->
<component name="SecurityServiceComponent">
- <implementation.java class="org.apache.photark.jcr.security.JCRSecurityServiceImpl"/>
+ <implementation.java class="org.apache.photark.security.authorization.services.SecurityServiceImpl"/>
<service name="Servlet">
<tuscany:binding.http uri="/security"/>
</service>