You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/05/04 07:53:53 UTC
svn commit: r399561 - in /geronimo/branches/1.1:
applications/console-standard/src/java/org/apache/geronimo/console/util/
applications/console-standard/src/java/org/apache/geronimo/console/webmanager/
applications/console-standard/src/webapp/WEB-INF/vi...
Author: ammulder
Date: Wed May 3 22:53:47 2006
New Revision: 399561
URL: http://svn.apache.org/viewcvs?rev=399561&view=rev
Log:
Fix the web connector portlet (GERONIMO-1802), thanks Paul for the patch!
Fix the Jetty AJP connector name in config.xml so it matches the actual
component name.
Don't add prefixes to the unique name when adding a connector.
Modified:
geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java
geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Wed May 3 22:53:47 2006
@@ -17,8 +17,6 @@
package org.apache.geronimo.console.util;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
@@ -42,9 +40,7 @@
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ListableRepository;
import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.repository.WriteableRepository;
import org.apache.geronimo.management.J2EEDeployedObject;
import org.apache.geronimo.management.geronimo.J2EEDomain;
import org.apache.geronimo.management.geronimo.J2EEServer;
@@ -259,6 +255,11 @@
return (WebConnector[]) manager.getConnectors(protocol);
}
+ public static WebConnector getWebConnector(PortletRequest request, AbstractName connectorName) {
+ ManagementHelper helper = getManagementHelper(request);
+ return (WebConnector)helper.getObject(connectorName);
+ }
+
public static WebConnector[] getWebConnectorsForContainer(PortletRequest request, AbstractName managerName, AbstractName containerName, String protocol) {
ManagementHelper helper = getManagementHelper(request);
WebManager manager = (WebManager) helper.getObject(managerName);
Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java Wed May 3 22:53:47 2006
@@ -19,14 +19,12 @@
import java.io.Serializable;
-import javax.management.ObjectName;
-
import org.apache.geronimo.kernel.management.State;
public class ConnectorInfo implements Serializable {
private String description;
private String displayName;
- private String abstractName;
+ private String connectorURI;
private String protocol;
private int port;
private int state;
@@ -47,23 +45,16 @@
this.protocol = protocol;
}
- /**
- * @deprecated Use getAbstractName
- */
- public String getObjectName() {
- return abstractName;
- }
-
- public String getAbstractName() {
- return abstractName;
+ public String getConnectorURI() {
+ return connectorURI;
}
public String getDisplayName() {
return displayName;
}
- public void setAbstractName(String objectName) {
- this.abstractName = objectName;
+ public void setConnectorURI(String connectorURI) {
+ this.connectorURI = connectorURI;
}
public void setDisplayName(String displayName) {
Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Wed May 3 22:53:47 2006
@@ -70,14 +70,14 @@
public void processAction(ActionRequest actionRequest,
ActionResponse actionResponse) throws PortletException, IOException {
String mode = actionRequest.getParameter("mode");
- String managerName = actionRequest.getParameter("managerObjectName");
- String containerName = actionRequest.getParameter("containerObjectName");
- if(managerName != null) actionResponse.setRenderParameter("managerObjectName", managerName);
- if(containerName != null) actionResponse.setRenderParameter("containerObjectName", containerName);
+ String managerURI = actionRequest.getParameter("managerURI");
+ String containerURI = actionRequest.getParameter("containerURI");
+ if(managerURI != null) actionResponse.setRenderParameter("managerURI", managerURI);
+ if(containerURI != null) actionResponse.setRenderParameter("containerURI", containerURI);
String server;
- if(containerName != null) {
- WebContainer container = PortletManager.getWebContainer(actionRequest, new AbstractName(URI.create(containerName)));
+ if(containerURI != null) {
+ WebContainer container = PortletManager.getWebContainer(actionRequest, new AbstractName(URI.create(containerURI)));
server = getWebServerType(container.getClass());
} else {
server = "unknown";
@@ -98,9 +98,9 @@
int port = Integer.parseInt(actionRequest.getParameter("port"));
int maxThreads = Integer.parseInt(actionRequest.getParameter("maxThreads"));
Integer minThreads = getInteger(actionRequest, "minThreads");
- String name = actionRequest.getParameter("name");
+ String displayName = actionRequest.getParameter("displayName");
// Create and configure the connector
- WebConnector connector = PortletManager.createWebConnector(actionRequest, new AbstractName(URI.create(managerName)), new AbstractName(URI.create(containerName)), name, protocol, host, port);
+ WebConnector connector = PortletManager.createWebConnector(actionRequest, new AbstractName(URI.create(managerURI)), new AbstractName(URI.create(containerURI)), displayName, protocol, host, port);
connector.setMaxThreads(maxThreads);
// todo: more configurable HTTP/Jetty values
if(server.equals(WEB_SERVER_JETTY)) {
@@ -176,17 +176,9 @@
int port = Integer.parseInt(actionRequest.getParameter("port"));
int maxThreads = Integer.parseInt(actionRequest.getParameter("maxThreads"));
Integer minThreads = getInteger(actionRequest, "minThreads");
- String objectName = actionRequest.getParameter("objectName");
+ String connectorURI = actionRequest.getParameter("connectorURI");
// Identify and update the connector
- WebConnector connector = null;
- WebConnector all[] = PortletManager.getWebConnectors(actionRequest, new AbstractName(URI.create(managerName)));
- for (int i = 0; i < all.length; i++) {
- WebConnector conn = all[i];
- if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
- connector = conn;
- break;
- }
- }
+ WebConnector connector = PortletManager.getWebConnector(actionRequest, new AbstractName(URI.create(connectorURI)));
if(connector != null) {
connector.setHost(host);
connector.setPort(port);
@@ -235,17 +227,9 @@
}
actionResponse.setRenderParameter("mode", "list");
} else if(mode.equals("start")) {
- String objectName = actionRequest.getParameter("name");
+ String connectorURI = actionRequest.getParameter("connectorURI");
// work with the current connector to start it.
- WebConnector connector = null;
- WebConnector all[] = PortletManager.getWebConnectors(actionRequest, new AbstractName(URI.create(managerName)));
- for (int i = 0; i < all.length; i++) {
- WebConnector conn = all[i];
- if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
- connector = conn;
- break;
- }
- }
+ WebConnector connector = PortletManager.getWebConnector(actionRequest, new AbstractName(URI.create(connectorURI)));
if(connector != null) {
try {
((GeronimoManagedBean)connector).startRecursive();
@@ -256,20 +240,12 @@
else {
log.error("Incorrect connector reference"); //Replace this with correct error processing
}
- actionResponse.setRenderParameter("name", objectName);
+ actionResponse.setRenderParameter("connectorURI", connectorURI);
actionResponse.setRenderParameter("mode", "list");
} else if(mode.equals("stop")) {
- String objectName = actionRequest.getParameter("name");
+ String connectorURI = actionRequest.getParameter("connectorURI");
// work with the current connector to stop it.
- WebConnector connector = null;
- WebConnector all[] = PortletManager.getWebConnectors(actionRequest, new AbstractName(URI.create(managerName)));
- for (int i = 0; i < all.length; i++) {
- WebConnector conn = all[i];
- if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
- connector = conn;
- break;
- }
- }
+ WebConnector connector = PortletManager.getWebConnector(actionRequest, new AbstractName(URI.create(connectorURI)));
if(connector != null) {
try {
((GeronimoManagedBean)connector).stop();
@@ -280,16 +256,16 @@
else {
log.error("Incorrect connector reference"); //Replace this with correct error processing
}
- actionResponse.setRenderParameter("name", objectName);
+ actionResponse.setRenderParameter("connectorURI", connectorURI);
actionResponse.setRenderParameter("mode", "list");
} else if(mode.equals("edit")) {
- String objectName = actionRequest.getParameter("name");
- actionResponse.setRenderParameter("objectName", objectName);
+ String connectorURI = actionRequest.getParameter("connectorURI");
+ actionResponse.setRenderParameter("connectorURI", connectorURI);
actionResponse.setRenderParameter("mode", "edit");
} else if(mode.equals("delete")) { // User chose to delete a connector
- String objectName = actionRequest.getParameter("name");
- PortletManager.getWebManager(actionRequest, new AbstractName(URI.create(managerName))).removeConnector(new AbstractName(URI.create(objectName)));
+ String connectorURI = actionRequest.getParameter("connectorURI");
+ PortletManager.getWebManager(actionRequest, new AbstractName(URI.create(managerURI))).removeConnector(new AbstractName(URI.create(connectorURI)));
actionResponse.setRenderParameter("mode", "list");
}
}
@@ -316,12 +292,12 @@
if(mode.equals("list")) {
doList(renderRequest, renderResponse);
} else {
- String managerName = renderRequest.getParameter("managerObjectName");
- String containerName = renderRequest.getParameter("containerObjectName");
- if(managerName != null) renderRequest.setAttribute("managerObjectName", managerName);
- if(containerName != null) renderRequest.setAttribute("containerObjectName", containerName);
+ String managerURI = renderRequest.getParameter("managerURI");
+ String containerURI = renderRequest.getParameter("containerURI");
+ if(managerURI != null) renderRequest.setAttribute("managerURI", managerURI);
+ if(containerURI != null) renderRequest.setAttribute("containerURI", containerURI);
- WebContainer container = PortletManager.getWebContainer(renderRequest, new AbstractName(URI.create(containerName)));
+ WebContainer container = PortletManager.getWebContainer(renderRequest, new AbstractName(URI.create(containerURI)));
String server = getWebServerType(container.getClass());
renderRequest.setAttribute("server", server);
@@ -368,28 +344,14 @@
}
} else if(mode.equals("edit")) {
- String objectName = renderRequest.getParameter("objectName");
- WebConnector connector = null;
- WebConnector all[] = PortletManager.getWebConnectors(renderRequest, new AbstractName(URI.create(managerName)));
- for (int i = 0; i < all.length; i++) {
- WebConnector conn = all[i];
- if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
- connector = conn;
- break;
- }
- }
+ String connectorURI = renderRequest.getParameter("connectorURI");
+ WebConnector connector = PortletManager.getWebConnector(renderRequest, new AbstractName(URI.create(connectorURI)));
if(connector == null) {
doList(renderRequest, renderResponse);
} else {
- String displayName = PortletManager.getGBeanDescription(renderRequest, new AbstractName(URI.create(objectName)));
- try {
- ObjectName realName = ObjectName.getInstance(objectName);
- displayName = realName.getKeyProperty("name");
- } catch (MalformedObjectNameException e) {
- log.error("Bad object name for web connector", e);
- }
- renderRequest.setAttribute("name", displayName);
- renderRequest.setAttribute("objectName", objectName);
+ String displayName = new AbstractName(URI.create(connectorURI)).getName().get("name").toString();
+ renderRequest.setAttribute("displayName", displayName);
+ renderRequest.setAttribute("connectorURI", connectorURI);
renderRequest.setAttribute("port", new Integer(connector.getPort()));
renderRequest.setAttribute("host", connector.getHost());
int maxThreads = connector.getMaxThreads();
@@ -452,16 +414,16 @@
} else {
id = manager.getProductName() + " (" + containerName.getName().get(NameFactory.J2EE_NAME) + ")";
}
- ContainerStatus result = new ContainerStatus(id, webManagerName.toString(), containerName.toString());
+ ContainerInfo result = new ContainerInfo(id, webManagerName.toString(), containerName.toString());
WebConnector[] connectors = (WebConnector[]) manager.getConnectorsForContainer(container);
for (int k = 0; k < connectors.length; k++) {
WebConnector connector = connectors[k];
ConnectorInfo info = new ConnectorInfo();
- AbstractName abstractName = PortletManager.getNameFor(renderRequest, connector);
- info.setAbstractName(abstractName.toString());
- info.setDescription(PortletManager.getGBeanDescription(renderRequest, abstractName));
- info.setDisplayName((String)abstractName.getName().get(NameFactory.J2EE_NAME));
+ AbstractName connectorName = PortletManager.getNameFor(renderRequest, connector);
+ info.setConnectorURI(connectorName.toString());
+ info.setDescription(PortletManager.getGBeanDescription(renderRequest, connectorName));
+ info.setDisplayName((String)connectorName.getName().get(NameFactory.J2EE_NAME));
info.setState(((GeronimoManagedBean)connector).getState());
info.setPort(connector.getPort());
try {
@@ -485,17 +447,17 @@
}
}
- public final static class ContainerStatus {
+ public final static class ContainerInfo {
private String name;
- private String managerAbstractName;
- private String containerAbstractName;
+ private String managerURI;
+ private String containerURI;
private String[] protocols;
private List connectors;
- public ContainerStatus(String name, String managerAbstractName, String containerAbstractName) {
+ public ContainerInfo(String name, String managerURI, String containerURI) {
this.name = name;
- this.managerAbstractName = managerAbstractName;
- this.containerAbstractName = containerAbstractName;
+ this.managerURI = managerURI;
+ this.containerURI = containerURI;
}
public String getName() {
@@ -518,26 +480,12 @@
this.connectors = connectors;
}
- /**
- * @deprecated Use getManagerAbstractName
- */
- public String getManagerObjectName() {
- return managerAbstractName;
- }
-
- /**
- * @deprecated Use getContainerAbstractName
- */
- public String getContainerObjectName() {
- return containerAbstractName;
- }
-
- public String getManagerAbstractName() {
- return managerAbstractName;
+ public String getManagerURI() {
+ return managerURI;
}
- public String getContainerAbstractName() {
- return containerAbstractName;
+ public String getContainerURI() {
+ return containerURI;
}
}
Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp Wed May 3 22:53:47 2006
@@ -5,10 +5,10 @@
<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
<input type="hidden" name="mode" value="${mode}">
<input type="hidden" name="protocol" value="${protocol}">
-<input type="hidden" name="containerObjectName" value="${containerObjectName}">
-<input type="hidden" name="managerObjectName" value="${managerObjectName}">
+<input type="hidden" name="containerURI" value="${containerURI}">
+<input type="hidden" name="managerURI" value="${managerURI}">
<c:if test="${mode eq 'save'}">
- <input type="hidden" name="objectName" value="${objectName}">
+ <input type="hidden" name="connectorURI" value="${connectorURI}">
</c:if>
<table width="100%%" border="0">
@@ -18,7 +18,7 @@
<tr><th colspan="2" align="left">Add new ${protocol} listener for ${containerDisplayName}</th></tr>
</c:when>
<c:otherwise>
- <tr><th colspan="2" align="left">Edit connector ${name}</th></tr>
+ <tr><th colspan="2" align="left">Edit connector ${displayName}</th></tr>
</c:otherwise>
</c:choose>
@@ -26,7 +26,7 @@
<c:if test="${mode eq 'add'}">
<tr>
<td><div align="right">Unique Name: </div></td>
- <td><input name="name" type="text" size="30"></td>
+ <td><input name="displayName" type="text" size="30"></td>
</tr>
<tr>
<td><div align="right"></div></td>
Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Wed May 3 22:53:47 2006
@@ -5,10 +5,10 @@
<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
<input type="hidden" name="mode" value="${mode}">
<input type="hidden" name="protocol" value="${protocol}">
-<input type="hidden" name="containerObjectName" value="${containerObjectName}">
-<input type="hidden" name="managerObjectName" value="${managerObjectName}">
+<input type="hidden" name="containerURI" value="${containerURI}">
+<input type="hidden" name="managerURI" value="${managerURI}">
<c:if test="${mode eq 'save'}">
- <input type="hidden" name="objectName" value="${objectName}">
+ <input type="hidden" name="connectorURI" value="${connectorURI}">
</c:if>
<table width="100%%" border="0">
@@ -28,7 +28,7 @@
<c:if test="${mode eq 'add'}">
<tr>
<td><div align="right">Unique Name: </div></td>
- <td><input name="name" type="text" size="30"></td>
+ <td><input name="displayName" type="text" size="30"></td>
</tr>
<tr>
<td><div align="right"></div></td>
Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp Wed May 3 22:53:47 2006
@@ -32,31 +32,31 @@
<c:when test="${info.stateName eq 'running'}">
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="stop" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+ <portlet:param name="connectorURI" value="${info.connectorURI}" />
+ <portlet:param name="managerURI" value="${container.managerURI}" />
+ <portlet:param name="containerURI" value="${container.containerURI}" />
</portlet:actionURL>">stop</a>
</c:when>
<c:otherwise>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="start" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+ <portlet:param name="connectorURI" value="${info.connectorURI}" />
+ <portlet:param name="managerURI" value="${container.managerURI}" />
+ <portlet:param name="containerURI" value="${container.containerURI}" />
</portlet:actionURL>">start</a>
</c:otherwise>
</c:choose>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="edit" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+ <portlet:param name="connectorURI" value="${info.connectorURI}" />
+ <portlet:param name="managerURI" value="${container.managerURI}" />
+ <portlet:param name="containerURI" value="${container.containerURI}" />
</portlet:actionURL>">edit</a>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="delete" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+ <portlet:param name="connectorURI" value="${info.connectorURI}" />
+ <portlet:param name="managerURI" value="${container.managerURI}" />
+ <portlet:param name="containerURI" value="${container.containerURI}" />
</portlet:actionURL>">delete</a>
</td>
<td>${info.description}</td>
@@ -73,8 +73,8 @@
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="new" />
<portlet:param name="protocol" value="${protocol}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+ <portlet:param name="managerURI" value="${container.managerURI}" />
+ <portlet:param name="containerURI" value="${container.containerURI}" />
<portlet:param name="containerDisplayName" value="${container.name}" />
</portlet:actionURL>">Add new ${protocol} listener for ${container.name}</a>
</c:forEach>
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Wed May 3 22:53:47 2006
@@ -79,7 +79,7 @@
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
- <gbean name="JettyAJPConnector">
+ <gbean name="JettyAJP13Connector">
<attribute name="host">0.0.0.0</attribute>
<attribute name="port">8009</attribute>
</gbean>
Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java Wed May 3 22:53:47 2006
@@ -72,7 +72,7 @@
*/
public WebConnector addConnector(WebContainer container, String uniqueName, String protocol, String host, int port) {
AbstractName containerName = kernel.getAbstractNameFor(container);
- AbstractName name = kernel.getNaming().createChildName(containerName, "JettyWebConnector-" + protocol + "-" + uniqueName, NameFactory.GERONIMO_SERVICE);
+ AbstractName name = kernel.getNaming().createChildName(containerName, uniqueName, NameFactory.GERONIMO_SERVICE);
GBeanData connector;
if (protocol.equals(PROTOCOL_HTTP)) {
connector = new GBeanData(name, HTTPConnector.GBEAN_INFO);
Modified: geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=399561&r1=399560&r2=399561&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Wed May 3 22:53:47 2006
@@ -74,7 +74,7 @@
*/
public WebConnector addConnector(WebContainer container, String uniqueName, String protocol, String host, int port) {
AbstractName containerName = kernel.getAbstractNameFor(container);
- AbstractName name = kernel.getNaming().createChildName(containerName, "TomcatWebConnector-" + protocol + "-" + uniqueName, NameFactory.GERONIMO_SERVICE);
+ AbstractName name = kernel.getNaming().createChildName(containerName, uniqueName, NameFactory.GERONIMO_SERVICE);
GBeanData connector;
if(protocol.equals(PROTOCOL_HTTP)) {
connector = new GBeanData(name, ConnectorGBean.GBEAN_INFO);