JBossWeb SVN: r426 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 09:38:01 -0500 (Thu, 14 Feb 2008)
New Revision: 426
Modified:
trunk/java/org/apache/catalina/core/ApplicationContext.java
Log:
- Forgot one place.
Modified: trunk/java/org/apache/catalina/core/ApplicationContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/ApplicationContext.java 2008-02-14 13:31:54 UTC (rev 425)
+++ trunk/java/org/apache/catalina/core/ApplicationContext.java 2008-02-14 14:38:01 UTC (rev 426)
@@ -454,7 +454,7 @@
public URL getResource(String path)
throws MalformedURLException {
- if (path == null || !path.startsWith("/")) {
+ if (path == null || (Globals.STRICT_SERVLET_COMPLIANCE && !path.startsWith("/"))) {
throw new MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae", path));
}
16 years, 10 months
- 1
- 0
JBossWeb SVN: r425 - in trunk: java/org/apache/jasper/runtime and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 08:31:54 -0500 (Thu, 14 Feb 2008)
New Revision: 425
Modified:
trunk/java/org/apache/catalina/session/ManagerBase.java
trunk/java/org/apache/jasper/runtime/PageContextImpl.java
trunk/webapps/docs/changelog.xml
trunk/webapps/docs/project.xml
Log:
- Remove synced call.
- Fix possible NPE.
Modified: trunk/java/org/apache/catalina/session/ManagerBase.java
===================================================================
--- trunk/java/org/apache/catalina/session/ManagerBase.java 2008-02-14 13:08:39 UTC (rev 424)
+++ trunk/java/org/apache/catalina/session/ManagerBase.java 2008-02-14 13:31:54 UTC (rev 425)
@@ -679,7 +679,7 @@
if(log.isDebugEnabled())
log.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length);
for (int i = 0; i < sessions.length; i++) {
- if (!sessions[i].isValid()) {
+ if (sessions[i] != null && !sessions[i].isValid()) {
expireHere++;
}
}
Modified: trunk/java/org/apache/jasper/runtime/PageContextImpl.java
===================================================================
--- trunk/java/org/apache/jasper/runtime/PageContextImpl.java 2008-02-14 13:08:39 UTC (rev 424)
+++ trunk/java/org/apache/jasper/runtime/PageContextImpl.java 2008-02-14 13:31:54 UTC (rev 425)
@@ -70,6 +70,8 @@
*/
public class PageContextImpl extends PageContext {
+ private static JspFactory jspf = JspFactory.getDefaultFactory();
+
private BodyContentImpl[] outs;
private int depth;
@@ -895,7 +897,7 @@
final ProtectedFunctionMapper functionMap, final boolean escape)
throws ELException {
Object retValue;
- final ExpressionFactory exprFactory = JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
+ final ExpressionFactory exprFactory = jspf.getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
retValue = AccessController
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-02-14 13:08:39 UTC (rev 424)
+++ trunk/webapps/docs/changelog.xml 2008-02-14 13:31:54 UTC (rev 425)
@@ -149,6 +149,9 @@
<fix>
Ignore not found readme and xslt in DefaultServlet. (remm)
</fix>
+ <fix>
+ Fix possible NPE processing session expires. (fhanik)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -212,6 +215,9 @@
Finish removing of some URL CL hardcoding. If parent CL is not a URL CL, the Ant classpath cannot
be generated, and security setup might be incomplete. (remm)
</fix>
+ <fix>
+ <bug>44408</bug>: Remove useless synchronization. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
Modified: trunk/webapps/docs/project.xml
===================================================================
--- trunk/webapps/docs/project.xml 2008-02-14 13:08:39 UTC (rev 424)
+++ trunk/webapps/docs/project.xml 2008-02-14 13:31:54 UTC (rev 425)
@@ -29,7 +29,7 @@
<item name="PHP" href="php.html"/>
<item name="SSI" href="ssi-howto.html"/>
<item name="CGI" href="cgi-howto.html"/>
- <item name="Rewrite Support" href="rewrite.html"/>
+ <item name="URL Rewriting" href="rewrite.html"/>
<item name="Proxy Support" href="proxy-howto.html"/>
<item name="MBean Descriptor" href="mbeans-descriptor-howto.html"/>
<item name="Default Servlet" href="default-servlet.html"/>
16 years, 10 months
- 1
- 0
JBossWeb SVN: r424 - trunk/java/org/apache/catalina/connector.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 08:08:39 -0500 (Thu, 14 Feb 2008)
New Revision: 424
Modified:
trunk/java/org/apache/catalina/connector/InputBuffer.java
trunk/java/org/apache/catalina/connector/Request.java
Log:
- With non blocking IO, it is possible to implement a real available method.
Modified: trunk/java/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-02-14 11:15:19 UTC (rev 423)
+++ trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-02-14 13:08:39 UTC (rev 424)
@@ -135,6 +135,12 @@
/**
+ * Associated request.
+ */
+ private org.apache.catalina.connector.Request request;
+
+
+ /**
* Buffer position.
*/
private int markPos = -1;
@@ -152,9 +158,9 @@
/**
* Default constructor. Allocate the buffer with the default buffer size.
*/
- public InputBuffer() {
+ public InputBuffer(org.apache.catalina.connector.Request request) {
- this(DEFAULT_BUFFER_SIZE);
+ this(request, DEFAULT_BUFFER_SIZE);
}
@@ -164,8 +170,9 @@
*
* @param size Buffer size to use
*/
- public InputBuffer(int size) {
+ public InputBuffer(org.apache.catalina.connector.Request request, int size) {
+ this.request = request;
this.size = size;
bb = new ByteChunk(size);
bb.setLimit(size);
@@ -261,13 +268,29 @@
int available = 0;
if (state == BYTE_STATE) {
available = bb.getLength();
+ if (request.isComet() && available == 0) {
+ try {
+ available = realReadBytes(null, 0, 0);
+ } catch (IOException e) {
+ // Ignore, will return 0, and another error
+ // will occur elsewhere
+ }
+ }
} else if (state == CHAR_STATE) {
available = cb.getLength();
+ if (request.isComet() && available == 0) {
+ try {
+ available = realReadChars(null, 0, cb.getBuffer().length);
+ } catch (IOException e) {
+ // Ignore, will return 0, and another error
+ // will occur elsewhere
+ }
+ }
}
- if (available == 0) {
+ /*if (available == 0) {
coyoteRequest.action(ActionCode.ACTION_AVAILABLE, null);
available = (coyoteRequest.getAvailable() > 0) ? 1 : 0;
- }
+ }*/
return available;
}
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2008-02-14 11:15:19 UTC (rev 423)
+++ trunk/java/org/apache/catalina/connector/Request.java 2008-02-14 13:08:39 UTC (rev 424)
@@ -223,7 +223,7 @@
/**
* The associated input buffer.
*/
- protected InputBuffer inputBuffer = new InputBuffer();
+ protected InputBuffer inputBuffer = new InputBuffer(this);
/**
@@ -464,7 +464,7 @@
/**
- * Clear cached encoders (to save memory for Comet requests).
+ * Read bytes into the low level buffer.
*/
public boolean read()
throws IOException {
16 years, 10 months
- 1
- 0
JBossWeb SVN: r423 - in trunk: res/confinstall and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 06:15:19 -0500 (Thu, 14 Feb 2008)
New Revision: 423
Modified:
trunk/conf/server.xml
trunk/res/confinstall/server_1.xml
trunk/res/confinstall/server_2.xml
Log:
- Default configuration cleanup.
Modified: trunk/conf/server.xml
===================================================================
--- trunk/conf/server.xml 2008-02-14 10:58:05 UTC (rev 422)
+++ trunk/conf/server.xml 2008-02-14 11:15:19 UTC (rev 423)
@@ -6,7 +6,7 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <!--Initialize Jasper prior to webapps deployment. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
<!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
@@ -19,43 +19,22 @@
-->
<Service name="Catalina">
- <!--The connectors can use a shared executor, you can define one or more named thread pools-->
- <!--
- <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
- maxThreads="150" minSpareThreads="4"/>
- -->
-
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html
Java AJP Connector: /docs/config/ajp.html
If APR is installed, additional Connector documentation: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port 8080
+ Define a non-SSL HTTP/1.1 Connector on port 8080.
+ For HTTPS, refer to the documentation.
+ JSSE documentation: /docs/ssl-howto.html
+ Using APR and OpenSSL: /docs/apr.html
-->
<Connector port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
- port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- -->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
- <!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
+ connectionTimeout="20000" redirectPort="8443" />
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
Modified: trunk/res/confinstall/server_1.xml
===================================================================
--- trunk/res/confinstall/server_1.xml 2008-02-14 10:58:05 UTC (rev 422)
+++ trunk/res/confinstall/server_1.xml 2008-02-14 11:15:19 UTC (rev 423)
@@ -6,7 +6,7 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <!--Initialize Jasper prior to webapps deployment. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
<!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
@@ -19,17 +19,14 @@
-->
<Service name="Catalina">
- <!--The connectors can use a shared executor, you can define one or more named thread pools-->
- <!--
- <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
- maxThreads="150" minSpareThreads="4"/>
- -->
-
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html
Java AJP Connector: /docs/config/ajp.html
If APR is installed, additional Connector documentation: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port 8080
+ Define a non-SSL HTTP/1.1 Connector on port 8080.
+ For HTTPS, refer to the documentation.
+ JSSE documentation: /docs/ssl-howto.html
+ Using APR and OpenSSL: /docs/apr.html
-->
<Connector
\ No newline at end of file
Modified: trunk/res/confinstall/server_2.xml
===================================================================
--- trunk/res/confinstall/server_2.xml 2008-02-14 10:58:05 UTC (rev 422)
+++ trunk/res/confinstall/server_2.xml 2008-02-14 11:15:19 UTC (rev 423)
@@ -1,21 +1,5 @@
protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
- port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- -->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
- <!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
+ connectionTimeout="20000" redirectPort="8443" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
16 years, 10 months
- 1
- 0
JBossWeb SVN: r422 - in trunk: java/org/apache/catalina/manager and 4 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 05:58:05 -0500 (Thu, 14 Feb 2008)
New Revision: 422
Added:
trunk/webapps/ROOT/apr_pb.gif
trunk/webapps/host-manager/images/jbossweblogo.gif
trunk/webapps/manager/images/jbossweblogo.gif
Modified:
trunk/RELEASE-NOTES
trunk/java/org/apache/catalina/manager/Constants.java
trunk/java/org/apache/catalina/manager/host/Constants.java
trunk/webapps/ROOT/index.html
Log:
- Some HTML cleanups.
Modified: trunk/RELEASE-NOTES
===================================================================
--- trunk/RELEASE-NOTES 2008-02-14 10:26:17 UTC (rev 421)
+++ trunk/RELEASE-NOTES 2008-02-14 10:58:05 UTC (rev 422)
@@ -4,7 +4,7 @@
Release Notes
-$Id: RELEASE-NOTES 521511 2007-03-22 22:38:04Z fhanik $
+$Id: $
=============================
Modified: trunk/java/org/apache/catalina/manager/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/manager/Constants.java 2008-02-14 10:26:17 UTC (rev 421)
+++ trunk/java/org/apache/catalina/manager/Constants.java 2008-02-14 10:58:05 UTC (rev 422)
@@ -103,13 +103,13 @@
"<table cellspacing=\"4\" width=\"100%\" border=\"0\">\n" +
" <tr>\n" +
" <td colspan=\"2\">\n" +
- " <a href=\"http://www.apache.org/\">\n" +
- " <img border=\"0\" alt=\"The Apache Software Foundation\" align=\"left\"\n" +
- " src=\"{0}/images/asf-logo.gif\">\n" +
+ " <a href=\"http://www.jboss.org/\">\n" +
+ " <img border=\"0\" alt=\"JBoss.org\" align=\"left\"\n" +
+ " src=\"{0}/images/jboss_logo.gif\">\n" +
" </a>\n" +
- " <a href=\"http://tomcat.apache.org/\">\n" +
- " <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
- " align=\"right\" src=\"{0}/images/tomcat.gif\">\n" +
+ " <a href=\"http://labs.jboss.com/jbossweb/\">\n" +
+ " <img border=\"0\" alt=\"JBoss Web Servlet/JSP Container\"\n" +
+ " align=\"right\" src=\"{0}/images/jbossweblogo.gif\">\n" +
" </a>\n" +
" </td>\n" +
" </tr>\n" +
@@ -182,7 +182,7 @@
public static final String HTML_TAIL_SECTION =
"<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2005, Apache Software Foundation</em>" +
+ " <em>Copyright © 2008, Red Hat Middleware, LLC.</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
Modified: trunk/java/org/apache/catalina/manager/host/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/manager/host/Constants.java 2008-02-14 10:26:17 UTC (rev 421)
+++ trunk/java/org/apache/catalina/manager/host/Constants.java 2008-02-14 10:58:05 UTC (rev 422)
@@ -107,13 +107,13 @@
"<table cellspacing=\"4\" width=\"100%\" border=\"0\">\n" +
" <tr>\n" +
" <td colspan=\"2\">\n" +
- " <a href=\"http://www.apache.org/\">\n" +
- " <img border=\"0\" alt=\"The Apache Software Foundation\" align=\"left\"\n" +
- " src=\"{0}/images/asf-logo.gif\">\n" +
+ " <a href=\"http://www.jboss.org/\">\n" +
+ " <img border=\"0\" alt=\"JBoss.org\" align=\"left\"\n" +
+ " src=\"{0}/images/jboss_logo.gif\">\n" +
" </a>\n" +
- " <a href=\"http://tomcat.apache.org/\">\n" +
- " <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
- " align=\"right\" src=\"{0}/images/tomcat.gif\">\n" +
+ " <a href=\"http://labs.jboss.com/jbossweb/\">\n" +
+ " <img border=\"0\" alt=\"JBoss Web Servlet/JSP Container\"\n" +
+ " align=\"right\" src=\"{0}/images/jbossweblogo.gif\">\n" +
" </a>\n" +
" </td>\n" +
" </tr>\n" +
@@ -186,7 +186,7 @@
public static final String HTML_TAIL_SECTION =
"<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2005, Apache Software Foundation</em>" +
+ " <em>Copyright © 2008, Red Hat Middleware, LLC.</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
Added: trunk/webapps/ROOT/apr_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/ROOT/apr_pb.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/webapps/ROOT/index.html
===================================================================
--- trunk/webapps/ROOT/index.html 2008-02-14 10:26:17 UTC (rev 421)
+++ trunk/webapps/ROOT/index.html 2008-02-14 10:58:05 UTC (rev 422)
@@ -132,6 +132,20 @@
<tr>
<td class="menu">
<a href="http://labs.jboss.com/jbossweb/">Home Page</a><br/>
+ <a href="http://jira.jboss.com/jira/browse/JBWEB">Bug Database</a><br/>
+
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+ <table width="100%" border="1" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Apache Tomcat Online</th>
+ </tr>
+ <tr>
+ <td class="menu">
+ <a href="http://tomcat.apache.org/">Home Page</a><br/>
<a href="http://tomcat.apache.org/faq/">FAQ</a><br/>
<a href="http://tomcat.apache.org/bugreport.html">Bug Database</a><br/>
<a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&...">Open Bugs</a><br/>
@@ -150,8 +164,8 @@
</tr>
<tr>
<td class="menu">
+ <a href="http://java.sun.com/products/servlet">Sun's Servlet Site</a><br/>
<a href="http://java.sun.com/products/jsp">Sun's Java Server Pages Site</a><br/>
- <a href="http://java.sun.com/products/servlet">Sun's Servlet Site</a><br/>
</td>
</tr>
@@ -162,39 +176,45 @@
<!-- Body -->
<td align="left" valign="top">
- <p id="congrats">If you're seeing this page via a web browser, it means you've setup Tomcat successfully. Congratulations!</p>
+ <p id="congrats">If you're seeing this page via a web browser, it means you've setup JBoss Web successfully. Congratulations!</p>
- <p>As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at:</p>
+ <p>As you may have guessed by now, this is the default JBoss Web home page. It can be found on the local filesystem at:</p>
<p class="code">$CATALINA_HOME/webapps/ROOT/index.html</p>
- <p>where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="docs">Tomcat Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p>
+ <p>where "$CATALINA_HOME" is the root of the JBoss Web installation directory. If you're seeing this page, and
+ you don't think you should be, then either you're either a user who has arrived at new installation of JBoss Web,
+ or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case,
+ please refer to the <a href="docs">JBoss Web Documentation</a> for more detailed setup and administration
+ information than is found in the INSTALL file.</p>
<p><b>NOTE: For security reasons, using the administration webapp
is restricted to users with role "admin". The manager webapp
is restricted to users with role "manager".</b>
Users are defined in <code>$CATALINA_HOME/conf/tomcat-users.xml</code>.</p>
- <p>Included with this release are a host of sample Servlets and JSPs (with associated source code), extensive documentation, and an introductory guide to developing web applications.</p>
+ <p>Included with this release are extensive documentation and an introductory guide to developing web applications.</p>
+<!--
<p>Tomcat mailing lists are available at the Tomcat project web site:</p>
<ul>
<li><b><a href="mailto:users@tomcat.apache.org">users(a)tomcat.apache.org</a></b> for general questions related to configuring and using Tomcat</li>
<li><b><a href="mailto:dev@tomcat.apache.org">dev(a)tomcat.apache.org</a></b> for developers working on Tomcat</li>
</ul>
+-->
- <p>Thanks for using Tomcat!</p>
+ <p>Thanks for using JBoss Web!</p>
<p id="footer">
- <img border="0" src="jboss_ics.gif"/>
+ <img border="0" src="jbweb_pb.gif"/>
<img border="0" src="tomcat_pb.gif"/>
+ <img border="0" src="apr_pb.gif"/>
<img border="0" src="openssl_ics.gif"/>
- <img border="0" src="jbweb_pb.gif"/>
+ <img border="0" src="jboss_ics.gif"/>
<br/>
- Copyright © 1999-2007 RedHat<br/>
- All Rights Reserved
+ © 2008 Red Hat Middleware, LLC. All Rights Reserved.
</p>
</td>
Added: trunk/webapps/host-manager/images/jbossweblogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/jbossweblogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/jbossweblogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/jbossweblogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 10 months
- 1
- 0
JBossWeb SVN: r421 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 05:26:17 -0500 (Thu, 14 Feb 2008)
New Revision: 421
Modified:
trunk/build.properties.default
trunk/dist.xml
trunk/webapps/docs/project.xml
Log:
- Add OpenSSL to allow easy key management.
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2008-02-13 17:02:20 UTC (rev 420)
+++ trunk/build.properties.default 2008-02-14 10:26:17 UTC (rev 421)
@@ -71,7 +71,7 @@
# ----- JBoss Native, version 2.0 or later -----
jbossnative.home=${base.path}/jboss-native-2.0.3
-jbossnative.test=${base.path}/jboss-native-2.0.3/JBossORG-EULA.txt
+jbossnative.openssl=${base.path}/jboss-native-2.0.3/bin/openssl.exe
jbossnative.dlls=${jbossnative.home}/bin/native
jbossnative.loc=http://labs.jboss.com/downloading/?projectId=jbossweb&url...
Modified: trunk/dist.xml
===================================================================
--- trunk/dist.xml 2008-02-13 17:02:20 UTC (rev 420)
+++ trunk/dist.xml 2008-02-14 10:26:17 UTC (rev 421)
@@ -240,6 +240,7 @@
<copy todir="${tomcat.dist}/bin">
<fileset dir="${jbossnative.dlls}" includes="*.dll"/>
</copy>
+ <copy todir="${tomcat.dist}/bin" file="${jbossnative.openssl}" />
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
Modified: trunk/webapps/docs/project.xml
===================================================================
--- trunk/webapps/docs/project.xml 2008-02-13 17:02:20 UTC (rev 420)
+++ trunk/webapps/docs/project.xml 2008-02-14 10:26:17 UTC (rev 421)
@@ -2,21 +2,17 @@
<project name="JBoss Web Documentation"
href="http://labs.jboss.com/jbossweb/">
- <title>JBoss Web 2.1</title>
+ <title></title>
- <logo href="/images/jboss_logo.gif">
+ <logo href="/images/jbossweblogo.gif">
The JBoss Web Servlet/JSP Container
</logo>
<body>
- <menu name="Links">
- <item name="Docs Home" href="index.html"/>
- <item name="FAQ" href="http://tomcat.apache.org/faq" />
- </menu>
-
<menu name="User Guide">
+ <item name="Docs Home" href="index.html"/>
<item name="Introduction" href="introduction.html"/>
<item name="Setup" href="setup.html"/>
<item name="System Properties" href="sysprops.html"/>
@@ -45,14 +41,6 @@
<item name="Advanced IO" href="aio.html"/>
</menu>
- <menu name="Reference">
- <item name="Release Notes" href="RELEASE-NOTES.txt"/>
- <item name="Configuration" href="config/index.html"/>
- <item name="Javadocs" href="api/index.html"/>
- <item name="JK 1.2 Documentation"
- href="http://tomcat.apache.org/connectors-doc/"/>
- </menu>
-
<menu name="JBoss Web Development">
<item name="Building" href="building.html"/>
<item name="Changelog" href="changelog.html"/>
@@ -61,6 +49,15 @@
<item name="Legal" href="legal.html"/>
</menu>
+ <menu name="Reference">
+ <item name="Release Notes" href="RELEASE-NOTES.txt"/>
+ <item name="Configuration" href="config/index.html"/>
+ <item name="Javadocs" href="api/index.html"/>
+ <item name="JK 1.2 Documentation"
+ href="http://tomcat.apache.org/connectors-doc/"/>
+ <item name="Tomcat FAQ" href="http://tomcat.apache.org/faq" />
+ </menu>
+
</body>
</project>
16 years, 10 months
- 1
- 0
JBossWeb SVN: r420 - in trunk: bin and 8 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-13 12:02:20 -0500 (Wed, 13 Feb 2008)
New Revision: 420
Added:
trunk/res/jboss-web.ico
trunk/res/jboss-web.nsi
trunk/res/procrun/amd64/jboss-web.exe
trunk/res/procrun/amd64/jboss-webw.exe
trunk/res/procrun/ia64/jboss-web.exe
trunk/res/procrun/ia64/jboss-webw.exe
trunk/res/procrun/jboss-web.exe
trunk/res/procrun/jboss-webw.exe
trunk/webapps/docs/images/jbossweblogo.gif
Removed:
trunk/res/procrun/amd64/tomcat6.exe
trunk/res/procrun/amd64/tomcat6w.exe
trunk/res/procrun/ia64/tomcat6.exe
trunk/res/procrun/ia64/tomcat6w.exe
trunk/res/procrun/tomcat6.exe
trunk/res/procrun/tomcat6w.exe
trunk/res/tomcat.ico
trunk/res/tomcat.nsi
Modified:
trunk/bin/service.bat
trunk/build.properties.default
trunk/build.xml
trunk/conf/logging.properties
trunk/conf/server.xml
trunk/dist.xml
trunk/res/confinstall/server_1.xml
trunk/res/confinstall/server_2.xml
trunk/webapps/docs/images/jboss_logo.gif
trunk/webapps/manager/images/jboss_logo.gif
Log:
- Packaging cleanup (installer seems to work again, and it now includes JBoss Native).
Modified: trunk/bin/service.bat
===================================================================
--- trunk/bin/service.bat 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/bin/service.bat 2008-02-13 17:02:20 UTC (rev 420)
@@ -33,12 +33,12 @@
set CURRENT_DIR=%cd%
if not "%CATALINA_HOME%" == "" goto gotHome
set CATALINA_HOME=%cd%
-if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\jboss-web.exe" goto okHome
rem CD to the upper dir
cd ..
set CATALINA_HOME=%cd%
:gotHome
-if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\jboss-web.exe" goto okHome
echo The tomcat.exe was not found...
echo The CATALINA_HOME environment variable is not defined correctly.
echo This environment variable is needed to run this program
@@ -53,16 +53,16 @@
set CATALINA_BASE=%CATALINA_HOME%
:gotBase
-set EXECUTABLE=%CATALINA_HOME%\bin\tomcat6.exe
+set EXECUTABLE=%CATALINA_HOME%\bin\jboss-web.exe
rem Set default Service name
-set SERVICE_NAME=Tomcat6
-set PR_DISPLAYNAME=Apache Tomcat
+set SERVICE_NAME=JBossWeb
+set PR_DISPLAYNAME=JBoss Web
if "%1" == "" goto displayUsage
if "%2" == "" goto setServiceName
set SERVICE_NAME=%2
-set PR_DISPLAYNAME=Apache Tomcat %2
+set PR_DISPLAYNAME=JBoss Web %2
:setServiceName
if %1 == install goto doInstall
if %1 == remove goto doRemove
@@ -89,7 +89,7 @@
rem Use the environment variables as an example
rem Each command line option is prefixed with PR_
-set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org/
+set PR_DESCRIPTION=JBoss Web Server - http://labs.jboss.com/jbossweb/
set PR_INSTALL=%EXECUTABLE%
set PR_LOGPATH=%CATALINA_BASE%\logs
set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/build.properties.default 2008-02-13 17:02:20 UTC (rev 420)
@@ -69,6 +69,12 @@
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
+# ----- JBoss Native, version 2.0 or later -----
+jbossnative.home=${base.path}/jboss-native-2.0.3
+jbossnative.test=${base.path}/jboss-native-2.0.3/JBossORG-EULA.txt
+jbossnative.dlls=${jbossnative.home}/bin/native
+jbossnative.loc=http://labs.jboss.com/downloading/?projectId=jbossweb&url=http://labs.jboss.com/file-access/default/members/jbossweb/freezone/dist/2.0.3.GA/jboss-native-2.0.3-windows-i686-ssl.zip
+
# ----- Commons Daemon, version 1.0-Alpha or later -----
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/build.xml 2008-02-13 17:02:20 UTC (rev 420)
@@ -618,6 +618,12 @@
<param name="basedir" value="${jasper-jdt.home}" />
</antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${jbossnative.loc}"/>
+ <param name="destfile" value="${jbossnative.test}"/>
+ <param name="destdir" value="${jbossnative.home}"/>
+ </antcall>
+
</target>
<target name="build-tomcat-dbcp">
Modified: trunk/conf/logging.properties
===================================================================
--- trunk/conf/logging.properties 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/conf/logging.properties 2008-02-13 17:02:20 UTC (rev 420)
@@ -19,10 +19,6 @@
3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
3manager.org.apache.juli.FileHandler.prefix = manager.
-4admin.org.apache.juli.FileHandler.level = FINE
-4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-4admin.org.apache.juli.FileHandler.prefix = admin.
-
5host-manager.org.apache.juli.FileHandler.level = FINE
5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
5host-manager.org.apache.juli.FileHandler.prefix = host-manager.
@@ -42,9 +38,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler
-
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler
Modified: trunk/conf/server.xml
===================================================================
--- trunk/conf/server.xml 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/conf/server.xml 2008-02-13 17:02:20 UTC (rev 420)
@@ -25,7 +25,6 @@
maxThreads="150" minSpareThreads="4"/>
-->
-
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html
Modified: trunk/dist.xml
===================================================================
--- trunk/dist.xml 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/dist.xml 2008-02-13 17:02:20 UTC (rev 420)
@@ -19,7 +19,7 @@
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
<property name="version" value="2.1.0-dev" />
- <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+ <property name="version.number" value="${version.major}.${version.minor}.${version.build}.0" />
<property name="project" value="jboss-web" />
<property name="final.name" value="${project}-${version}" />
@@ -151,8 +151,8 @@
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/api"
author="true" version="true"
- windowtitle="Tomcat API Documentation"
- doctitle="Tomcat API"
+ windowtitle="JBoss Web API Documentation"
+ doctitle="JBoss Web API"
bottom="Copyright © 2000-2008 Apache Software Foundation. All Rights Reserved."
additionalparam="-breakiterator"
maxmemory="256m" >
@@ -197,8 +197,8 @@
<!-- Copy deployer documentation -->
<copy todir="${tomcat.deployer}">
<fileset dir="${tomcat.build}/webapps/docs">
- <include name="images/jakarta-logo.gif" />
- <include name="images/tomcat.gif" />
+ <include name="images/jbossorg_logo.gif" />
+ <include name="images/jboss_logo.gif" />
</fileset>
</copy>
<copy tofile="${tomcat.deployer}/docs/manual.html"
@@ -235,19 +235,22 @@
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
<copy todir="${tomcat.dist}/bin">
- <fileset dir="res/procrun/" includes="tomcat*.exe"/>
+ <fileset dir="res/procrun/" includes="jboss*.exe"/>
</copy>
+ <copy todir="${tomcat.dist}/bin">
+ <fileset dir="${jbossnative.dlls}" includes="*.dll"/>
+ </copy>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
- <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true" overwrite="true"/>
+ <copy file="res/jboss-web.nsi" tofile="${tomcat.dist}/jboss-web.nsi" filtering="true" overwrite="true"/>
<exec dir="${tomcat.dist}" executable="${nsis.exe}">
<arg value="/DNSISDIR=${nsis.home}" />
- <arg value="tomcat.nsi" />
+ <arg value="jboss-web.nsi" />
</exec>
- <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
+ <move file="${tomcat.dist}/jboss-web-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
<checksum file="${tomcat.release}/v${version}/bin/${final.name}.exe"
forceOverwrite="yes" fileext=".md5" />
@@ -258,7 +261,7 @@
<!-- ==================== RELEASE: Create Release ======================= -->
<target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
- description="Create a Tomcat 6 packaged distribution">
+ description="Create a JBoss Web packaged distribution">
<filter token="VERSION" value="${version}"/>
<copy file="KEYS"
@@ -273,25 +276,27 @@
tofile="${tomcat.release}/v${version}/bin/README.html"
filtering="true"/>
+ <!--
<mkdir dir="${tomcat.release}/v${version}/bin/extras" />
<copy todir="${tomcat.release}/v${version}/bin/extras">
<fileset dir="${tomcat.extras}">
<include name="*.*"/>
</fileset>
</copy>
+ -->
</target>
<!-- Packages the core zip distro -->
<target name="package-zip">
<copy todir="${tomcat.dist}/bin">
- <fileset dir="res/procrun/" includes="tomcat*.exe"/>
+ <fileset dir="res/procrun/" includes="jboss*.exe"/>
</copy>
<copy todir="${tomcat.dist}/bin/amd64">
- <fileset dir="res/procrun/amd64" includes="tomcat*.exe"/>
+ <fileset dir="res/procrun/amd64" includes="jboss*.exe"/>
</copy>
<copy todir="${tomcat.dist}/bin/ia64">
- <fileset dir="res/procrun/ia64" includes="tomcat*.exe"/>
+ <fileset dir="res/procrun/ia64" includes="jboss*.exe"/>
</copy>
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
@@ -308,8 +313,6 @@
<include name="RELEASE-NOTES"/>
<include name="RUNNING.txt"/>
<include name="BENCHMARKS.txt"/>
- <exclude name="webapps/admin/**"/>
- <exclude name="conf/Catalina/localhost/admin.xml"/>
<!-- If we choose not to have service binaries by default
the exclude.service.binaries must be defined
in build.properties or in this file
@@ -343,26 +346,6 @@
message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}" append="true" />
</target>
- <!-- Packages the admin webapp distro in zip format -->
- <target name="package-admin-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-admin.zip">
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="webapps/admin/**"/>
- <include name="conf/Catalina/localhost/admin.xml"/>
- <exclude name="*.jsp" />
- </zipfileset>
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="RELEASE-NOTES" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip.md5"
- message="${md5sum.binary-prefix}${final.name}-admin.zip${line.separator}" append="true" />
- </target>
-
<!-- Packages the core tar.gz distro -->
<target name="package-tgz">
<fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
@@ -384,7 +367,6 @@
</tarfileset>
<tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
<include name="conf/**" />
- <exclude name="conf/Catalina/localhost/admin.xml" />
</tarfileset>
<tarfileset dir="${tomcat.dist}" prefix="${final.name}">
<include name="bin/**" />
@@ -412,7 +394,7 @@
<exclude name="bin/startup-using-launcher.sh" />
<exclude name="conf/**" />
<exclude name="src/**" />
- <exclude name="webapps/admin/**" />
+ <exclude name="bin/*.dll"/>
<exclude name="bin/*.exe"/>
<exclude name="bin/amd64/"/>
<exclude name="bin/ia64/"/>
@@ -455,33 +437,6 @@
message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}" append="true" />
</target>
- <!-- Packages the admin webapp distro in tar.gz format -->
- <target name="package-admin-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="server/webapps/admin/**" />
- <exclude name="*.jsp" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
- <include name="conf/Catalina/localhost/admin.xml" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}-admin.tar.gz${line.separator}" append="true" />
- </target>
-
<!-- Packages the documentation distro in tar.gz format -->
<target name="package-docs-tgz">
@@ -490,13 +445,13 @@
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="tomcat-6.0-doc">
+ <tarfileset dir="${tomcat.dist}" prefix="jboss-web-doc">
<include name="LICENSE" />
<include name="NOTICE" />
<include name="README.txt" />
<include name="RUNNING.txt" />
</tarfileset>
- <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="tomcat-6.0-doc">
+ <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="jboss-web-doc">
<include name="**" />
</tarfileset>
</tar>
Modified: trunk/res/confinstall/server_1.xml
===================================================================
--- trunk/res/confinstall/server_1.xml 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/res/confinstall/server_1.xml 2008-02-13 17:02:20 UTC (rev 420)
@@ -12,20 +12,6 @@
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <!-- Global JNDI resources
- Documentation at /docs/jndi-resources-howto.html
- -->
- <GlobalNamingResources>
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users
- -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
@@ -39,7 +25,6 @@
maxThreads="150" minSpareThreads="4"/>
-->
-
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html
Modified: trunk/res/confinstall/server_2.xml
===================================================================
--- trunk/res/confinstall/server_2.xml 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/res/confinstall/server_2.xml 2008-02-13 17:02:20 UTC (rev 420)
@@ -47,12 +47,7 @@
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-->
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
+ <Realm className="org.apache.catalina.realm.MemoryRealm"/>
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
Added: trunk/res/jboss-web.ico
===================================================================
(Binary files differ)
Property changes on: trunk/res/jboss-web.ico
___________________________________________________________________
Name: svn:mime-type
+ image/x-icon
Added: trunk/res/jboss-web.nsi
===================================================================
--- trunk/res/jboss-web.nsi (rev 0)
+++ trunk/res/jboss-web.nsi 2008-02-13 17:02:20 UTC (rev 420)
@@ -0,0 +1,628 @@
+
+; JBoss Web script for Nullsoft Installer
+; $Id: jboss-web.nsi 524730 2007-04-02 06:24:33Z mturk $
+
+ ;Compression options
+ CRCCheck on
+ SetCompressor /SOLID lzma
+
+ Name "JBoss Web"
+
+ ;Product information
+ VIAddVersionKey ProductName "JBoss Web"
+ VIAddVersionKey CompanyName "RedHat"
+ VIAddVersionKey LegalCopyright "Copyright (c) 2006-2008 RedHat"
+ VIAddVersionKey FileDescription "JBoss Web Installer"
+ VIAddVersionKey FileVersion "2.1"
+ VIAddVersionKey ProductVersion "@VERSION@"
+ VIAddVersionKey Comments "jboss-web"
+ VIAddVersionKey InternalName "jboss-web-@VERSION@.exe"
+ VIProductVersion @VERSION_NUMBER@
+
+!include "MUI.nsh"
+!include "StrFunc.nsh"
+${StrRep}
+ Var "JavaHome"
+
+
+
+;--------------------------------
+;Configuration
+
+ !define MUI_HEADERIMAGE
+ !define MUI_HEADERIMAGE_RIGHT
+ !define MUI_HEADERIMAGE_BITMAP header.bmp
+ !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
+ !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
+ !define MUI_FINISHPAGE_RUN $INSTDIR\bin\jboss-webw.exe
+ !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//JBossWeb
+ !define MUI_FINISHPAGE_NOREBOOTSUPPORT
+
+ !define MUI_ABORTWARNING
+
+ !define TEMP1 $R0
+ !define TEMP2 $R1
+
+ !define MUI_ICON jboss-web.ico
+ !define MUI_UNICON jboss-web.ico
+
+ ;General
+ OutFile jboss-web-installer.exe
+
+ ;Install Options pages
+ LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
+ LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path selection."
+ LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path selection"
+
+ LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
+ LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "JBoss Web basic configuration."
+ LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
+
+ ;Install Page order
+ !insertmacro MUI_PAGE_WELCOME
+ !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
+ !insertmacro MUI_PAGE_COMPONENTS
+ !insertmacro MUI_PAGE_DIRECTORY
+ Page custom SetConfiguration Void "$(TEXT_CONF_PAGETITLE)"
+ Page custom SetChooseJVM Void "$(TEXT_JVM_PAGETITLE)"
+ !insertmacro MUI_PAGE_INSTFILES
+ Page custom CheckUserType
+ !insertmacro MUI_PAGE_FINISH
+
+ ;Uninstall Page order
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+
+ ;License dialog
+ LicenseData License.rtf
+
+ ;Component-selection page
+ ;Descriptions
+ LangString DESC_SecJBossWeb ${LANG_ENGLISH} "Install the JBoss Web Servlet container."
+ LangString DESC_SecJBossWebCore ${LANG_ENGLISH} "Install the JBoss Web Servlet container core."
+ LangString DESC_SecJBossWebService ${LANG_ENGLISH} "Automatically start JBoss Web when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP."
+; LangString DESC_SecJBossWebNative ${LANG_ENGLISH} "Downloads and installs JBoss Web native .dll for better performance and scalability in production environments."
+ LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for JBoss Web."
+ LangString DESC_SecDocs ${LANG_ENGLISH} "Install the JBoss Web documentation bundle. This include documentation on the servlet container and its configuration options, on the JSP page compiler, as well as on the native webserver connectors."
+
+ ;Language
+ !insertmacro MUI_LANGUAGE English
+
+ ;Folder-select dialog
+ InstallDir "$PROGRAMFILES\JBoss.org\JBoss Web 2.1"
+
+ ;Install types
+ InstType Normal
+ InstType Minimum
+ InstType Full
+
+ ; Main registry key
+ InstallDirRegKey HKLM "SOFTWARE\JBoss.org\JBoss Web\2.1" ""
+
+ !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+ ReserveFile "jvm.ini"
+ ReserveFile "config.ini"
+
+;--------------------------------
+;Installer Sections
+
+SubSection "JBoss Web" SecJBossWeb
+
+Section "Core" SecJBossWebCore
+
+ SectionIn 1 2 3 RO
+
+ IfSilent +2 0
+ Call checkJvm
+
+ SetOutPath $INSTDIR
+ File jboss-web.ico
+ File LICENSE
+ SetOutPath $INSTDIR\lib
+ File /r lib\*.*
+ SetOutPath $INSTDIR\logs
+ File /nonfatal /r logs\*.*
+ SetOutPath $INSTDIR\work
+ File /nonfatal /r work\*.*
+ SetOutPath $INSTDIR\temp
+ File /nonfatal /r temp\*.*
+ SetOutPath $INSTDIR\bin
+ File bin\bootstrap.jar
+ File bin\tomcat-juli.jar
+ File bin\*.exe
+ File bin\*.dll
+ SetOutPath $INSTDIR\conf
+ File conf\*.*
+ SetOutPath $INSTDIR\webapps\ROOT
+ File /r webapps\ROOT\*.*
+ SetOutPath $INSTDIR\webapps\host-manager
+ File /r webapps\host-manager\*.*
+ SetOutPath $INSTDIR\webapps\manager
+ File /r webapps\manager\*.*
+
+ Call configure
+ Call findJavaPath
+ Pop $2
+
+ IfSilent +2 0
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
+
+ StrCpy "$JavaHome" $2
+ Call findJVMPath
+ Pop $2
+
+ DetailPrint "Using Jvm: $2"
+
+ InstallRetry:
+ ClearErrors
+ nsExec::ExecToLog '"$INSTDIR\bin\jboss-web.exe" //IS//JBossWeb --DisplayName "JBoss Web" --Description "JBoss Web @VERSION@ Server - http://labs.jboss.com/jbossweb/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\jboss-web.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+ Pop $0
+ StrCmp $0 "0" InstallOk
+ MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
+ "Failed to install JBossWeb service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \
+ /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
+ Quit
+ InstallOk:
+ ClearErrors
+
+SectionEnd
+
+Section "Service" SecJBossWebService
+
+ SectionIn 3
+
+ IfSilent 0 +3
+ Call findJavaPath
+ Pop $2
+
+ IfSilent +2 0
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
+
+ StrCpy "$JavaHome" $2
+ Call findJVMPath
+ Pop $2
+
+ nsExec::ExecToLog '"$INSTDIR\bin\jboss-web.exe" //US//JBossWeb --Startup auto'
+ ; Bahave like Apache Httpd (put the icon in try on login)
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "JBossWebMonitor" '"$INSTDIR\bin\jboss-webw.exe" //MS//JBossWeb'
+
+ ClearErrors
+
+SectionEnd
+
+;Section "Native" SecJBossWebNative
+;
+; SectionIn 3
+;
+; ; tcnative-1.dll is a symlink to the tcnative-1-ipv4.dll
+; ; If IPV6 support is required, download the tcnative-1-ipv6.dll insted
+; ; The tcnative-1.dll from heanet.ie comes with APR 1.2.8 and OpenSSL 0.9.8e compiled in.
+; ; TODO: Depending on the JVM download the 32 or 64 bit version.
+; NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.12/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll
+; Pop $0
+; StrCmp $0 success success
+; SetDetailsView show
+; DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.12/binaries/win32/tcnative-1.dll: $0"
+; success:
+;
+; ClearErrors
+;
+;SectionEnd
+
+SubSectionEnd
+
+Section "Start Menu Items" SecMenu
+
+ SectionIn 1 2 3
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
+
+ SetOutPath "$SMPROGRAMS\JBoss Web 2.1"
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\JBoss Web Home Page.lnk" \
+ "http://labs.jboss.com/jbossweb/"
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\Welcome.lnk" \
+ "http://localhost:$R0/"
+
+ IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\JBoss Web Manager.lnk" \
+ "http://localhost:$R0/manager/html"
+
+NoManagerApp:
+
+ IfFileExists "$INSTDIR\webapps\webapps\docs" 0 NoDocumentaion
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\JBoss Web Documentation.lnk" \
+ "$INSTDIR\webapps\docs\index.html"
+
+NoDocumentaion:
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\Uninstall.lnk" \
+ "$INSTDIR\Uninstall.exe"
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\Program Directory.lnk" \
+ "$INSTDIR"
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\Monitor JBoss Web.lnk" \
+ "$INSTDIR\bin\jboss-webw.exe" \
+ '//MS//JBossWeb' \
+ "$INSTDIR\jboss-web.ico" 0 SW_SHOWNORMAL
+
+ CreateShortCut "$SMPROGRAMS\JBoss Web 2.1\Configure JBoss Web.lnk" \
+ "$INSTDIR\bin\jboss-webw.exe" \
+ '//ES//JBossWeb' \
+ "$INSTDIR\jboss-web.ico" 0 SW_SHOWNORMAL
+
+SectionEnd
+
+Section "Documentation" SecDocs
+
+ SectionIn 1 3
+ SetOutPath $INSTDIR\webapps\docs
+ File /r webapps\docs\*.*
+
+SectionEnd
+
+Section -post
+ nsExec::ExecToLog '"$INSTDIR\bin\jboss-web.exe" //US//JBossWeb --Classpath "$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm'
+ nsExec::ExecToLog '"$INSTDIR\bin\jboss-web.exe" //US//JBossWeb --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties" --StdOutput auto --StdError auto'
+
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+ WriteRegStr HKLM "SOFTWARE\JBoss.org\JBoss Web\2.1" "InstallPath" $INSTDIR
+ WriteRegStr HKLM "SOFTWARE\JBoss.org\JBoss Web\2.1" "Version" @VERSION@
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JBoss Web 2.1" \
+ "DisplayName" "JBoss Web 2.1 (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JBoss Web 2.1" \
+ "UninstallString" '"$INSTDIR\Uninstall.exe"'
+
+SectionEnd
+
+Function .onInit
+
+ ;Extract Install Options INI Files
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini"
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "jvm.ini"
+
+FunctionEnd
+
+Function SetChooseJVM
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_JVM_TITLE)" "$(TEXT_JVM_SUBTITLE)"
+ Call findJavaPath
+ Pop $3
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "jvm.ini" "Field 2" "State" $3
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "jvm.ini"
+FunctionEnd
+
+Function SetConfiguration
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_CONF_TITLE)" "$(TEXT_CONF_SUBTITLE)"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini"
+FunctionEnd
+
+Function Void
+FunctionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecJBossWeb} $(DESC_SecJBossWeb)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecJBossWebCore} $(DESC_SecJBossWebCore)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecJBossWebService} $(DESC_SecJBossWebService)
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecJBossWebNative} $(DESC_SecJBossWebNative)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+; =====================
+; CheckUserType Function
+; =====================
+;
+; Check the user type, and warn if it's not an administrator.
+; Taken from Examples/UserInfo that ships with NSIS.
+Function CheckUserType
+ ClearErrors
+ UserInfo::GetName
+ IfErrors Win9x
+ Pop $0
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" 0 +3
+ ; This is OK, do nothing
+ Goto done
+
+ MessageBox MB_OK|MB_ICONEXCLAMATION 'Note: the current user is not an administrator. \
+ To run JBoss Web as a Windows service, you must be an administrator. \
+ You can still run JBoss Web from the command-line as this type of user.'
+ Goto done
+
+ Win9x:
+ # This one means you don't need to care about admin or
+ # not admin because Windows 9x doesn't either
+ MessageBox MB_OK "Error! This DLL can't run under Windows 9x!"
+
+ done:
+FunctionEnd
+
+
+; =====================
+; FindJavaPath Function
+; =====================
+;
+; Find the JAVA_HOME used on the system, and put the result on the top of the
+; stack
+; Will return an empty string if the path cannot be determined
+;
+Function findJavaPath
+
+ ;ClearErrors
+
+ ;ReadEnvStr $1 JAVA_HOME
+
+ ;IfErrors 0 FoundJDK
+
+ ClearErrors
+
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "RuntimeLib"
+
+ ;FoundJDK:
+
+ IfErrors 0 NoErrors
+ StrCpy $1 ""
+
+NoErrors:
+
+ ClearErrors
+
+ ; Put the result in the stack
+ Push $1
+
+FunctionEnd
+
+
+; ====================
+; FindJVMPath Function
+; ====================
+;
+; Find the full JVM path, and put the result on top of the stack
+; Argument: JVM base path (result of findJavaPath)
+; Will return an empty string if the path cannot be determined
+;
+Function findJVMPath
+
+ ClearErrors
+
+ ;Step one: Is this a JRE path (Program Files\Java\XXX)
+ StrCpy $1 "$JavaHome"
+
+ StrCpy $2 "$1\bin\hotspot\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\server\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\client\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\classic\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+
+ ;Step two: Is this a JDK path (Program Files\XXX\jre)
+ StrCpy $1 "$JavaHome\jre"
+
+ StrCpy $2 "$1\bin\hotspot\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\server\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\client\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\classic\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+
+ ClearErrors
+ ;Step tree: Read defaults from registry
+
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "RuntimeLib"
+
+ IfErrors 0 FoundJvmDll
+ StrCpy $2 ""
+
+ FoundJvmDll:
+ ClearErrors
+
+ ; Put the result in the stack
+ Push $2
+
+FunctionEnd
+
+
+; ====================
+; CheckJvm Function
+; ====================
+;
+Function checkJvm
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $3 "jvm.ini" "Field 2" "State"
+ IfFileExists "$3\bin\java.exe" NoErrors1
+ MessageBox MB_OK|MB_ICONSTOP "No Java Virtual Machine found in folder:$\r$\n$3"
+ Quit
+NoErrors1:
+ StrCpy "$JavaHome" $3
+ Call findJVMPath
+ Pop $4
+ StrCmp $4 "" 0 NoErrors2
+ MessageBox MB_OK|MB_ICONSTOP "No Java Virtual Machine found in folder:$\r$\n$3"
+ Quit
+NoErrors2:
+
+FunctionEnd
+
+; ==================
+; Configure Function
+; ==================
+;
+; Display the configuration dialog boxes, read the values entered by the user,
+; and build the configuration files
+;
+Function configure
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "config.ini" "Field 2" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $R1 "config.ini" "Field 5" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $R2 "config.ini" "Field 7" "State"
+
+ IfSilent 0 +2
+ StrCpy $R4 'port="8080"'
+
+ IfSilent +2 0
+ StrCpy $R4 'port="$R0"'
+
+ IfSilent 0 +2
+ StrCpy $R5 ''
+
+ IfSilent Silent 0
+
+ ; Escape XML
+ Push $R1
+ Call xmlEscape
+ Pop $R1
+ Push $R2
+ Call xmlEscape
+ Pop $R2
+
+ StrCpy $R5 '<user name="$R1" password="$R2" roles="admin,manager" />'
+
+Silent:
+ DetailPrint 'HTTP/1.1 Connector configured on port "$R0"'
+ DetailPrint 'Admin user added: "$R1"'
+
+ SetOutPath $TEMP
+ File /r confinstall
+
+ ; Build final server.xml
+ Delete "$INSTDIR\conf\server.xml"
+ FileOpen $R9 "$INSTDIR\conf\server.xml" w
+
+ Push "$TEMP\confinstall\server_1.xml"
+ Call copyFile
+ FileWrite $R9 $R4
+ Push "$TEMP\confinstall\server_2.xml"
+ Call copyFile
+
+ FileClose $R9
+
+ DetailPrint "server.xml written"
+
+ ; Build final tomcat-users.xml
+
+ Delete "$INSTDIR\conf\tomcat-users.xml"
+ FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
+
+ Push "$TEMP\confinstall\tomcat-users_1.xml"
+ Call copyFile
+ FileWrite $R9 $R5
+ Push "$TEMP\confinstall\tomcat-users_2.xml"
+ Call copyFile
+
+ FileClose $R9
+
+ DetailPrint "tomcat-users.xml written"
+
+ RMDir /r "$TEMP\confinstall"
+
+FunctionEnd
+
+
+Function xmlEscape
+ Pop $0
+ ${StrRep} $0 $0 "&" "&"
+ ${StrRep} $0 $0 "$\"" """
+ ${StrRep} $0 $0 "<" "<"
+ ${StrRep} $0 $0 ">" ">"
+ Push $0
+FunctionEnd
+
+
+; =================
+; CopyFile Function
+; =================
+;
+; Copy specified file contents to $R9
+;
+Function copyFile
+
+ ClearErrors
+
+ Pop $0
+
+ FileOpen $1 $0 r
+
+ NoError:
+
+ FileRead $1 $2
+ IfErrors EOF 0
+ FileWrite $R9 $2
+
+ IfErrors 0 NoError
+
+ EOF:
+
+ FileClose $1
+
+ ClearErrors
+
+FunctionEnd
+
+
+;--------------------------------
+;Uninstaller Section
+
+Section Uninstall
+
+ Delete "$INSTDIR\modern.exe"
+ Delete "$INSTDIR\Uninstall.exe"
+
+ ; Stop JBoss Web service monitor if running
+ nsExec::ExecToLog '"$INSTDIR\bin\jboss-webw.exe" //MQ//JBossWeb'
+ ; Delete JBoss Web service
+ nsExec::ExecToLog '"$INSTDIR\bin\jboss-web.exe" //DS//JBossWeb'
+ ClearErrors
+
+ DeleteRegKey HKCR "JSPFile"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JBoss Web 2.1"
+ DeleteRegKey HKLM "SOFTWARE\JBoss.org\JBoss Web\2.1"
+ DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheJBossWebMonitor"
+ RMDir /r "$SMPROGRAMS\JBoss Web 2.1"
+ Delete "$INSTDIR\jboss-web.ico"
+ Delete "$INSTDIR\LICENSE"
+ RMDir /r "$INSTDIR\bin"
+ RMDir /r "$INSTDIR\lib"
+ Delete "$INSTDIR\conf\*.dtd"
+ RMDir "$INSTDIR\logs"
+ RMDir /r "$INSTDIR\webapps\docs"
+ RMDir /r "$INSTDIR\work"
+ RMDir /r "$INSTDIR\temp"
+ RMDir "$INSTDIR"
+
+ IfSilent Removed 0
+
+ ; if $INSTDIR was removed, skip these next ones
+ IfFileExists "$INSTDIR" 0 Removed
+ MessageBox MB_YESNO|MB_ICONQUESTION \
+ "Remove all files in your JBoss Web 2.1 directory? (If you have anything \
+ you created that you want to keep, click No)" IDNO Removed
+ RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits no
+ RMDir "$INSTDIR\webapps"
+ Delete "$INSTDIR\*.*"
+ RMDir /r "$INSTDIR"
+ Sleep 500
+ IfFileExists "$INSTDIR" 0 Removed
+ MessageBox MB_OK|MB_ICONEXCLAMATION \
+ "Note: $INSTDIR could not be removed."
+ Removed:
+
+SectionEnd
+
+;eof
Added: trunk/res/procrun/amd64/jboss-web.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/amd64/jboss-web.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/res/procrun/amd64/jboss-webw.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/amd64/jboss-webw.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/res/procrun/amd64/tomcat6.exe
===================================================================
(Binary files differ)
Deleted: trunk/res/procrun/amd64/tomcat6w.exe
===================================================================
(Binary files differ)
Added: trunk/res/procrun/ia64/jboss-web.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/ia64/jboss-web.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/res/procrun/ia64/jboss-webw.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/ia64/jboss-webw.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/res/procrun/ia64/tomcat6.exe
===================================================================
(Binary files differ)
Deleted: trunk/res/procrun/ia64/tomcat6w.exe
===================================================================
(Binary files differ)
Added: trunk/res/procrun/jboss-web.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/jboss-web.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/res/procrun/jboss-webw.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/jboss-webw.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/res/procrun/tomcat6.exe
===================================================================
(Binary files differ)
Deleted: trunk/res/procrun/tomcat6w.exe
===================================================================
(Binary files differ)
Deleted: trunk/res/tomcat.ico
===================================================================
(Binary files differ)
Deleted: trunk/res/tomcat.nsi
===================================================================
--- trunk/res/tomcat.nsi 2008-02-13 15:33:23 UTC (rev 419)
+++ trunk/res/tomcat.nsi 2008-02-13 17:02:20 UTC (rev 420)
@@ -1,693 +0,0 @@
-
-; Tomcat script for Nullsoft Installer
-; $Id: tomcat.nsi 524730 2007-04-02 06:24:33Z mturk $
-
- ;Compression options
- CRCCheck on
- SetCompressor /SOLID lzma
-
- Name "JBoss Web"
-
- ;Product information
- VIAddVersionKey ProductName "JBoss Web"
- VIAddVersionKey CompanyName "RedHat"
- VIAddVersionKey LegalCopyright "Copyright (c) 2006-2007 RedHat"
- VIAddVersionKey FileDescription "JBoss Web Installer"
- VIAddVersionKey FileVersion "2.1"
- VIAddVersionKey ProductVersion "@VERSION@"
- VIAddVersionKey Comments "jbossweb"
- VIAddVersionKey InternalName "jbossweb-@VERSION@.exe"
- VIProductVersion @VERSION_NUMBER@
-
-!include "MUI.nsh"
-!include "StrFunc.nsh"
-${StrRep}
- Var "JavaHome"
-
-
-
-;--------------------------------
-;Configuration
-
- !define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_RIGHT
- !define MUI_HEADERIMAGE_BITMAP header.bmp
- !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
- !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
- !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat6w.exe
- !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat6
- !define MUI_FINISHPAGE_NOREBOOTSUPPORT
-
- !define MUI_ABORTWARNING
-
- !define TEMP1 $R0
- !define TEMP2 $R1
-
- !define MUI_ICON tomcat.ico
- !define MUI_UNICON tomcat.ico
-
- ;General
- OutFile tomcat-installer.exe
-
- ;Install Options pages
- LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
- LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path selection."
- LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path selection"
-
- LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
- LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
- LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
-
- ;Install Page order
- !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- Page custom SetConfiguration Void "$(TEXT_CONF_PAGETITLE)"
- Page custom SetChooseJVM Void "$(TEXT_JVM_PAGETITLE)"
- !insertmacro MUI_PAGE_INSTFILES
- Page custom CheckUserType
- !insertmacro MUI_PAGE_FINISH
-
- ;Uninstall Page order
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
-
- ;License dialog
- LicenseData License.rtf
-
- ;Component-selection page
- ;Descriptions
- LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container."
- LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core."
- LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP."
- LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs Tomcat native .dll for better performance and scalability in production environments."
-; LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat source code."
- LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat."
- LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors."
- LangString DESC_SecExamples ${LANG_ENGLISH} "Installs some examples web applications."
- LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web application.";
-; LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web applications (WebDAV, balancer, etc)."
-
- ;Language
- !insertmacro MUI_LANGUAGE English
-
- ;Folder-select dialog
- InstallDir "$PROGRAMFILES\Apache Software Foundation\Tomcat 6.0"
-
- ;Install types
- InstType Normal
- InstType Minimum
- InstType Full
-
- ; Main registry key
- InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" ""
-
- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
- ReserveFile "jvm.ini"
- ReserveFile "config.ini"
-
-;--------------------------------
-;Installer Sections
-
-SubSection "Tomcat" SecTomcat
-
-Section "Core" SecTomcatCore
-
- SectionIn 1 2 3 RO
-
- IfSilent +2 0
- Call checkJvm
-
- SetOutPath $INSTDIR
- File tomcat.ico
- File LICENSE
- SetOutPath $INSTDIR\lib
- File /r lib\*.*
- SetOutPath $INSTDIR\logs
- File /nonfatal /r logs\*.*
- SetOutPath $INSTDIR\work
- File /nonfatal /r work\*.*
- SetOutPath $INSTDIR\temp
- File /nonfatal /r temp\*.*
- SetOutPath $INSTDIR\bin
- File bin\bootstrap.jar
- File bin\tomcat-juli.jar
- File bin\*.exe
- SetOutPath $INSTDIR\conf
- File conf\*.*
- SetOutPath $INSTDIR\webapps\ROOT
- File /r webapps\ROOT\*.*
- SetOutPath $INSTDIR\webapps\host-manager
- File /r webapps\host-manager\*.*
- SetOutPath $INSTDIR\webapps\manager
- File /r webapps\manager\*.*
-
- Call configure
- Call findJavaPath
- Pop $2
-
- IfSilent +2 0
- !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
-
- StrCpy "$JavaHome" $2
- Call findJVMPath
- Pop $2
-
- DetailPrint "Using Jvm: $2"
-
- InstallRetry:
- ClearErrors
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName "Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
- Pop $0
- StrCmp $0 "0" InstallOk
- MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
- "Failed to install Tomcat6 service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \
- /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
- Quit
- InstallOk:
- ClearErrors
-
-SectionEnd
-
-Section "Service" SecTomcatService
-
- SectionIn 3
-
- IfSilent 0 +3
- Call findJavaPath
- Pop $2
-
- IfSilent +2 0
- !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
-
- StrCpy "$JavaHome" $2
- Call findJVMPath
- Pop $2
-
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Startup auto'
- ; Bahave like Apache Httpd (put the icon in try on login)
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor" '"$INSTDIR\bin\tomcat6w.exe" //MS//Tomcat6'
-
- ClearErrors
-
-SectionEnd
-
-Section "Native" SecTomcatNative
-
- SectionIn 3
-
- ; tcnative-1.dll is a symlink to the tcnative-1-ipv4.dll
- ; If IPV6 support is required, download the tcnative-1-ipv6.dll insted
- ; The tcnative-1.dll from heanet.ie comes with APR 1.2.8 and OpenSSL 0.9.8e compiled in.
- ; TODO: Depending on the JVM download the 32 or 64 bit version.
- NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll
- Pop $0
- StrCmp $0 success success
- SetDetailsView show
- DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll: $0"
- success:
-
- ClearErrors
-
-SectionEnd
-
-;Section "Source Code" SecTomcatSource
-;
-; SectionIn 3
-; SetOutPath $INSTDIR
-; File /r src
-;
-;SectionEnd
-
-SubSectionEnd
-
-Section "Start Menu Items" SecMenu
-
- SectionIn 1 2 3
-
- !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
-
- SetOutPath "$SMPROGRAMS\Apache Tomcat 6.0"
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Home Page.lnk" \
- "http://tomcat.apache.org/"
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \
- "http://localhost:$R0/"
-
-; IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp
-;
-; CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \
-; "http://localhost:$R0/admin/"
-;NoAdminApp:
-
- IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \
- "http://localhost:$R0/manager/html"
-
-NoManagerApp:
-
- IfFileExists "$INSTDIR\webapps\webapps\tomcat-docs" 0 NoDocumentaion
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Documentation.lnk" \
- "$INSTDIR\webapps\tomcat-docs\index.html"
-
-NoDocumentaion:
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Uninstall Tomcat 6.0.lnk" \
- "$INSTDIR\Uninstall.exe"
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat 6.0 Program Directory.lnk" \
- "$INSTDIR"
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Monitor Tomcat.lnk" \
- "$INSTDIR\bin\tomcat6w.exe" \
- '//MS//Tomcat6' \
- "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Configure Tomcat.lnk" \
- "$INSTDIR\bin\tomcat6w.exe" \
- '//ES//Tomcat6' \
- "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
-
-SectionEnd
-
-Section "Documentation" SecDocs
-
- SectionIn 1 3
- SetOutPath $INSTDIR\webapps\docs
- File /r webapps\docs\*.*
-
-SectionEnd
-
-Section "Examples" SecExamples
-
- SectionIn 3
-
- SetOverwrite on
- SetOutPath $INSTDIR\webapps\examples
- File /r webapps\examples\*.*
-
-SectionEnd
-
-;Section "Administration" SecAdmin
-;
-; SectionIn 3
-;
-; SetOutPath $INSTDIR\webapps
-; File /r webapps\admin
-; SetOutPath $INSTDIR\conf\Catalina\localhost
-; File conf\Catalina\localhost\admin.xml
-;
-;SectionEnd
-
-;Section "Webapps" SecWebapps
-;
-; SectionIn 3
-;
-; SetOutPath $INSTDIR\webapps
-; File /nonfatal /r webapps\balancer
-; File /nonfatal /r webapps\webdav
-;
-;SectionEnd
-
-;Section "Compatibility" SecCompat
-;
-; SetOutPath $INSTDIR
-; File /oname=bin\jmx.jar ..\compat\bin\jmx.jar
-; File /oname=common\endorsed\xercesImpl.jar ..\compat\common\endorsed\xercesImpl.jar
-; File /oname=common\endorsed\xml-apis.jar ..\compat\common\endorsed\xml-apis.jar
-;
-;SectionEnd
-
-Section -post
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Classpath "$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties" --StdOutput auto --StdError auto'
-
- WriteUninstaller "$INSTDIR\Uninstall.exe"
-
- WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" "InstallPath" $INSTDIR
- WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" "Version" @VERSION@
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0" \
- "DisplayName" "Apache Tomcat 6.0 (remove only)"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0" \
- "UninstallString" '"$INSTDIR\Uninstall.exe"'
-
-SectionEnd
-
-Function .onInit
-
- ;Extract Install Options INI Files
- !insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini"
- !insertmacro MUI_INSTALLOPTIONS_EXTRACT "jvm.ini"
-
-FunctionEnd
-
-Function SetChooseJVM
- !insertmacro MUI_HEADER_TEXT "$(TEXT_JVM_TITLE)" "$(TEXT_JVM_SUBTITLE)"
- Call findJavaPath
- Pop $3
- !insertmacro MUI_INSTALLOPTIONS_WRITE "jvm.ini" "Field 2" "State" $3
- !insertmacro MUI_INSTALLOPTIONS_DISPLAY "jvm.ini"
-FunctionEnd
-
-Function SetConfiguration
- !insertmacro MUI_HEADER_TEXT "$(TEXT_CONF_TITLE)" "$(TEXT_CONF_SUBTITLE)"
- !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini"
-FunctionEnd
-
-Function Void
-FunctionEnd
-
-;--------------------------------
-;Descriptions
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} $(DESC_SecTomcatService)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatNative} $(DESC_SecTomcatNative)
-; !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource} $(DESC_SecTomcatSource)
-; !insertmacro MUI_DESCRIPTION_TEXT ${SecCompat} $(DESC_SecCompat)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples)
-; !insertmacro MUI_DESCRIPTION_TEXT ${SecAdmin} $(DESC_SecAdmin)
-; !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-; =====================
-; CheckUserType Function
-; =====================
-;
-; Check the user type, and warn if it's not an administrator.
-; Taken from Examples/UserInfo that ships with NSIS.
-Function CheckUserType
- ClearErrors
- UserInfo::GetName
- IfErrors Win9x
- Pop $0
- UserInfo::GetAccountType
- Pop $1
- StrCmp $1 "Admin" 0 +3
- ; This is OK, do nothing
- Goto done
-
- MessageBox MB_OK|MB_ICONEXCLAMATION 'Note: the current user is not an administrator. \
- To run Tomcat as a Windows service, you must be an administrator. \
- You can still run Tomcat from the command-line as this type of user.'
- Goto done
-
- Win9x:
- # This one means you don't need to care about admin or
- # not admin because Windows 9x doesn't either
- MessageBox MB_OK "Error! This DLL can't run under Windows 9x!"
-
- done:
-FunctionEnd
-
-
-; =====================
-; FindJavaPath Function
-; =====================
-;
-; Find the JAVA_HOME used on the system, and put the result on the top of the
-; stack
-; Will return an empty string if the path cannot be determined
-;
-Function findJavaPath
-
- ;ClearErrors
-
- ;ReadEnvStr $1 JAVA_HOME
-
- ;IfErrors 0 FoundJDK
-
- ClearErrors
-
- ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
- ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "JavaHome"
- ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "RuntimeLib"
-
- ;FoundJDK:
-
- IfErrors 0 NoErrors
- StrCpy $1 ""
-
-NoErrors:
-
- ClearErrors
-
- ; Put the result in the stack
- Push $1
-
-FunctionEnd
-
-
-; ====================
-; FindJVMPath Function
-; ====================
-;
-; Find the full JVM path, and put the result on top of the stack
-; Argument: JVM base path (result of findJavaPath)
-; Will return an empty string if the path cannot be determined
-;
-Function findJVMPath
-
- ClearErrors
-
- ;Step one: Is this a JRE path (Program Files\Java\XXX)
- StrCpy $1 "$JavaHome"
-
- StrCpy $2 "$1\bin\hotspot\jvm.dll"
- IfFileExists "$2" FoundJvmDll
- StrCpy $2 "$1\bin\server\jvm.dll"
- IfFileExists "$2" FoundJvmDll
- StrCpy $2 "$1\bin\client\jvm.dll"
- IfFileExists "$2" FoundJvmDll
- StrCpy $2 "$1\bin\classic\jvm.dll"
- IfFileExists "$2" FoundJvmDll
-
- ;Step two: Is this a JDK path (Program Files\XXX\jre)
- StrCpy $1 "$JavaHome\jre"
-
- StrCpy $2 "$1\bin\hotspot\jvm.dll"
- IfFileExists "$2" FoundJvmDll
- StrCpy $2 "$1\bin\server\jvm.dll"
- IfFileExists "$2" FoundJvmDll
- StrCpy $2 "$1\bin\client\jvm.dll"
- IfFileExists "$2" FoundJvmDll
- StrCpy $2 "$1\bin\classic\jvm.dll"
- IfFileExists "$2" FoundJvmDll
-
- ClearErrors
- ;Step tree: Read defaults from registry
-
- ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
- ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "RuntimeLib"
-
- IfErrors 0 FoundJvmDll
- StrCpy $2 ""
-
- FoundJvmDll:
- ClearErrors
-
- ; Put the result in the stack
- Push $2
-
-FunctionEnd
-
-
-; ====================
-; CheckJvm Function
-; ====================
-;
-Function checkJvm
-
- !insertmacro MUI_INSTALLOPTIONS_READ $3 "jvm.ini" "Field 2" "State"
- IfFileExists "$3\bin\java.exe" NoErrors1
- MessageBox MB_OK|MB_ICONSTOP "No Java Virtual Machine found in folder:$\r$\n$3"
- Quit
-NoErrors1:
- StrCpy "$JavaHome" $3
- Call findJVMPath
- Pop $4
- StrCmp $4 "" 0 NoErrors2
- MessageBox MB_OK|MB_ICONSTOP "No Java Virtual Machine found in folder:$\r$\n$3"
- Quit
-NoErrors2:
-
-FunctionEnd
-
-; ==================
-; Configure Function
-; ==================
-;
-; Display the configuration dialog boxes, read the values entered by the user,
-; and build the configuration files
-;
-Function configure
-
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "config.ini" "Field 2" "State"
- !insertmacro MUI_INSTALLOPTIONS_READ $R1 "config.ini" "Field 5" "State"
- !insertmacro MUI_INSTALLOPTIONS_READ $R2 "config.ini" "Field 7" "State"
-
- IfSilent 0 +2
- StrCpy $R4 'port="8080"'
-
- IfSilent +2 0
- StrCpy $R4 'port="$R0"'
-
- IfSilent 0 +2
- StrCpy $R5 ''
-
- IfSilent Silent 0
-
- ; Escape XML
- Push $R1
- Call xmlEscape
- Pop $R1
- Push $R2
- Call xmlEscape
- Pop $R2
-
- StrCpy $R5 '<user name="$R1" password="$R2" roles="admin,manager" />'
-
-Silent:
- DetailPrint 'HTTP/1.1 Connector configured on port "$R0"'
- DetailPrint 'Admin user added: "$R1"'
-
- SetOutPath $TEMP
- File /r confinstall
-
- ; Build final server.xml
- Delete "$INSTDIR\conf\server.xml"
- FileOpen $R9 "$INSTDIR\conf\server.xml" w
-
- Push "$TEMP\confinstall\server_1.xml"
- Call copyFile
- FileWrite $R9 $R4
- Push "$TEMP\confinstall\server_2.xml"
- Call copyFile
-
- FileClose $R9
-
- DetailPrint "server.xml written"
-
- ; Build final tomcat-users.xml
-
- Delete "$INSTDIR\conf\tomcat-users.xml"
- FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
-
- Push "$TEMP\confinstall\tomcat-users_1.xml"
- Call copyFile
- FileWrite $R9 $R5
- Push "$TEMP\confinstall\tomcat-users_2.xml"
- Call copyFile
-
- FileClose $R9
-
- DetailPrint "tomcat-users.xml written"
-
- RMDir /r "$TEMP\confinstall"
-
-FunctionEnd
-
-
-Function xmlEscape
- Pop $0
- ${StrRep} $0 $0 "&" "&"
- ${StrRep} $0 $0 "$\"" """
- ${StrRep} $0 $0 "<" "<"
- ${StrRep} $0 $0 ">" ">"
- Push $0
-FunctionEnd
-
-
-; =================
-; CopyFile Function
-; =================
-;
-; Copy specified file contents to $R9
-;
-Function copyFile
-
- ClearErrors
-
- Pop $0
-
- FileOpen $1 $0 r
-
- NoError:
-
- FileRead $1 $2
- IfErrors EOF 0
- FileWrite $R9 $2
-
- IfErrors 0 NoError
-
- EOF:
-
- FileClose $1
-
- ClearErrors
-
-FunctionEnd
-
-
-;--------------------------------
-;Uninstaller Section
-
-Section Uninstall
-
- Delete "$INSTDIR\modern.exe"
- Delete "$INSTDIR\Uninstall.exe"
-
- ; Stop Tomcat service monitor if running
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6w.exe" //MQ//Tomcat6'
- ; Delete Tomcat service
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //DS//Tomcat6'
- ClearErrors
-
- DeleteRegKey HKCR "JSPFile"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0"
- DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0"
- DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor"
- RMDir /r "$SMPROGRAMS\Apache Tomcat 6.0"
- Delete "$INSTDIR\tomcat.ico"
- Delete "$INSTDIR\LICENSE"
- RMDir /r "$INSTDIR\bin"
- RMDir /r "$INSTDIR\lib"
- Delete "$INSTDIR\conf\*.dtd"
- RMDir "$INSTDIR\logs"
-; RMDir /r "$INSTDIR\webapps\balancer"
- RMDir /r "$INSTDIR\webapps\docs"
- RMDir /r "$INSTDIR\webapps\examples"
-; RMDir /r "$INSTDIR\webapps\webdav"
- RMDir /r "$INSTDIR\work"
- RMDir /r "$INSTDIR\temp"
- RMDir "$INSTDIR"
-
- IfSilent Removed 0
-
- ; if $INSTDIR was removed, skip these next ones
- IfFileExists "$INSTDIR" 0 Removed
- MessageBox MB_YESNO|MB_ICONQUESTION \
- "Remove all files in your Tomcat 6.0 directory? (If you have anything \
- you created that you want to keep, click No)" IDNO Removed
- RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits no
- RMDir "$INSTDIR\webapps"
- Delete "$INSTDIR\*.*"
- RMDir /r "$INSTDIR"
- Sleep 500
- IfFileExists "$INSTDIR" 0 Removed
- MessageBox MB_OK|MB_ICONEXCLAMATION \
- "Note: $INSTDIR could not be removed."
- Removed:
-
-SectionEnd
-
-;eof
Modified: trunk/webapps/docs/images/jboss_logo.gif
===================================================================
(Binary files differ)
Added: trunk/webapps/docs/images/jbossweblogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/jbossweblogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/webapps/manager/images/jboss_logo.gif
===================================================================
(Binary files differ)
16 years, 10 months
- 1
- 0
JBossWeb SVN: r419 - trunk/java/org/apache/catalina/startup.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-13 10:33:23 -0500 (Wed, 13 Feb 2008)
New Revision: 419
Modified:
trunk/java/org/apache/catalina/startup/WebRuleSet.java
Log:
- Remove duplicate listener rule.
Modified: trunk/java/org/apache/catalina/startup/WebRuleSet.java
===================================================================
--- trunk/java/org/apache/catalina/startup/WebRuleSet.java 2008-02-13 15:32:30 UTC (rev 418)
+++ trunk/java/org/apache/catalina/startup/WebRuleSet.java 2008-02-13 15:33:23 UTC (rev 419)
@@ -195,9 +195,6 @@
digester.addCallMethod(prefix + "web-app/filter-mapping/dispatcher",
"setDispatcher", 0);
- digester.addCallMethod(prefix + "web-app/listener/listener-class",
- "addApplicationListener", 0);
-
digester.addRule(prefix + "web-app/jsp-config",
jspConfig);
16 years, 10 months
- 1
- 0
JBossWeb SVN: r418 - trunk/java/org/apache/tomcat/util/net.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-13 10:32:30 -0500 (Wed, 13 Feb 2008)
New Revision: 418
Modified:
trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Log:
- JBESB-1378: Send some bytes if deferAccept is in use.
Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-13 13:37:12 UTC (rev 417)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-13 15:32:30 UTC (rev 418)
@@ -780,6 +780,10 @@
// connection quicker
s.setSoLinger(true, 0);
}
+ // If deferAccept is enabled, send at least one byte
+ if (deferAccept) {
+ s.getOutputStream().write(" ".getBytes());
+ }
} catch (Exception e) {
// Ignore
} finally {
16 years, 10 months
- 1
- 0
JBossWeb SVN: r417 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-02-13 08:37:12 -0500 (Wed, 13 Feb 2008)
New Revision: 417
Modified:
trunk/java/org/apache/catalina/core/ApplicationContext.java
Log:
- Strict compliant only for the check for / prefix.
Modified: trunk/java/org/apache/catalina/core/ApplicationContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/ApplicationContext.java 2008-02-10 23:19:54 UTC (rev 416)
+++ trunk/java/org/apache/catalina/core/ApplicationContext.java 2008-02-13 13:37:12 UTC (rev 417)
@@ -40,6 +40,7 @@
import javax.servlet.ServletContextAttributeListener;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Host;
import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ApplicationParameter;
@@ -507,7 +508,7 @@
public InputStream getResourceAsStream(String path) {
path = normalize(path);
- if (path == null || !path.startsWith("/"))
+ if (path == null || (Globals.STRICT_SERVLET_COMPLIANCE && !path.startsWith("/")))
return (null);
DirContext resources = context.getResources();
16 years, 10 months
- 1
- 0