You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/05/23 04:37:47 UTC
svn commit: r777774 - in /webservices/juddi/branches/v3_trunk/juddi-console:
juddi-portal/ uddi-portlets/src/main/java/org/apache/juddi/portlets/client/
uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/
uddi-portlets/src/main/java/o...
Author: kstam
Date: Sat May 23 02:37:47 2009
New Revision: 777774
URL: http://svn.apache.org/viewvc?rev=777774&view=rev
Log:
juddi-199
Looking at the UserPrincipal and using that to authenticate.
Modified:
webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml
webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java
webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java
webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java
webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
Modified: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml?rev=777774&r1=777773&r2=777774&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml Sat May 23 02:37:47 2009
@@ -4,6 +4,7 @@
<role rolename="tomcat"/>
<role rolename="role1"/>
<role rolename="manager"/>
+ <user username="root" password="root" roles="pluto,tomcat,manager"/>
<user username="juddi" password="juddi" roles="pluto,tomcat,manager"/>
<user username="pluto" password="pluto" roles="pluto,tomcat,manager"/>
<user username="tomcat" password="tomcat" roles="tomcat,pluto,manager"/>
Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java?rev=777774&r1=777773&r2=777774&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/LoginPanel.java Sat May 23 02:37:47 2009
@@ -44,7 +44,7 @@
tokenButton.addClickListener(this);
tokenButton.setStyleName(("portlet-form-button"));
add(tokenButton);
- RootPanel.get("token").add(tokenLabel); //TODO at some point we want to hide this
+ //RootPanel.get("token").add(tokenLabel);
}
@@ -126,6 +126,5 @@
});
}
-
}
Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java?rev=777774&r1=777773&r2=777774&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityService.java Sat May 23 02:37:47 2009
@@ -25,6 +25,5 @@
*/
@RemoteServiceRelativePath("security")
public interface SecurityService extends RemoteService {
- public SecurityResponse get();
public SecurityResponse get(String username, String password);
}
Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java?rev=777774&r1=777773&r2=777774&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/SecurityServiceAsync.java Sat May 23 02:37:47 2009
@@ -24,7 +24,6 @@
*
*/
public interface SecurityServiceAsync extends RemoteService {
- public void get(AsyncCallback<SecurityResponse> callback);
public void get(String username, String password, AsyncCallback<SecurityResponse> callback);
}
Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java?rev=777774&r1=777773&r2=777774&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java Sat May 23 02:37:47 2009
@@ -44,26 +44,16 @@
private Logger logger = Logger.getLogger(this.getClass());
private static final long serialVersionUID = 1L;
-
- public SecurityResponse get() {
- SecurityResponse response = new SecurityResponse();
- HttpServletRequest request = getThreadLocalRequest();
- HttpSession session = request.getSession();
- String token = (String) session.getAttribute("AuthToken");
- response.setSuccess(true);
- response.setResponse(token);
- return response;
- }
-
public SecurityResponse get(String username, String password) {
- if (username==null) {
- return get();
- }
HttpServletRequest request = getThreadLocalRequest();
HttpSession session = request.getSession();
Principal user = request.getUserPrincipal();
logger.debug("UserPrincipal " + user);
+ if (username==null && user!=null) {
+ username = user.getName();
+ password = "";
+ }
logger.debug("User " + username + " sending token request..");
SecurityResponse response = new SecurityResponse();
String token = (String) session.getAttribute("AuthToken");
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org