major update to Railo 4.0.2.002

- more info at http://www.getrailo.org/index.cfm/whats-up/railo-40-released/
This commit is contained in:
sthen 2013-01-30 23:37:32 +00:00
parent 3f8bdb2f69
commit fa3de30eb1
4 changed files with 97 additions and 70 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2012/06/30 20:47:53 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2013/01/30 23:37:32 sthen Exp $
COMMENT= open-source CFML engine
V= 3.3.4.003
V= 4.0.2.002
DISTNAME= railo-$V
EXTRACT_SUFX= .war
@ -39,14 +39,15 @@ do-extract:
# patch/edit/update-patches cycle. Also strips horizontal whitespace at eol.
pre-patch:
perl -pi -e 's,<servlet-name>,<servlet-name>PKG_,g;' \
-e 's,\h*$$,,;' ${WRKSRC}/WEB-INF/web.xml
-e 's,\h*\r*$$,,;' ${WRKSRC}/WEB-INF/web.xml
post-patch:
perl -pi -e 's,/var/tomcat/,${CATALINA_BASE}/,g' ${WRKSRC}/WEB-INF/web.xml
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/railo ${PREFIX}/lib ${PREFIX}/conf
${INSTALL_DATA} ${WRKSRC}/WEB-INF/lib/* ${PREFIX}/lib/
cd ${WRKSRC}/WEB-INF/lib && pax -rw * ${PREFIX}/lib/
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/*
${INSTALL_DATA} ${WRKSRC}/index.cfm ${PREFIX}/railo/index.cfm.dist
${INSTALL_DATA} ${WRKSRC}/WEB-INF/web.xml ${PREFIX}/conf/web-railo.xml.dist

View File

@ -1,5 +1,2 @@
MD5 (railo-3.3.4.003.war) = mu1rIdAFrRLjYts2AqehTQ==
RMD160 (railo-3.3.4.003.war) = uVFW6pAotMH2L7ZIXpkMzaVK9mI=
SHA1 (railo-3.3.4.003.war) = eeniyR+8tAIM/QTrn02LmsvOa28=
SHA256 (railo-3.3.4.003.war) = 4uLYlbR9lg2jmLHER+yYjG15foEe4MGckvsSZojlBkQ=
SIZE (railo-3.3.4.003.war) = 46373828
SHA256 (railo-4.0.2.002.war) = rA2tqZuo1AerCH6msYQZMdV+yBvgifZfAhP2FZdfGHs=
SIZE (railo-4.0.2.002.war) = 59166761

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-WEB-INF_web_xml,v 1.1.1.1 2012/04/17 13:12:28 sthen Exp $
$OpenBSD: patch-WEB-INF_web_xml,v 1.2 2013/01/30 23:37:32 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,46 +14,58 @@ 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 Mon Apr 9 14:27:42 2012
+++ WEB-INF/web.xml Mon Apr 9 14:27:42 2012
@@ -1,8 +1,3 @@
--- 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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
<display-name>Railo</display-name>
<servlet>
<servlet-name>PKG_CFMLServlet</servlet-name>
@@ -10,14 +5,14 @@
<servlet-class>railo.loader.servlet.CFMLServlet</servlet-class>
<init-param>
<param-name>configuration</param-name>
- <param-value>/WEB-INF/railo/</param-value>
+ <param-value>/var/tomcat/railo/web-config/{web-context-hash}/</param-value>
<description>Configuraton directory</description>
</init-param>
- <!-- init-param>
+ <init-param>
<param-name>railo-server-root</param-name>
- <param-value>.</param-value>
+ <param-value>/var/tomcat/railo/server-config/</param-value>
<description>directory where railo root directory is stored</description>
- </init-param -->
+ </init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
@@ -96,12 +91,3 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
-->
-<welcome-file-list>
- <welcome-file>index.cfm</welcome-file>
- <welcome-file>index.cfml</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
-</welcome-file-list>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- metadata-complete="true"
- 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 -->
<!-- write permissions to that folder. leave commented for defaults. -->
- <!--
<init-param>
<param-name>railo-server-root</param-name>
- <param-value>/var/Railo/config/server/</param-value>
+ <param-value>/var/tomcat/railo/server-config/</param-value>
<description>Railo Server configuration directory (for Server-wide configurations, settings, and libraries)</description>
</init-param>
- !-->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- to specify the location of the Web Contexts' config and libraries, -->
<!-- uncomment the init-param below. make sure that the param-value -->
<!-- points to a valid folder, and that the process that runs Railo has -->
<!-- write permissions to that folder. the {web-context-label} can be -->
<!-- set in Railo Server Admin homepage. leave commented for defaults. -->
- <!--
<init-param>
<param-name>railo-web-directory</param-name>
- <param-value>/var/Railo/config/web/{web-context-label}/</param-value>
+ <param-value>/var/tomcat/railo/web-config/{web-context-label}/</param-value>
<description>Railo Web Directory (for Website-specific configurations, settings, and libraries)</description>
</init-param>
- !-->
<load-on-startup>1</load-on-startup>
</servlet>
@@ -120,13 +110,3 @@
- <!-- default file to execute if directory is called with no file name, e.g. http://mysite.com/ !-->
- <welcome-file-list>
- <welcome-file>index.cfm</welcome-file>
- <welcome-file>index.cfml</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
\ No newline at end of file

View File

@ -1,16 +1,23 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/04/17 13:12:28 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/01/30 23:37:32 sthen Exp $
@extraunexec rm -rf %D/railo/server-config/* %D/railo/web-config/*
@extraunexec rm -rf %D/webapps/ROOT/WEB-INF/flex
conf/
conf/web-railo.xml.dist
@owner _tomcat
@group _tomcat
@sample conf/web-railo.xml
@group
@owner
@group
lib/
lib/ESAPI.jar
lib/License.txt
lib/PDFBox.jar
lib/PDFRenderer.jar
lib/antlr.jar
lib/apache-commons-httpclient.jar
lib/apache-commons-httpcore.jar
lib/apache-commons-httpmime.jar
lib/apache-commons-sanselan.jar
lib/apache-jakarta-commons-codec.jar
lib/apache-jakarta-commons-collections.jar
lib/apache-jakarta-commons-compress.jar
@ -34,7 +41,10 @@ lib/apache-lucene-similarity.jar
lib/apache-lucene-snowball.jar
lib/apache-lucene-spellchecker.jar
lib/apache-lucene.jar
lib/apache-poi-ooxml-schemas.jar
lib/apache-poi-ooxml.jar
lib/apache-poi-tm-extractors.jar
lib/apache-poi.jar
lib/apache-ws-axis-ant.jar
lib/apache-ws-axis.jar
lib/apache-xml-xalan.jar
@ -59,6 +69,7 @@ lib/icepdf-core.jar
lib/jacob.jar
lib/javaparser.jar
lib/javassist.jar
lib/javasysmon.jar
lib/jcommon.jar
lib/jencrypt.jar
lib/jffmpeg.jar
@ -70,38 +81,42 @@ lib/jpedal_gpl.jar
lib/jta.jar
lib/jtds.jar
lib/jug.jar
lib/license-apache.txt
lib/license-eclipse.txt
lib/license-hypersonic.txt
lib/license-jacob.txt
lib/license-janino.txt
lib/license-jencrypt.txt
lib/license-jmimemagic.txt
lib/license-joda.txt
lib/license-jtds.txt
lib/license-mssql.txt
lib/license-mysql.txt
lib/license-openamf.txt
lib/license-pd4ml.txt
lib/license-pdfbox.txt
lib/license-sun.txt
lib/license-tagsoup.txt
lib/junit.jar
lib/license/
lib/license/license-apache.txt
lib/license/license-eclipse.txt
lib/license/license-hypersonic.txt
lib/license/license-jacob.txt
lib/license/license-janino.txt
lib/license/license-javasysmon.txt
lib/license/license-jencrypt.txt
lib/license/license-jmimemagic.txt
lib/license/license-joda.txt
lib/license/license-jtds.txt
lib/license/license-mssql.txt
lib/license/license-mysql.txt
lib/license/license-openamf.txt
lib/license/license-pd4ml.txt
lib/license/license-pdfbox.txt
lib/license/license-sun.txt
lib/license/license-tagsoup.txt
lib/lowagie.itext.jar
lib/metadata-extractor.jar
lib/microsoft-msbase.jar
lib/microsoft-mssqlserver.jar
lib/microsoft-msutil.jar
lib/microsoft-sqljdbc.jar
lib/mysql-connector-java-bin.jar
lib/objectweb-asm-all.jar
lib/ojdbc14.jar
lib/openamf-astranslator.jar
lib/openamf.jar
lib/postgresql.jar
lib/railo-sl4j.jar
lib/railo.jar
lib/resolver.jar
lib/serializer.jar
lib/slf4j-api.jar
lib/ss_css2.jar
lib/stax-api.jar
lib/sun-activation.jar
lib/sun-jai_codec.jar
lib/sun-jai_core.jar
@ -117,8 +132,10 @@ lib/sun-xml.saaj.jar
lib/tagsoup.jar
lib/versions
lib/w3c-dom.jar
lib/web.xml.sample
lib/xdb.jar
lib/xml-apis.jar
lib/xmlbeans.jar
lib/xmlparserv2.jar
@owner _tomcat
@group _tomcat