You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/07/15 08:13:49 UTC
svn commit: r794147 - in
/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main:
java/org/apache/geronimo/console/apache/jk/AJPHandler.java
webapp/WEB-INF/view/apache/jk/ajpPort.jsp
Author: xuhaihong
Date: Wed Jul 15 06:13:49 2009
New Revision: 794147
URL: http://svn.apache.org/viewvc?rev=794147&view=rev
Log:
GERONIMO-4733 Unable to starting to configure Apache mod_jk (Patch from Shawn Jiang)
Modified:
geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java
geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java?rev=794147&r1=794146&r2=794147&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java Wed Jul 15 06:13:49 2009
@@ -48,7 +48,7 @@
for (int i = 0; i < managers.length; i++) {
WebManager manager = managers[i];
NetworkConnector[] connectors = manager.getConnectors(WebManager.PROTOCOL_AJP);
- if(connectors.length > 0) {
+ if(connectors.length > 0 && connectors[0]!=null) {
log.warn("Found AJP listener on port "+connectors[0].getPort());
return BASIC_CONFIG_MODE+BEFORE_ACTION;
}
@@ -59,9 +59,9 @@
while(true) {
for (int i = 0; i < managers.length; i++) {
WebManager manager = managers[i];
- WebConnector[] cons = (WebConnector[]) manager.getConnectors();
+ NetworkConnector[] cons = manager.getConnectors();
for (int j = 0; j < cons.length; j++) {
- WebConnector con = cons[j];
+ NetworkConnector con = cons[j];
if(con.getPort() == port) {
port += 10;
continue outer;
@@ -88,9 +88,9 @@
WebManager[] managers = PortletManager.getWebManagers(request);
for (int i = 0; i < managers.length; i++) {
WebManager manager = managers[i];
- WebConnector[] cons = (WebConnector[]) manager.getConnectors();
+ NetworkConnector[] cons = manager.getConnectors();
for (int j = 0; j < cons.length; j++) {
- WebConnector con = cons[j];
+ NetworkConnector con = cons[j];
if(con.getPort() == model.getAddAjpPort().intValue()) {
return getMode()+BEFORE_ACTION; //todo: some sort of error message
}
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp?rev=794147&r1=794146&r2=794147&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp Wed Jul 15 06:13:49 2009
@@ -28,7 +28,7 @@
<input type="hidden" name="workersPath" value="${model.workersPath}"/>
<input type="hidden" name="logFilePath" value="${model.logFilePath}"/>
<c:forEach var="webApp" items="${model.webApps}" varStatus="status">
- <input type="hidden" name="webapp.${status.index}.configId" value="${webApp.configId}"/>
+ <input type="hidden" name="webapp.${status.index}.configId" value="${webApp.parentConfigId}"/>
<input type="hidden" name="webapp.${status.index}.enabled" value="${webApp.enabled}"/>
<input type="hidden" name="webapp.${status.index}.dynamicPattern" value="${webApp.dynamicPattern}"/>
<input type="hidden" name="webapp.${status.index}.serveStaticContent" value="${webApp.serveStaticContent}"/>