Author: chathura
Date: Tue Dec 18 02:55:10 2007
New Revision: 11388
Log:
Fix in the secure registry.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfiguration.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AdminUtil.java
trunk/registry/modules/webapps/src/main/webapp/admin/admin.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfiguration.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfiguration.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfiguration.java
Tue Dec 18 02:55:10 2007
@@ -125,6 +125,10 @@
System.out.println(ele);
}
+ public void addDataBaseConfiguration(DataBaseConfiguration
dataBaseConfiguration) {
+ dbconfgigMap.put(dataBaseConfiguration.getConfigName(),
dataBaseConfiguration);
+ }
+
public DataBaseConfiguration getDataBaseConfiguration(String configName) {
return (DataBaseConfiguration) dbconfgigMap.get(configName);
}
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
Tue Dec 18 02:55:10 2007
@@ -113,6 +113,7 @@
config.setRealm(defaultRealm);
config.setAuthenticatedUserName(userID);
userRealm.init(config);
+ this.userRealm = userRealm;
authorizer = userRealm.getAuthorizer();
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Tue Dec 18 02:55:10 2007
@@ -327,6 +327,10 @@
} else if (command.equals("/addResource")) {
handleFileUpload(request, response);
+
+ } else if (command.equals("/addDBConfig")) {
+
+ AdminUtil.addDBURLBasedConfiguration(request, response);
}
}
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AdminUtil.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AdminUtil.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AdminUtil.java
Tue Dec 18 02:55:10 2007
@@ -17,11 +17,16 @@
package org.wso2.registry.web.utils;
import org.wso2.registry.web.beans.AdminBean;
+import org.wso2.registry.web.UIConstants;
import org.wso2.registry.config.RegistryConfiguration;
+import org.wso2.registry.config.DataBaseConfiguration;
import org.wso2.registry.RegistryConstants;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
import java.util.Map;
+import java.io.IOException;
public class AdminUtil {
@@ -36,4 +41,31 @@
adminBean.setDbConfigs(dbConfigs);
return adminBean;
}
+
+ public static void addDBURLBasedConfiguration(HttpServletRequest request,
HttpServletResponse response) {
+
+ RegistryConfiguration regConfiguration = (RegistryConfiguration)
request.getSession().
+
getServletContext().getAttribute(RegistryConstants.REGISTRY_CONFIG);
+
+ String dbURL = request.getParameter("dbURL");
+ String driverName = request.getParameter("driverName");
+ String userName = request.getParameter("userName");
+ String password = request.getParameter("password");
+
+ DataBaseConfiguration dbConfiguration = new DataBaseConfiguration();
+ dbConfiguration.setDbUrl(dbURL);
+ dbConfiguration.setDriverName(driverName);
+ dbConfiguration.setUserName(userName);
+ dbConfiguration.setPassWord(password);
+
+ regConfiguration.addDataBaseConfiguration(dbConfiguration);
+
+ try {
+
request.getRequestDispatcher(UIConstants.ADMIN_JSP).forward(request, response);
+ } catch (ServletException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/admin.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/admin.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/admin.jsp Tue Dec
18 02:55:10 2007
@@ -52,7 +52,6 @@
<input type="text" name="dbURL"/>
<input type="text" name="driverName"/>
<input type="text" name="userName"/>
- <input type="text" name="passwordme"/>
<input type="text" name="password"/>
<input type="submit" value="Add"/>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp Tue Dec
18 02:55:10 2007
@@ -17,7 +17,7 @@
<div class="popup-bot">
<form action="/wso2registry/system/signin" method="post">
- <table class="form-table" border="0" cellspacing="0"
cellpadding="0" style="widht:100%">
+ <table class="form-table" border="0" cellspacing="0"
cellpadding="0" style=" width:100%">
<tr>
<td>User Name:</td>
<td><input type="text" name="userName" id="userName"
/></td>
@@ -100,7 +100,7 @@
</a>
</td>
<td class="top-menu">
- <a
href="/wso2registry/system/activity/new">
+ <a
href="/wso2registry/system/admin">
<img
src="/wso2registry/admin/images/icon-recent-activity-small.gif" border="0"
align="top" /> Admin
</a>
</td>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
