Author: ammulder
Date: Sat Nov 5 15:30:46 2005
New Revision: 331046
URL: http://svn.apache.org/viewcvs?rev=331046&view=rev
Log:
Try to remove global JNDI names from DB/JMS portlets
GERONIMO-1042 GERONIMO-1065
Modified:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/AbstractConnectionFactoryManagerPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyInfo.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLConnectorRenderer.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLInfo.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLConnectorRenderer.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLInfo.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/AbstractConnectionFactoryManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/AbstractConnectionFactoryManagerPortlet.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/AbstractConnectionFactoryManagerPortlet.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/AbstractConnectionFactoryManagerPortlet.java
Sat Nov 5 15:30:46 2005
@@ -101,7 +101,6 @@
actionResponse.setRenderParameter("mode", mode);
if (SUBMIT_CREATE.equals(submit)) {
String dsName = actionRequest.getParameter("dsName");
- String jndiName = actionRequest.getParameter("jndiName");
String dependency = actionRequest.getParameter("dependency");
String driverClass = actionRequest.getParameter("driverClass");
String jdbcUrl = actionRequest.getParameter("jdbcUrl");
@@ -117,7 +116,7 @@
trimStr(dependency), trimStr(dsName), trimStr(dbUser),
dbPassword, trimStr(driverClass), trimStr(jdbcUrl),
trimStr(poolMaxSize), trimStr(poolInitSize),
- trimStr(jndiName), trimStr(dbProperties) };
+ trimStr(dbProperties) };
helper.deployPlan(args);
// Set mode to list after creating the new datasource
actionResponse.setRenderParameter("mode", "list");
@@ -210,8 +209,6 @@
info.setObjectName(gbeanName);
info.setName(gbeanName.getKeyProperty("name"));
try {
- info.setJndiName((String) kernel.getAttribute(gbeanName,
- "globalJNDIName"));
info.setState(new Integer(kernel.getGBeanState(gbeanName)));
//check if user asked this connection to be tested
if ((gbeanName.toString().equals(name)) && (check)) {
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
Sat Nov 5 15:30:46 2005
@@ -24,8 +24,6 @@
private String name;
- private String jndiName;
-
private Integer state;
private boolean working;
@@ -46,26 +44,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public void setJndiName(String jndiName) {
- if (jndiName != null && !jndiName.startsWith("ger:")) {
- StringBuffer buf = new StringBuffer(jndiName.length() + 4);
- buf.append("ger:");
- if (jndiName.charAt(0) != '/') {
- ;
- }
- {
- buf.append('/');
- }
- buf.append(jndiName);
- jndiName = buf.toString();
- }
- this.jndiName = jndiName;
}
public Integer getState() {
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java
Sat Nov 5 15:30:46 2005
@@ -136,7 +136,6 @@
sb.append(" <match-one/>\n");
sb.append(" </single-pool>\n");
sb.append(" </connectionmanager>\n");
- sb.append(" <global-jndi-name>{10}</global-jndi-name>\n");
sb.append(" </connectiondefinition-instance>\n");
sb.append(" </connection-definition>\n");
sb.append(" </outbound-resourceadapter>\n");
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java
Sat Nov 5 15:30:46 2005
@@ -96,8 +96,6 @@
"CreateDatabase")).toString());
info.setLoginTimeout((Integer) kernel.getAttribute(gbeanName,
"LoginTimeout"));
- info.setJndiName((String) kernel.getAttribute(gbeanName,
- "globalJNDIName"));
} catch (Exception e) {
throw new PortletException(e);
}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyInfo.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyInfo.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyInfo.java
Sat Nov 5 15:30:46 2005
@@ -22,8 +22,6 @@
private String name;
- private String jndiName;
-
private String databaseName;
private String userName;
@@ -46,14 +44,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public void setJndiName(String jndiName) {
- this.jndiName = jndiName;
}
public String getUserName() {
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLConnectorRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLConnectorRenderer.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLConnectorRenderer.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLConnectorRenderer.java
Sat Nov 5 15:30:46 2005
@@ -92,8 +92,6 @@
.toString());
info.setDatabaseName((String) kernel.getAttribute(gbeanName,
"DatabaseName"));
- info.setGlobalJNDIName((String) kernel.getAttribute(gbeanName,
- "globalJNDIName"));
} catch (Exception e) {
throw new PortletException(e);
}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLInfo.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLInfo.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLInfo.java
Sat Nov 5 15:30:46 2005
@@ -29,8 +29,6 @@
private String databaseName;
- private String globalJNDIName;
-
// Not used
private String objectName;
@@ -85,21 +83,6 @@
*/
public void setDatabaseName(String databaseName) {
this.databaseName = databaseName;
- }
-
- /**
- * @return Returns the globalJNDIName.
- */
- public String getGlobalJNDIName() {
- return globalJNDIName;
- }
-
- /**
- * @param globalJNDIName
- * The globalJNDIName to set.
- */
- public void setGlobalJNDIName(String globalJNDIName) {
- this.globalJNDIName = globalJNDIName;
}
/**
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLConnectorRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLConnectorRenderer.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLConnectorRenderer.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLConnectorRenderer.java
Sat Nov 5 15:30:46 2005
@@ -90,8 +90,6 @@
.getAttribute(gbeanName, "UserName"));
info.setExceptionSorterClass((String) kernel.getAttribute(
gbeanName, "ExceptionSorterClass"));
- info.setjndiName((String) kernel.getAttribute(gbeanName,
- "globalJNDIName"));
} catch (Exception e) {
throw new PortletException(e);
}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLInfo.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLInfo.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLInfo.java
Sat Nov 5 15:30:46 2005
@@ -22,8 +22,6 @@
private String name;
- private String jndiName;
-
private String userName;
private String driver;
@@ -46,14 +44,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public String getjndiName() {
- return jndiName;
- }
-
- public void setjndiName(String jndiName) {
- this.jndiName = jndiName;
}
public String getDriver() {
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
Sat Nov 5 15:30:46 2005
@@ -116,7 +116,6 @@
actionResponse.setRenderParameter("mode", mode);
if (SUBMIT_CREATE.equals(submit)) {
String acfName = actionRequest.getParameter("acfName");
- String jndiName = actionRequest.getParameter("jndiName");
String serverURL = actionRequest.getParameter("serverURL");
String userName = actionRequest.getParameter("userName");
String pword = actionRequest.getParameter("pword");
@@ -126,8 +125,7 @@
String[] args = { trimStr(acfName), trimStr(PARENT_ID),
trimStr(acfName), trimStr(serverURL),
trimStr(userName), pword, trimStr(acfName),
- trimStr(poolMaxSize), trimStr(blocking),
- trimStr(jndiName) };
+ trimStr(poolMaxSize), trimStr(blocking) };
helper.deployPlan(args);
// Set mode to list after creating the new ConnectionFactories
actionResponse.setRenderParameter("mode", "list");
@@ -200,8 +198,6 @@
info.setObjectName(gbeanName);
info.setName(gbeanName.getKeyProperty("name"));
try {
- info.setJndiName((String) kernel.getAttribute(gbeanName,
- "globalJNDIName"));
info.setState(new Integer(kernel.getGBeanState(gbeanName)));
//check if user asked this connection to be tested
if ((gbeanName.toString().equals(name)) && (check)) {
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
Sat Nov 5 15:30:46 2005
@@ -143,7 +143,6 @@
sb.append(" <match-one/>\n");
sb.append(" </single-pool>\n");
sb.append(" </connectionmanager>\n");
- sb.append(" <global-jndi-name>{9}</global-jndi-name>\n");
sb
.append(" <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>\n");
sb.append(" </connectiondefinition-instance>\n");
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp
Sat Nov 5 15:30:46 2005
@@ -32,16 +32,6 @@
<td> <p>Name of this JDBC data source.</td>
</tr>
<tr>
- <td><div align="right"> JNDI Name: </div></td>
- <td> <p>
- <input name="jndiName" type="text" size="50">
- </td>
- </tr>
- <tr>
- <td><div align="right"></div></td>
- <td> <p> JNDI path to bind this JDBC data source.</td>
- </tr>
- <tr>
<td> <div align="right">Dependency: </div></td>
<td>
<select name="dependency">
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp
Sat Nov 5 15:30:46 2005
@@ -21,13 +21,13 @@
<input type="hidden" name="mode" value="detail" />
<br>
-<strong>Connection Name:</strong> ${ds.jndiName}
+<strong>Connection Name:</strong> ${ds.name}
<br><br>
<table width="100%">
<tr><td><strong>UserName</strong></td><td><input
type="text" name="UserName" value="${ds.userName}" size="75" /></td></tr>
<tr><td><strong>Password</strong></td><td><input
type="password" name="password1" size="75" /></td></tr>
<tr><td><strong>Repeat Password</strong></td><td><input
type="password" name="password2" size="75" /></td></tr>
-<c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+<c:if test="${badPassword}"><tr><td colspan="2">Passwords did not match</td></tr></c:if>
<tr><td> </td><td> </td></tr>
<tr><td><strong>Database Name</strong></td><td><input
type="text" name="DatabaseName" value="${ds.databaseName}" size="75" /></td></tr>
<tr><td><strong>Create Database</strong></td><td><input
type="text" name="CreateDatabase" value="${ds.createDatabase}" size="75" /></td></tr>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp
Sat Nov 5 15:30:46 2005
@@ -12,10 +12,6 @@
<td class="LightBackground" style="padding: 10px 5px 10px 10px">The name of the
database.</td>
</tr>
<tr>
- <td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right"
valign="top"><strong> Global JNDI Name</strong></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px"><p>The global
JNDI name is assigned by the site administrator. It is used when trying to connect to the
resource (database or queue/topic) from an application client. It should not be used from
other server-side components. It should be unique for every resource deployed in Geronimo.
Currently users of Geronimo are not provided a mechanism for entering a value in this field.</p>
</td>
- </tr>
- <tr>
<td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right"
valign="top"><strong>State</strong></td>
<td class="LightBackground" style="padding: 10px 5px 10px 10px">State of the database,
either "running" or "stopped."</td>
</tr>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp
Sat Nov 5 15:30:46 2005
@@ -27,11 +27,10 @@
<tr><td><strong>UserName</strong></td><td><input
type="text" name="user" value="${ds.user}" size="75" /></td></tr>
<tr><td><strong>Password</strong></td><td><input
type="password" name="password1" size="75" /></td></tr>
<tr><td><strong>Repeat Password</strong></td><td><input
type="password" name="password2" size="75" /></td></tr>
- <c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+ <c:if test="${badPassword}"><tr><td colspan="2">Passwords did not match</td></tr></c:if>
<tr><td><strong>Server Name</strong></td><td><input
type="text" name="serverName" value="${ds.serverName}" size="75" /></td></tr>
<tr><td><strong>Port no.</strong></td><td><input
type="text" name="portNumber" value="${ds.portNumber}" size="75" /></td></tr>
<tr><td><strong>DB Name</strong></td><td><input
type="text" name="ConnectionURL" value="${ds.databaseName}" size="75" /></td></tr>
- <!-- <tr><td><strong>Global JNDI Name</strong></td><td><input
type="text" name="globalJNDIName" value="${ds.globalJNDIName}" size="75" /></td></tr>
-->
<tr><td colspan="2">
<input type="submit" name="btnSave" value="Save" onClick="doSave();"/>
<input type="submit" name="btnCancel" value="Cancel" onClick="doCancel();">
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp
Sat Nov 5 15:30:46 2005
@@ -11,7 +11,6 @@
<tr><td><strong>Server Name</strong></td><td>${ds.serverName}</td></tr>
<tr><td><strong>Port no.</strong></td><td>${ds.portNumber}</td></tr>
<tr><td><strong>DB Name</strong></td><td>${ds.databaseName}</td></tr>
- <tr><td><strong>Global JNDI Name</strong></td><td>${ds.globalJNDIName}</td></tr>
<tr><td colspan="2" align="center">
<a href='<portlet:renderURL><portlet:param name="name" value="${ds.objectName}"/><portlet:param
name="mode" value="config"/></portlet:renderURL>'>change</a>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp
Sat Nov 5 15:30:46 2005
@@ -5,14 +5,12 @@
<tr>
<th> </th>
<th align="left">Name</th>
- <th align="left">Global JNDI Name</th>
<th align="left">State</th>
<th align="left">Test Result</th>
</tr>
<c:forEach var="info" items="${dataSources}"><tr>
<td><a href='<portlet:renderURL><portlet:param name="name" value="${info.objectName}"/><portlet:param
name="mode" value="detail"/></portlet:renderURL>'>detail</a></td>
<td>${info.name}</td>
- <td>${info.jndiName}</td>
<td><c:choose>
<c:when test='${info.state == 0}'>Starting</c:when>
<c:when test='${info.state == 1}'>Running</c:when>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp
Sat Nov 5 15:30:46 2005
@@ -21,13 +21,13 @@
<input type="hidden" name="mode" value="detail" />
<br>
-<strong>Connection Name:</strong> ${ds.jndiName}
+<strong>Connection Name:</strong> ${ds.name}
<br><br>
<table width="100%">
<tr><td><strong>UserName</strong></td><td><input
type="text" name="UserName" value="${ds.userName}" size="75" /></td></tr>
<tr><td><strong>Password</strong></td><td><input
type="password" name="password1" size="75" /></td></tr>
<tr><td><strong>Repeat Password</strong></td><td><input
type="password" name="password2" size="75" /></td></tr>
-<c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+<c:if test="${badPassword}"><tr><td colspan="2">Passwords did not match</td></tr></c:if>
<tr><td><strong>Driver</strong></td><td><input
type="text" name="Driver" value="${ds.driver}" size="75" /></td></tr>
<tr><td><strong>ConnectionURL</strong></td><td><input
type="text" name="ConnectionURL" value="${ds.connectionURL}" size="75" /></td></tr>
<tr><td><strong>ExceptionSorterClass</strong></td><td><input
type="text" name="ExceptionSorterClass" value="${ds.exceptionSorterClass}" size="75" /></td></tr>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp
Sat Nov 5 15:30:46 2005
@@ -32,16 +32,6 @@
<td> <p>Name of this ActiveMQ Connection Factory.</td>
</tr>
<tr>
- <td><div align="right"> JNDI Name: </div></td>
- <td> <p>
- <input name="jndiName" type="text" size="50">
- </td>
- </tr>
- <tr>
- <td><div align="right"></div></td>
- <td> <p> JNDI path to bind this ActiveMQ Connection Factory.</td>
- </tr>
- <tr>
<td> <div align="right">Server URL: </div></td>
<td><input name="serverURL" type="text" size="50"></td>
</tr>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp
Sat Nov 5 15:30:46 2005
@@ -21,13 +21,13 @@
<input type="hidden" name="mode" value="detail" />
<br>
-<strong>Connection Name:</strong> ${ds.jndiName}
+<strong>Connection Name:</strong> ${ds.name}
<br><br>
<table width="100%">
<tr><td><strong>UserName</strong></td><td><input
type="text" name="UserName" value="${ds.userName}" size="75" /></td></tr>
<tr><td><strong>Password</strong></td><td><input
type="password" name="password1" size="75" /></td></tr>
<tr><td><strong>Repeat Password</strong></td><td><input
type="password" name="password2" size="75" /></td></tr>
-<c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+<c:if test="${badPassword}"><tr><td colspan="2">Passwords did not match</td></tr></c:if>
<tr><td><strong>ServerUrl</strong></td><td><input
type="text" name="ServerUrl" value="${ds.serverUrl}" size="75" /></td></tr>
<!--<tr><td><strong>Clientid</strong></td><td><input
type="text" name="Clientid" value="${ds.clientid}" size="75" /></td></tr>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp
Sat Nov 5 15:30:46 2005
@@ -12,10 +12,6 @@
<td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Name
of the connection factory.</td>
</tr>
<tr>
- <td width="150" align="right" valign="top" class="MediumBackground" style="padding:
10px 10px 5px 10px"><strong>Global JNDI Name</strong></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Physical
name of the connection factory.</td>
- </tr>
- <tr>
<td width="150" align="right" valign="top" class="MediumBackground" style="padding:
10px 10px 5px 10px"><strong>State</strong></td>
<td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The
state of the connection, either "Running" or "Stopped."</td>
</tr>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp
Sat Nov 5 15:30:46 2005
@@ -5,7 +5,6 @@
<tr>
<th> </th>
<th align="left">Name</th>
- <th align="left">Global JNDI Name</th>
<th align="left">State</th>
<th align="left">Test Result</th>
</tr>
@@ -16,7 +15,6 @@
</portlet:renderURL>'>detail</a>
</td>
<td>${info.name}</td>
- <td>${info.jndiName}</td>
<td><c:choose>
<c:when test='${info.state == 0}'>Starting</c:when>
<c:when test='${info.state == 1}'>Running</c:when>
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp?rev=331046&r1=331045&r2=331046&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp
Sat Nov 5 15:30:46 2005
@@ -12,10 +12,6 @@
<td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Name
of the Connection Factory.</td>
</tr>
<tr>
- <td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right"
valign="top"><strong>Global JNDI Name</strong></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Physical
name of the connection factory.</td>
- </tr>
- <tr>
<td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right"
valign="top"><strong>State</strong></td>
<td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The
state of the connection, either "Running" or
"Stopped."</td>
|