update to Railo 4.1.0.004

This commit is contained in:
sthen 2013-03-19 22:32:28 +00:00
parent f0cad29d74
commit 7a2709cf4c
4 changed files with 13 additions and 13 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2013/03/11 11:20:28 espie Exp $
# $OpenBSD: Makefile,v 1.9 2013/03/19 22:32:28 sthen Exp $
COMMENT= open-source CFML engine
V= 4.0.3.006
V= 4.1.0.004
DISTNAME= railo-$V
EXTRACT_SUFX= .war

View File

@ -1,2 +1,2 @@
SHA256 (railo-4.0.3.006.war) = 2fuiO9A+noZ+qQJjfWsVBvZSXyCUhOl46hXSzZe9Xaw=
SIZE (railo-4.0.3.006.war) = 59912397
SHA256 (railo-4.1.0.004.war) = EAM8TAunLcTelIE/AXCGB57AweyS1mbCVSCv/LYUGPg=
SIZE (railo-4.1.0.004.war) = 60130462

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-WEB-INF_web_xml,v 1.2 2013/01/30 23:37:32 sthen Exp $
$OpenBSD: patch-WEB-INF_web_xml,v 1.3 2013/03/19 22:32:28 sthen Exp $
- Strip anything outside of <web-app> tag so this file can be used
directly as an include in the main tomcat web.xml <web-app> section.
@ -14,9 +14,9 @@ a single host.
http://jamiekrug.com/blog/index.cfm/2009/4/1/railo-jars-on-jboss-or-tomcat-tips-and-tricks
--- WEB-INF/web.xml.orig Wed Jan 30 12:20:25 2013
+++ WEB-INF/web.xml Wed Jan 30 12:20:29 2013
@@ -1,8 +1,2 @@
--- WEB-INF/web.xml.orig Tue Mar 19 18:06:10 2013
+++ WEB-INF/web.xml Tue Mar 19 18:06:10 2013
@@ -1,9 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -25,6 +25,7 @@ http://jamiekrug.com/blog/index.cfm/2009/4/1/railo-jars-on-jboss-or-tomcat-tips-
- version="2.5">
@@ -24,26 +18,22 @@
<!-- uncomment the init-param below. make sure that the param-value -->
<!-- points to a valid folder, and that the process that runs Railo has -->

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $
$OpenBSD: README,v 1.4 2013/03/19 22:32:28 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -79,8 +79,8 @@ as expected, and don't forget to rotate/archive them as appropriate.
Patch to unmodified Tomcat web.xml
==================================
--- web.xml.orig Fri Apr 20 13:16:35 2012
+++ web.xml Fri Apr 20 16:06:21 2012
--- web.xml.orig Tue Mar 19 22:29:42 2013
+++ web.xml Tue Mar 19 22:29:55 2013
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE root [
@ -90,11 +90,10 @@ Patch to unmodified Tomcat web.xml
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -4275,9 +4279,12 @@
@@ -4599,9 +4603,11 @@
<!-- to use within your application. -->
<welcome-file-list>
+ <welcome-file>index.cfml</welcome-file>
+ <welcome-file>index.cfm</welcome-file>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>