You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/12 21:03:42 UTC
svn commit: r421371 - in
/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src:
./ java/org/apache/geronimo/console/securitymanager/realm/
webapp/WEB-INF/view/realmwizard/
Author: jdillon
Date: Wed Jul 12 12:03:41 2006
New Revision: 421371
URL: http://svn.apache.org/viewvc?rev=421371&view=rev
Log:
Merge #421180 for GERONIMO-2164
Modified:
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp
Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Wed Jul 12 12:03:41 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:421368
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Wed Jul 12 12:03:41 2006
@@ -56,8 +56,6 @@
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.status.ProgressObject;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletConfig;
@@ -70,6 +68,9 @@
import javax.portlet.WindowState;
import javax.security.auth.Subject;
import javax.security.auth.spi.LoginModule;
+import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileWriter;
@@ -103,26 +104,26 @@
public class SecurityRealmPortlet extends BasePortlet {
private final static Log log = LogFactory.getLog(SecurityRealmPortlet.class);
private final static String[] SKIP_ENTRIES_WITH = new String[]{"geronimo", "tomcat", "tranql", "commons", "directory", "activemq"};
- private static final String LIST_VIEW = "/WEB-INF/view/realmwizard/list.jsp";
- private static final String EDIT_VIEW = "/WEB-INF/view/realmwizard/edit.jsp";
- private static final String SELECT_TYPE_VIEW = "/WEB-INF/view/realmwizard/selectType.jsp";
- private static final String CONFIGURE_VIEW = "/WEB-INF/view/realmwizard/configure.jsp";
- private static final String ADVANCED_VIEW = "/WEB-INF/view/realmwizard/advanced.jsp";
- private static final String TEST_LOGIN_VIEW = "/WEB-INF/view/realmwizard/testLogin.jsp";
- private static final String TEST_RESULTS_VIEW = "/WEB-INF/view/realmwizard/testResults.jsp";
- private static final String SHOW_PLAN_VIEW = "/WEB-INF/view/realmwizard/showPlan.jsp";
- private static final String USAGE_VIEW = "/WEB-INF/view/realmwizard/usage.jsp";
- private static final String LIST_MODE = "list";
- private static final String EDIT_MODE = "edit";
- private static final String SELECT_TYPE_MODE = "type";
- private static final String CONFIGURE_MODE = "configure";
- private static final String ADVANCED_MODE = "advanced";
- private static final String TEST_LOGIN_MODE = "test";
- private static final String TEST_RESULTS_MODE = "results";
- private static final String SHOW_PLAN_MODE = "plan";
+ private static final String LIST_VIEW = "/WEB-INF/view/realmwizard/list.jsp";
+ private static final String EDIT_VIEW = "/WEB-INF/view/realmwizard/edit.jsp";
+ private static final String SELECT_TYPE_VIEW = "/WEB-INF/view/realmwizard/selectType.jsp";
+ private static final String CONFIGURE_VIEW = "/WEB-INF/view/realmwizard/configure.jsp";
+ private static final String ADVANCED_VIEW = "/WEB-INF/view/realmwizard/advanced.jsp";
+ private static final String TEST_LOGIN_VIEW = "/WEB-INF/view/realmwizard/testLogin.jsp";
+ private static final String TEST_RESULTS_VIEW = "/WEB-INF/view/realmwizard/testResults.jsp";
+ private static final String SHOW_PLAN_VIEW = "/WEB-INF/view/realmwizard/showPlan.jsp";
+ private static final String USAGE_VIEW = "/WEB-INF/view/realmwizard/usage.jsp";
+ private static final String LIST_MODE = "list";
+ private static final String EDIT_MODE = "edit";
+ private static final String SELECT_TYPE_MODE = "type";
+ private static final String CONFIGURE_MODE = "configure";
+ private static final String ADVANCED_MODE = "advanced";
+ private static final String TEST_LOGIN_MODE = "test";
+ private static final String TEST_RESULTS_MODE = "results";
+ private static final String SHOW_PLAN_MODE = "plan";
private static final String EDIT_EXISTING_MODE = "editExisting";
- private static final String USAGE_MODE = "usage";
- private static final String SAVE_MODE = "save";
+ private static final String USAGE_MODE = "usage";
+ private static final String SAVE_MODE = "save";
private static final String MODE_KEY = "mode";
private PortletRequestDispatcher listView;
@@ -165,13 +166,13 @@
String mode = actionRequest.getParameter(MODE_KEY);
RealmData data = new RealmData();
data.load(actionRequest);
- if(mode.equals(SELECT_TYPE_MODE)) {
- data.realmType="Properties File Realm";
+ if (mode.equals(SELECT_TYPE_MODE)) {
+ data.realmType = "Properties File Realm";
actionResponse.setRenderParameter(MODE_KEY, SELECT_TYPE_MODE);
- } else if(mode.equals("process-"+SELECT_TYPE_MODE)) {
- if(data.getName() != null && !data.getName().trim().equals("")) {
+ } else if (mode.equals("process-" + SELECT_TYPE_MODE)) {
+ if (data.getName() != null && !data.getName().trim().equals("")) {
// Config properties have to be set in render since they have values of null
- if(data.getRealmType().equals("Other")) {
+ if (data.getRealmType().equals("Other")) {
actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
} else {
actionResponse.setRenderParameter(MODE_KEY, CONFIGURE_MODE);
@@ -179,39 +180,40 @@
} else {
actionResponse.setRenderParameter(MODE_KEY, SELECT_TYPE_MODE);
}
- } else if(mode.equals("process-"+CONFIGURE_MODE)) {
+ } else if (mode.equals("process-" + CONFIGURE_MODE)) {
final String error = actionTestLoginModuleLoad(actionRequest, data);
- if(error == null) {
+ if (error == null) {
actionResponse.setRenderParameter(MODE_KEY, ADVANCED_MODE);
} else {
actionResponse.setRenderParameter("LoginModuleError", error);
actionResponse.setRenderParameter(MODE_KEY, CONFIGURE_MODE);
}
- } else if(mode.equals("process-"+ADVANCED_MODE)) {
+ } else if (mode.equals("process-" + ADVANCED_MODE)) {
String test = actionRequest.getParameter("test");
- if(test == null || test.equals("true")) {
+ if (test == null || test.equals("true")) {
actionResponse.setRenderParameter(MODE_KEY, TEST_LOGIN_MODE);
} else {
actionSaveRealm(actionRequest, data);
actionResponse.setRenderParameter(MODE_KEY, LIST_MODE);
}
- } else if(mode.equals("process-"+TEST_LOGIN_MODE)) {
+ } else if (mode.equals("process-" + TEST_LOGIN_MODE)) {
actionAttemptLogin(data, actionRequest, actionRequest.getPortletSession(true), actionRequest.getParameter("username"), actionRequest.getParameter("password"));
actionResponse.setRenderParameter(MODE_KEY, TEST_RESULTS_MODE);
- } else if(mode.equals(SHOW_PLAN_MODE)) {
+ } else if (mode.equals(SHOW_PLAN_MODE)) {
XmlObject object = actionGeneratePlan(actionRequest, data);
savePlanToSession(actionRequest.getPortletSession(true), object);
actionResponse.setRenderParameter(MODE_KEY, SHOW_PLAN_MODE);
- } else if(mode.equals(EDIT_EXISTING_MODE)) {
+ } else if (mode.equals(EDIT_EXISTING_MODE)) {
actionLoadExistingRealm(actionRequest, data);
actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
- } else if(mode.equals(CONFIGURE_MODE)) {
- if(data.getAbstractName() != null || (data.getRealmType() != null && data.getRealmType().equals("Other"))) {
+ } else if (mode.equals(CONFIGURE_MODE)) {
+ if (data.getAbstractName() != null || (data.getRealmType() != null && data.getRealmType().equals("Other")))
+ {
actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
} else {
actionResponse.setRenderParameter(MODE_KEY, CONFIGURE_MODE);
}
- } else if(mode.equals(SAVE_MODE)) {
+ } else if (mode.equals(SAVE_MODE)) {
actionSaveRealm(actionRequest, data);
actionResponse.setRenderParameter(MODE_KEY, LIST_MODE);
} else {
@@ -229,26 +231,26 @@
RealmData data = new RealmData();
data.load(renderRequest);
renderRequest.setAttribute("realm", data);
- if(mode == null || mode.equals("")) {
+ if (mode == null || mode.equals("")) {
mode = LIST_MODE;
}
- if(mode.equals(LIST_MODE)) {
+ if (mode.equals(LIST_MODE)) {
renderList(renderRequest, renderResponse);
- } else if(mode.equals(EDIT_MODE)) {
+ } else if (mode.equals(EDIT_MODE)) {
renderEdit(renderRequest, renderResponse, data);
- } else if(mode.equals(SELECT_TYPE_MODE)) {
+ } else if (mode.equals(SELECT_TYPE_MODE)) {
renderSelectType(renderRequest, renderResponse);
- } else if(mode.equals(CONFIGURE_MODE)) {
+ } else if (mode.equals(CONFIGURE_MODE)) {
renderConfigure(renderRequest, renderResponse, data);
- } else if(mode.equals(ADVANCED_MODE)) {
+ } else if (mode.equals(ADVANCED_MODE)) {
renderAdvanced(renderRequest, renderResponse, data);
- } else if(mode.equals(TEST_LOGIN_MODE)) {
+ } else if (mode.equals(TEST_LOGIN_MODE)) {
renderTestLoginForm(renderRequest, renderResponse);
- } else if(mode.equals(TEST_RESULTS_MODE)) {
+ } else if (mode.equals(TEST_RESULTS_MODE)) {
renderTestResults(renderRequest, renderResponse);
- } else if(mode.equals(SHOW_PLAN_MODE)) {
+ } else if (mode.equals(SHOW_PLAN_MODE)) {
renderPlan(renderRequest, renderResponse);
- } else if(mode.equals(USAGE_MODE)) {
+ } else if (mode.equals(USAGE_MODE)) {
renderUsage(renderRequest, renderResponse);
}
} catch (Throwable e) {
@@ -260,30 +262,30 @@
Map options = new HashMap();
try {
LoginModule module = loadModule(request, data, options);
- log.warn("Testing with options "+options);
+ log.warn("Testing with options " + options);
try {
PortletManager.testLoginModule(request, module, options);
return null;
} catch (Exception e) {
log.warn("Unable to initialize LoginModule", e);
- return "Unable to initialize LoginModule: "+e.getMessage();
+ return "Unable to initialize LoginModule: " + e.getMessage();
}
} catch (Exception e) {
log.warn("Unable to load LoginModule class", e);
- return "Unable to load LoginModule class: "+e.getMessage();
+ return "Unable to load LoginModule class: " + e.getMessage();
}
}
private LoginModule loadModule(PortletRequest request, RealmData data, Map options) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
ClassLoader loader = getClass().getClassLoader();
- if(data.jar != null && !data.jar.equals("")) {
+ if (data.jar != null && !data.jar.equals("")) {
try {
Artifact one = Artifact.create(data.getJar());
ListableRepository[] repos = PortletManager.getCurrentServer(request).getRepositories();
for (int i = 0; i < repos.length; i++) {
ListableRepository repo = repos[i];
File file = repo.getLocation(one);
- if(file != null) {
+ if (file != null) {
loader = new URLClassLoader(new URL[]{file.toURL()}, loader);
break;
}
@@ -297,7 +299,7 @@
for (Iterator it = data.getOptions().keySet().iterator(); it.hasNext();) {
String key = (String) it.next();
final Object value = data.getOptions().get(key);
- if(value != null && !value.equals("")) {
+ if (value != null && !value.equals("")) {
options.put(key, value);
}
}
@@ -315,7 +317,7 @@
session.setAttribute("TestLoginPrincipals", sub.getPrincipals());
} catch (Exception e) {
log.warn("Test login failed", e);
- session.setAttribute("TestLoginError", "Login Failed: "+(e.getMessage() == null ? "no message" : e.getMessage()));
+ session.setAttribute("TestLoginError", "Login Failed: " + (e.getMessage() == null ? "no message" : e.getMessage()));
}
}
@@ -326,7 +328,7 @@
EnvironmentType environment = root.addNewEnvironment();
ArtifactType configId = environment.addNewModuleId();
configId.setGroupId("console");
- configId.setArtifactId("realm-"+data.getName());
+ configId.setArtifactId("realm-" + data.getName());
configId.setVersion("1.0");
configId.setType("car");
@@ -338,7 +340,7 @@
parent.setArtifactId("j2ee-security");
parent.setType("car");
// Dependencies
- if(data.getJar() != null) {
+ if (data.getJar() != null) {
ArtifactType artifactType = dependenciesType.addNewDependency();
Artifact artifact = Artifact.create(data.getJar());
artifactType.setGroupId(artifact.getGroupId());
@@ -355,25 +357,25 @@
realmName.setStringValue(data.getName());
ReferenceType serverInfo = realm.addNewReference();
serverInfo.setName2("ServerInfo");
- serverInfo.setName((String)PortletManager.getNameFor(request, PortletManager.getCurrentServer(request).getServerInfo()).getName().get("name"));
+ serverInfo.setName((String) PortletManager.getNameFor(request, PortletManager.getCurrentServer(request).getServerInfo()).getName().get("name"));
ReferenceType loginService = realm.addNewReference();
loginService.setName2("LoginService");
- loginService.setName((String)PortletManager.getNameFor(request, PortletManager.getCurrentServer(request).getLoginService()).getName().get("name"));
+ loginService.setName((String) PortletManager.getNameFor(request, PortletManager.getCurrentServer(request).getLoginService()).getName().get("name"));
XmlAttributeType config = realm.addNewXmlReference();
// Construct the content to put in the XmlAttributeType
GerLoginConfigDocument lcDoc = GerLoginConfigDocument.Factory.newInstance();
GerLoginConfigType login = lcDoc.addNewLoginConfig();
for (int i = 0; i < data.getModules().length; i++) {
LoginModuleDetails details = data.getModules()[i];
- if(details.getLoginDomainName() == null || details.getLoginDomainName().equals("")) {
+ if (details.getLoginDomainName() == null || details.getLoginDomainName().equals("")) {
continue;
}
GerLoginModuleType module = login.addNewLoginModule();
module.setControlFlag(details.getControlFlag().equals("OPTIONAL") ? GerControlFlagType.OPTIONAL :
details.getControlFlag().equals("REQUIRED") ? GerControlFlagType.REQUIRED :
- details.getControlFlag().equals("REQUISITE") ? GerControlFlagType.REQUISITE :
- details.getControlFlag().equals("SUFFICIENT") ? GerControlFlagType.SUFFICIENT :
- GerControlFlagType.OPTIONAL);
+ details.getControlFlag().equals("REQUISITE") ? GerControlFlagType.REQUISITE :
+ details.getControlFlag().equals("SUFFICIENT") ? GerControlFlagType.SUFFICIENT :
+ GerControlFlagType.OPTIONAL);
module.setServerSide(details.isServerSide());
module.setLoginDomainName(details.getLoginDomainName());
module.setLoginModuleClass(details.getClassName());
@@ -386,11 +388,11 @@
}
// bit of a hack -- to put the DataSource module in as a parent for SQL modules
- if(details.getClassName().indexOf("SQL") > -1) {
+ if (details.getClassName().indexOf("SQL") > -1) {
String poolName = (String) details.getOptions().get("dataSourceName");
String appName = (String) details.getOptions().get("dataSourceApplication");
- if(poolName != null) {
- if(appName == null) appName = "null";
+ if (poolName != null) {
+ if (appName == null) appName = "null";
JCAManagedConnectionFactory[] factories = PortletManager.getOutboundFactoriesOfType(request, "javax.sql.DataSource");
for (int j = 0; j < factories.length; j++) {
JCAManagedConnectionFactory factory = factories[j];
@@ -398,7 +400,7 @@
ObjectName objectName = ObjectName.getInstance(factory.getObjectName());
final String testName = objectName.getKeyProperty(NameFactory.J2EE_NAME);
final String testApp = objectName.getKeyProperty(NameFactory.J2EE_APPLICATION);
- if(testName.equals(poolName) && testApp.equals(appName)) {
+ if (testName.equals(poolName) && testApp.equals(appName)) {
String moduleName = objectName.getKeyProperty(NameFactory.JCA_RESOURCE);
ArtifactType artifactType = dependenciesType.addNewDependency();
@@ -434,7 +436,7 @@
data.name = realm.getRealmName();
List list = new ArrayList();
JaasLoginModuleChain node = realm.getLoginModuleChain();
- while(node != null) {
+ while (node != null) {
LoginModuleDetails details = new LoginModuleDetails();
details.setControlFlag(node.getControlFlag());
LoginModuleSettings module = node.getLoginModule();
@@ -445,7 +447,7 @@
details.setOptions(module.getOptions());
list.add(details);
node = node.getNext();
- if(node == null) {
+ if (node == null) {
break;
}
}
@@ -454,14 +456,14 @@
private void actionSaveRealm(PortletRequest request, RealmData data) {
normalize(data);
- if(data.getAbstractName() == null || data.getAbstractName().equals("")) { // we're creating a new realm
+ if (data.getAbstractName() == null || data.getAbstractName().equals("")) { // we're creating a new realm
try {
XmlObject plan = actionGeneratePlan(request, data);
data.name = data.name.replaceAll("\\s", "");
DeploymentManager mgr = PortletManager.getDeploymentManager(request);
- File tempFile = File.createTempFile("console-deployment",".xml");
+ File tempFile = File.createTempFile("console-deployment", ".xml");
tempFile.deleteOnExit();
- log.debug("Writing security realm deployment plan to "+tempFile.getAbsolutePath());
+ log.debug("Writing security realm deployment plan to " + tempFile.getAbsolutePath());
PrintWriter out = new PrintWriter(new FileWriter(tempFile));
savePlanToStream(plan, out);
out.flush();
@@ -469,11 +471,11 @@
Target[] targets = mgr.getTargets();
ProgressObject po = mgr.distribute(targets, null, tempFile);
waitForProgress(po);
- if(po.getDeploymentStatus().isCompleted()) {
+ if (po.getDeploymentStatus().isCompleted()) {
TargetModuleID[] ids = po.getResultTargetModuleIDs();
po = mgr.start(ids);
waitForProgress(po);
- if(po.getDeploymentStatus().isCompleted()) {
+ if (po.getDeploymentStatus().isCompleted()) {
System.out.println("Deployment completed successfully!");
}
}
@@ -485,11 +487,11 @@
// index existing modules
Map nodes = new HashMap();
JaasLoginModuleChain node = realm.getLoginModuleChain();
- while(node != null) {
+ while (node != null) {
LoginModuleSettings module = node.getLoginModule();
nodes.put(module.getLoginDomainName(), node);
node = node.getNext();
- if(node == null) {
+ if (node == null) {
break;
}
}
@@ -514,7 +516,7 @@
org.apache.geronimo.management.geronimo.SecurityRealm[] realms = PortletManager.getCurrentServer(request).getSecurityRealms();
ExistingRealm[] results = new ExistingRealm[realms.length];
for (int i = 0; i < results.length; i++) {
- final GeronimoManagedBean managedBean = (GeronimoManagedBean)realms[i];
+ final GeronimoManagedBean managedBean = (GeronimoManagedBean) realms[i];
results[i] = new ExistingRealm(realms[i].getRealmName(), PortletManager.getNameFor(request, realms[i]),
managedBean.getState());
}
@@ -534,7 +536,7 @@
private void renderConfigure(RenderRequest request, RenderResponse response, RealmData data) throws IOException, PortletException {
// Pass errors through
- if(request.getParameter("LoginModuleError") != null) {
+ if (request.getParameter("LoginModuleError") != null) {
request.setAttribute("LoginModuleError", request.getParameter("LoginModuleError"));
}
// Clear out any cached modules
@@ -543,13 +545,13 @@
MasterLoginModuleInfo info = getSelectedModule(data);
for (int i = 0; i < info.getOptions().length; i++) {
MasterLoginModuleInfo.OptionInfo option = info.getOptions()[i];
- if(!data.getOptions().containsKey(option.getName())) {
+ if (!data.getOptions().containsKey(option.getName())) {
data.getOptions().put(option.getName(), null);
}
}
data.reorderOptions(info.getOptions());
request.setAttribute("optionMap", info.getOptionMap());
- if(info.getName().indexOf("SQL") > -1) {
+ if (info.getName().indexOf("SQL") > -1) {
loadDriverJARList(request);
loadDatabasePoolList(request);
}
@@ -570,9 +572,9 @@
private void renderTestResults(RenderRequest request, RenderResponse response) throws IOException, PortletException {
PortletSession session = request.getPortletSession();
String status = (String) session.getAttribute("TestLoginError");
- if(status == null) {
+ if (status == null) {
Set principals = (Set) session.getAttribute("TestLoginPrincipals");
- status = "Login succeeded with "+(principals == null ? 0 : principals.size())+" principals";
+ status = "Login succeeded with " + (principals == null ? 0 : principals.size()) + " principals";
request.setAttribute("principals", principals);
}
request.setAttribute("LoginResults", status);
@@ -593,7 +595,7 @@
MasterLoginModuleInfo[] all = MasterLoginModuleInfo.getAllModules();
for (int i = 0; i < all.length; i++) {
MasterLoginModuleInfo info = all[i];
- if(info.getName().equals(data.getRealmType())) {
+ if (info.getName().equals(data.getRealmType())) {
return info;
}
}
@@ -610,8 +612,8 @@
final String name = objectName.getKeyProperty(NameFactory.J2EE_NAME);
String display = name;
final String appName = objectName.getKeyProperty(NameFactory.J2EE_APPLICATION);
- if(appName != null && !appName.equals("null")) {
- display = display+" ("+appName+")";
+ if (appName != null && !appName.equals("null")) {
+ display = display + " (" + appName + ")";
}
pools.add(new DatabasePool(name, display, appName, PortletManager.getNameFor(renderRequest, factory)));
}
@@ -636,7 +638,7 @@
// todo should only test groupId and should check for long (org.apache.geronimo) and short form
for (int k = 0; k < SKIP_ENTRIES_WITH.length; k++) {
String skip = SKIP_ENTRIES_WITH[k];
- if(test.indexOf(skip) > -1) {
+ if (test.indexOf(skip) > -1) {
continue outer;
}
}
@@ -667,7 +669,7 @@
}
private static void waitForProgress(ProgressObject po) {
- while(po.getDeploymentStatus().isRunning()) {
+ while (po.getDeploymentStatus().isRunning()) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
@@ -678,7 +680,7 @@
public static void normalize(RealmData data) {
List list = new ArrayList();
- if(data.modules == null) {
+ if (data.modules == null) {
LoginModuleDetails module = new LoginModuleDetails();
module.setClassName(getSelectedModule(data).getClassName());
module.setControlFlag("REQUIRED");
@@ -687,32 +689,32 @@
Properties props = module.getOptions();
for (Iterator it = data.getOptions().entrySet().iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry) it.next();
- props.setProperty((String)entry.getKey(), (String) entry.getValue());
+ props.setProperty((String) entry.getKey(), (String) entry.getValue());
}
list.add(module);
- if(data.isStorePassword()) {
+ if (data.isStorePassword()) {
module = new LoginModuleDetails();
module.setClassName(GeronimoPasswordCredentialLoginModule.class.getName());
module.setControlFlag("OPTIONAL");
- module.setLoginDomainName(data.getName()+"-Password");
+ module.setLoginDomainName(data.getName() + "-Password");
module.setServerSide(true);
list.add(module);
}
- if(data.getAuditPath() != null) {
+ if (data.getAuditPath() != null) {
module = new LoginModuleDetails();
module.setClassName(FileAuditLoginModule.class.getName());
module.setControlFlag("OPTIONAL");
- module.setLoginDomainName(data.getName()+"-Audit");
+ module.setLoginDomainName(data.getName() + "-Audit");
module.setServerSide(true);
props = module.getOptions();
props.setProperty("file", data.getAuditPath());
list.add(module);
}
- if(data.isLockoutEnabled()) {
+ if (data.isLockoutEnabled()) {
module = new LoginModuleDetails();
module.setClassName(RepeatedFailureLockoutLoginModule.class.getName());
module.setControlFlag("REQUISITE");
- module.setLoginDomainName(data.getName()+"-Lockout");
+ module.setLoginDomainName(data.getName() + "-Lockout");
module.setServerSide(true);
props = module.getOptions();
props.setProperty("failureCount", data.getLockoutCount());
@@ -723,8 +725,8 @@
} else {
list.addAll(Arrays.asList(data.modules));
}
- if(data.getAbstractName() == null) {
- for(int i=list.size(); i<5; i++) {
+ if (data.getAbstractName() == null) {
+ for (int i = list.size(); i < 5; i++) {
LoginModuleDetails module = new LoginModuleDetails();
list.add(module);
}
@@ -747,42 +749,39 @@
public void load(PortletRequest request) {
name = request.getParameter("name");
- if(name != null && name.equals("")) name = null;
+ if (name != null && name.equals("")) name = null;
realmType = request.getParameter("realmType");
- if(realmType != null && realmType.equals("")) realmType = null;
+ if (realmType != null && realmType.equals("")) realmType = null;
jar = request.getParameter("jar");
- if(jar != null && jar.equals("")) jar = null;
+ if (jar != null && jar.equals("")) jar = null;
auditPath = request.getParameter("auditPath");
- if(auditPath != null && auditPath.equals("")) auditPath = null;
+ if (auditPath != null && auditPath.equals("")) auditPath = null;
lockoutCount = request.getParameter("lockoutCount");
- if(lockoutCount != null && lockoutCount.equals("")) lockoutCount = null;
+ if (lockoutCount != null && lockoutCount.equals("")) lockoutCount = null;
lockoutWindow = request.getParameter("lockoutWindow");
- if(lockoutWindow != null && lockoutWindow.equals("")) lockoutWindow = null;
+ if (lockoutWindow != null && lockoutWindow.equals("")) lockoutWindow = null;
lockoutDuration = request.getParameter("lockoutDuration");
- if(lockoutDuration != null && lockoutDuration.equals("")) lockoutDuration = null;
+ if (lockoutDuration != null && lockoutDuration.equals("")) lockoutDuration = null;
abstractName = request.getParameter("objectName");
- if(abstractName != null && abstractName.equals("")) abstractName = null;
+ if (abstractName != null && abstractName.equals("")) abstractName = null;
String test = request.getParameter("storePassword");
storePassword = test != null && !test.equals("") && !test.equals("false");
Map map = request.getParameterMap();
for (Iterator it = map.keySet().iterator(); it.hasNext();) {
String key = (String) it.next();
- if(key.startsWith("option-")) {
- if(key.equals("option-databasePoolObjectName")) { // special handling for a data source, where there's one select corresponding to two properties
+ if (key.startsWith("option-")) {
+ if (key.equals("option-databasePoolAbstractName"))
+ { // special handling for a data source, where there's one select corresponding to two properties
String nameString = request.getParameter(key);
- if(nameString != null && !nameString.equals("")) {
- try {
- ObjectName on = ObjectName.getInstance(nameString);
- options.put("dataSourceName", on.getKeyProperty(NameFactory.J2EE_NAME));
- options.put("dataSourceApplication", on.getKeyProperty(NameFactory.J2EE_APPLICATION));
- } catch (MalformedObjectNameException e) {
- log.error("Unable to parse ObjectName", e);
- }
+ if (nameString != null && !nameString.equals("")) {
+ AbstractName an = new AbstractName(URI.create(nameString));
+ options.put("dataSourceName", an.getNameProperty(NameFactory.J2EE_NAME));
+ options.put("dataSourceApplication", an.getNameProperty(NameFactory.J2EE_APPLICATION));
}
} else {
final String optionName = key.substring(7);
final String value = request.getParameter(key);
- if(value != null && !value.equals("")) {
+ if (value != null && !value.equals("")) {
options.put(optionName, value);
}
}
@@ -790,57 +789,57 @@
}
int count = 0;
List list = new ArrayList();
- while(true) {
+ while (true) {
int index = count;
++count;
- String name = request.getParameter("module-domain-"+index);
- if(name == null || name.equals("")) break;
+ String name = request.getParameter("module-domain-" + index);
+ if (name == null || name.equals("")) break;
LoginModuleDetails details = new LoginModuleDetails();
details.setLoginDomainName(name);
- String cls = request.getParameter("module-class-"+index);
- if(cls == null || cls.equals("")) continue;
+ String cls = request.getParameter("module-class-" + index);
+ if (cls == null || cls.equals("")) continue;
details.setClassName(cls);
- String flag = request.getParameter("module-control-"+index);
- if(flag == null || flag.equals("")) continue;
+ String flag = request.getParameter("module-control-" + index);
+ if (flag == null || flag.equals("")) continue;
details.setControlFlag(flag);
- String wrap = request.getParameter("module-wrap-"+index);
- if(wrap == null || wrap.equals("")) continue;
+ String wrap = request.getParameter("module-wrap-" + index);
+ if (wrap == null || wrap.equals("")) continue;
details.setWrapPrincipals(Boolean.valueOf(wrap).booleanValue());
- String server = request.getParameter("module-server-"+index);
- if(server == null || server.equals("")) continue;
+ String server = request.getParameter("module-server-" + index);
+ if (server == null || server.equals("")) continue;
details.setServerSide(Boolean.valueOf(server).booleanValue());
- String options = request.getParameter("module-options-"+index);
- if(options != null && !options.equals("")) {
+ String options = request.getParameter("module-options-" + index);
+ if (options != null && !options.equals("")) {
BufferedReader in = new BufferedReader(new StringReader(options));
String line;
try {
- while((line = in.readLine()) != null) {
- if(line.startsWith("#") || line.equals("")) {
+ while ((line = in.readLine()) != null) {
+ if (line.startsWith("#") || line.equals("")) {
continue;
}
int pos = line.indexOf('=');
- if(pos > -1) {
- details.getOptions().setProperty(line.substring(0, pos), line.substring(pos+1));
+ if (pos > -1) {
+ details.getOptions().setProperty(line.substring(0, pos), line.substring(pos + 1));
}
}
} catch (IOException e) {
- log.error("Unable to read properties '"+options+"'", e);
+ log.error("Unable to read properties '" + options + "'", e);
}
}
list.add(details);
}
- if(list.size() > 0) {
+ if (list.size() > 0) {
modules = (LoginModuleDetails[]) list.toArray(new LoginModuleDetails[list.size()]);
}
}
public void reorderOptions(MasterLoginModuleInfo.OptionInfo[] info) {
- if(info == null || info.length == 0) {
+ if (info == null || info.length == 0) {
return; // Probably SQL or something that handles this manually
}
Map map = new LinkedHashMap();
- for(int i=0; i<info.length;i++) {
- if(options.containsKey(info[i].getName())) {
+ for (int i = 0; i < info.length; i++) {
+ if (options.containsKey(info[i].getName())) {
map.put(info[i].getName(), options.get(info[i].getName()));
}
}
@@ -848,31 +847,35 @@
}
public void store(ActionResponse response) {
- if(name != null) response.setRenderParameter("name", name);
- if(realmType != null) response.setRenderParameter("realmType", realmType);
- if(jar != null) response.setRenderParameter("jar", jar);
- if(auditPath != null) response.setRenderParameter("auditPath", auditPath);
- if(lockoutCount != null) response.setRenderParameter("lockoutCount", lockoutCount);
- if(lockoutWindow != null) response.setRenderParameter("lockoutWindow", lockoutWindow);
- if(lockoutDuration != null) response.setRenderParameter("lockoutDuration", lockoutDuration);
- if(abstractName != null) response.setRenderParameter("objectName", abstractName);
- if(storePassword) response.setRenderParameter("storePassword", "true");
+ if (name != null) response.setRenderParameter("name", name);
+ if (realmType != null) response.setRenderParameter("realmType", realmType);
+ if (jar != null) response.setRenderParameter("jar", jar);
+ if (auditPath != null) response.setRenderParameter("auditPath", auditPath);
+ if (lockoutCount != null) response.setRenderParameter("lockoutCount", lockoutCount);
+ if (lockoutWindow != null) response.setRenderParameter("lockoutWindow", lockoutWindow);
+ if (lockoutDuration != null) response.setRenderParameter("lockoutDuration", lockoutDuration);
+ if (abstractName != null) response.setRenderParameter("abstractName", abstractName);
+ if (storePassword) response.setRenderParameter("storePassword", "true");
for (Iterator it = options.keySet().iterator(); it.hasNext();) {
String name = (String) it.next();
String value = (String) options.get(name);
- if(value != null) {
- response.setRenderParameter("option-"+name, value);
+ if (value != null) {
+ response.setRenderParameter("option-" + name, value);
}
}
- if(modules != null) {
+ if (modules != null) {
for (int i = 0; i < modules.length; i++) {
LoginModuleDetails module = modules[i];
- if(module.getLoginDomainName() != null) response.setRenderParameter("module-domain-"+i, module.getLoginDomainName());
- if(module.getClassName() != null) response.setRenderParameter("module-class-"+i, module.getClassName());
- if(module.getControlFlag() != null) response.setRenderParameter("module-control-"+i, module.getControlFlag());
- response.setRenderParameter("module-wrap-"+i, Boolean.toString(module.isWrapPrincipals()));
- response.setRenderParameter("module-server-"+i, Boolean.toString(module.isServerSide()));
- if(module.getOptions().size() > 0) response.setRenderParameter("module-options-"+i, module.getOptionString());
+ if (module.getLoginDomainName() != null)
+ response.setRenderParameter("module-domain-" + i, module.getLoginDomainName());
+ if (module.getClassName() != null)
+ response.setRenderParameter("module-class-" + i, module.getClassName());
+ if (module.getControlFlag() != null)
+ response.setRenderParameter("module-control-" + i, module.getControlFlag());
+ response.setRenderParameter("module-wrap-" + i, Boolean.toString(module.isWrapPrincipals()));
+ response.setRenderParameter("module-server-" + i, Boolean.toString(module.isServerSide()));
+ if (module.getOptions().size() > 0)
+ response.setRenderParameter("module-options-" + i, module.getOptionString());
}
}
}
@@ -921,13 +924,6 @@
return lockoutCount != null || lockoutWindow != null || lockoutDuration != null;
}
- /**
- * @deprecated Use getAbstractName() instead
- */
- public String getObjectName() {
- return abstractName;
- }
-
public String getAbstractName() {
return abstractName;
}
@@ -1013,11 +1009,11 @@
private final String parentName;
private final int state;
- public ExistingRealm(String name, AbstractName objectName, int state) {
+ public ExistingRealm(String name, AbstractName abstractName, int state) {
this.name = name;
- this.abstractName = objectName.toString();
- String parent = (String) objectName.getName().get(NameFactory.J2EE_APPLICATION);
- if(parent != null && parent.equals("null")) {
+ this.abstractName = abstractName.toString();
+ String parent = (String) abstractName.getName().get(NameFactory.J2EE_APPLICATION);
+ if (parent != null && parent.equals("null")) {
parent = null;
}
parentName = parent;
@@ -1029,13 +1025,6 @@
return name;
}
- /**
- * @deprecated Use getAbstractName() instead
- */
- public String getObjectName() {
- return abstractName;
- }
-
public String getAbstractName() {
return abstractName;
}
@@ -1074,14 +1063,7 @@
return applicationName;
}
- /**
- * @deprecated Use getAbstractName() instead
- */
- public String getObjectName() {
- return abstractName;
- }
-
- public String getAbstrcatName() {
+ public String getAbstractName() {
return abstractName;
}
@@ -1090,20 +1072,20 @@
}
public int compareTo(Object o) {
- final DatabasePool pool = (DatabasePool)o;
+ final DatabasePool pool = (DatabasePool) o;
int names = name.compareTo(pool.name);
- if(applicationName == null) {
- if(pool.applicationName == null) {
+ if (applicationName == null) {
+ if (pool.applicationName == null) {
return names;
} else {
return -1;
}
} else {
- if(pool.applicationName == null) {
+ if (pool.applicationName == null) {
return 1;
} else {
int test = applicationName.compareTo(pool.applicationName);
- if(test != 0) {
+ if (test != 0) {
return test;
} else {
return names;
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp Wed Jul 12 12:03:41 2006
@@ -40,10 +40,10 @@
<tr>
<th><div align="right">Database Pool</div></th>
<td>
- <select name="option-databasePoolObjectName">
+ <select name="option-databasePoolAbstractName">
<option />
<c:forEach var="pool" items="${pools}">
- <option value="${pool.objectName}"<c:if test="${realm.options['dataSourceName'] eq pool.name && realm.options['dataSourceApplication'] eq pool.applicationName}"> selected</c:if>>${pool.displayName}</option>
+ <option value="${pool.abstractName}"<c:if test="${realm.options['dataSourceName'] eq pool.name && realm.options['dataSourceApplication'] eq pool.applicationName}"> selected</c:if>>${pool.displayName}</option>
</c:forEach>
</select>
</td>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp Wed Jul 12 12:03:41 2006
@@ -16,7 +16,7 @@
<c:forEach var="option" items="${realm.options}">
<input type="hidden" name="option-${option.key}" value="${option.value}" />
</c:forEach>
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
<input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
<input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp Wed Jul 12 12:03:41 2006
@@ -20,7 +20,7 @@
<input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
<input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
<input type="hidden" name="storePassword" value="${realm.storePassword}" />
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
<input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
<input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp Wed Jul 12 12:03:41 2006
@@ -10,7 +10,7 @@
underlying security information stores, or to add functionality such as auditing
to a realm without affecting the authentication process for the realm.</p>
-<c:if test="${empty realm.objectName}">
+<c:if test="${empty realm.abstractName}">
<p>If you don't need to use as many login modules as there are entries below,
just leave the extra ones blank.</p>
</c:if>
@@ -29,15 +29,15 @@
<input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
<input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
<input type="hidden" name="storePassword" value="${realm.storePassword}" />
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<table border="0">
<!-- ENTRY FIELD: NAME -->
<tr>
<th style="min-width: 140px"><div align="right">Realm Name:</div></th>
<td>
- <c:choose> <%-- Can't change the realm name after deployment because it's wired into all the ObjectNames --%>
- <c:when test="${empty realm.objectName}">
+ <c:choose> <%-- Can't change the realm name after deployment because it's wired into all the abstractNames --%>
+ <c:when test="${empty realm.abstractName}">
<input name="name" type="text" size="30" value="${realm.name}">
</c:when>
<c:otherwise>
@@ -61,7 +61,7 @@
<th><div align="right">Login Domain Name:</div></th>
<td>
<c:choose> <%-- Can't change the login domain name after deployment because it's how we know which GBean is which --%>
- <c:when test="${empty realm.objectName}">
+ <c:when test="${empty realm.abstractName}">
<input name="module-domain-${status.index}" type="text" size="20" value="${module.loginDomainName}" />
</c:when>
<c:otherwise>
@@ -151,7 +151,7 @@
<tr>
<td></td>
<td>
- <input type="button" value="<c:choose><c:when test="${empty realm.objectName}">Deploy</c:when><c:otherwise>Save</c:otherwise></c:choose>"
+ <input type="button" value="<c:choose><c:when test="${empty realm.abstractName}">Deploy</c:when><c:otherwise>Save</c:otherwise></c:choose>"
onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
<input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
</td>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp Wed Jul 12 12:03:41 2006
@@ -54,12 +54,12 @@
</c:choose>--%>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="editExisting" />
- <portlet:param name="objectName" value="${realm.objectName}" />
+ <portlet:param name="abstractName" value="${realm.abstractName}" />
</portlet:actionURL>">edit</a>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="usage" />
<portlet:param name="name" value="${realm.name}" />
- <portlet:param name="objectName" value="${realm.objectName}" />
+ <portlet:param name="abstractName" value="${realm.abstractName}" />
</portlet:actionURL>">usage</a>
<%--<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="delete" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp Wed Jul 12 12:03:41 2006
@@ -16,7 +16,7 @@
<input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
<input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
<input type="hidden" name="storePassword" value="${realm.storePassword}" />
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
<input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
<input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Wed Jul 12 12:03:41 2006
@@ -18,7 +18,7 @@
<input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
<input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
<input type="hidden" name="storePassword" value="${realm.storePassword}" />
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
<input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
<input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
@@ -59,7 +59,7 @@
<tr>
<td></td>
<td>
-<input type="submit" value="<c:choose><c:when test="${empty realm.objectName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>" />
+<input type="submit" value="<c:choose><c:when test="${empty realm.abstractName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>" />
<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
</td>
</tr>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp Wed Jul 12 12:03:41 2006
@@ -23,7 +23,7 @@
<input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
<input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
<input type="hidden" name="storePassword" value="${realm.storePassword}" />
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
<input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
<input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp?rev=421371&r1=421370&r2=421371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp Wed Jul 12 12:03:41 2006
@@ -19,7 +19,7 @@
<input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
<input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
<input type="hidden" name="storePassword" value="${realm.storePassword}" />
- <input type="hidden" name="objectName" value="${realm.objectName}" />
+ <input type="hidden" name="abstractName" value="${realm.abstractName}" />
<input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
<input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
<input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
@@ -76,7 +76,7 @@
<input type="submit" value="Test Again" />
<input type="button" value="Edit Realm" onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
<input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
- <input type="button" value="<c:choose><c:when test="${empty realm.objectName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>"
+ <input type="button" value="<c:choose><c:when test="${empty realm.abstractName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>"
onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
</td>
</tr>