Author: jlmonteiro
Date: Mon May 3 11:55:33 2010
New Revision: 940423
URL: http://svn.apache.org/viewvc?rev=940423&view=rev
Log:
OPENEJB-1261: fix compile errors in installer-view.jsp regarding refactor done
to pull non Tomcat-specific code into a common module.
Thx Matthias.
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/installer-view.jsp
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java?rev=940423&r1=940422&r2=940423&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
Mon May 3 11:55:33 2010
@@ -64,6 +64,10 @@ public class Installer {
}
}
+ public Alerts getAlerts() {
+ return alerts;
+ }
+
public void reset() {
alerts.reset();
}
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/installer-view.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/installer-view.jsp?rev=940423&r1=940422&r2=940423&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/installer-view.jsp
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/installer-view.jsp
Mon May 3 11:55:33 2010
@@ -95,7 +95,7 @@
<img border='0' height='3' width='360'
src='images/line_light.gif'><br>
<table width='360' cellspacing='4' cellpadding='4' border='0'>
<%
- for (String info : installer.messages.getInfos()) {
+ for (String info : installer.getAlerts().getInfos()) {
%>
<tr>
<td><font size='2'><%= info %></font></td>
@@ -113,7 +113,7 @@
<%
} else {
List<String> errors = new ArrayList<String>(paths.getErrors());
- errors.addAll(installer.messages.getErrors());
+ errors.addAll(installer.getAlerts().getErrors());
if (!errors.isEmpty()) {
%> Installation Failed<br><br>
<FONT SIZE='2'>
