Attachment #74232 for bug #107422

View | Details | Raw Unified | Return to bug 107422
Collapse All | Expand All

Lines 6-12 Link Here

(-)./Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= resin	8	PORTNAME= resin
9	PORTVERSION= 3.0.22	9	PORTVERSION= 3.1.0
10	CATEGORIES= www java	10	CATEGORIES= www java
11	MASTER_SITES= http://www.caucho.com/download/	11	MASTER_SITES= http://www.caucho.com/download/
12		12

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (resin-3.0.22.tar.gz) = e79b0e69abceb480eb2c62b3286af530	1	MD5 (resin-3.1.0.tar.gz) = ed16e0645adbef9c6ba69f4e4b881b44
2	SHA256 (resin-3.0.22.tar.gz) = c02a2020ee4e2ae6c73c79a855627ba6e3aa0530f072c0cb980cf81db40b3867	2	SHA256 (resin-3.1.0.tar.gz) = 1eb207d20db0af81b150ed3f40f1f21ffc26cb19b21cb8a545095818175ff5a0
3	SIZE (resin-3.0.22.tar.gz) = 8196321	3	SIZE (resin-3.1.0.tar.gz) = 13065031




--- conf/resin.conf.orig	Tue Oct 24 16:42:41 2006
+++ conf/resin.conf	Tue Jan  2 10:49:00 2007
@@ -130,7 +130,7 @@
     </resin:if>
          - because the web server will log this information.
         -->
-      <access-log path="logs/access.log" 
+      <access-log path="log/access.log" 
             format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
             rollover-period="1W"/>
 
     <!-- includes the app-default for default web-app behavior -->
     </host-default>
 
     <!-- includes the web-app-default for default web-app behavior -->
-    <resin:import path="${resin.home}/conf/app-default.xml"/>
+    <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
 
     <!--
        - Defaults applied to each web-app.




@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.11 2005/12/20 22:38:35 edwin Exp $
%%APP_NAME%%/lib/activation.jar
%%APP_NAME%%/lib/ejb-15.jar
%%APP_NAME%%/lib/ejb-20.jar
%%APP_NAME%%/lib/ejb-30.jar
%%APP_NAME%%/lib/j2ee-deploy-10.jar
%%APP_NAME%%/lib/j2ee-management-10.jar
%%APP_NAME%%/lib/javamail-14.jar
%%APP_NAME%%/lib/jaxb-api.jar
%%APP_NAME%%/lib/jaxb-impl.jar
%%APP_NAME%%/lib/jaxb-xjc.jar
%%APP_NAME%%/lib/jaxb1-impl.jar
%%APP_NAME%%/lib/jaxrpc-15.jar
%%APP_NAME%%/lib/jca-15.jar
%%APP_NAME%%/lib/jms-11.jar
%%APP_NAME%%/lib/jpa-15.jar
%%APP_NAME%%/lib/jsdk-15.jar
%%APP_NAME%%/lib/jstl-11.jar
%%APP_NAME%%/lib/jta-101.jar
%%APP_NAME%%/lib/portlet-10.jar
%%APP_NAME%%/lib/quercus.jar
%%APP_NAME%%/lib/resin-util.jar
%%APP_NAME%%/lib/resin.jar
%%APP_NAME%%/lib/resinboot.jar
%%APP_NAME%%/lib/script-10.jar
%%APP_NAME%%/lib/webutil.jar
%%APP_NAME%%/webapps/ROOT/index.jsp

Return to bug 107422

Lines 1-20 Link Here

(-)./files/patch-resin.conf (-16 / +7 lines)
1	--- conf/resin.conf.orig Tue Aug 8 11:41:32 2006	1	--- conf/resin.conf.orig Tue Oct 24 16:42:41 2006
2	+++ conf/resin.conf Tue Aug 8 11:41:56 2006	2	+++ conf/resin.conf Tue Jan 2 10:49:00 2007
3	@@ -210,7 +210,7 @@	3	@@ -130,7 +130,7 @@
4	- With another web server, like Apache, this can be commented out	4	</resin:if>
5	- because the web server will log this information.
6	-->
7	- <access-log path="logs/access.log"
8	+ <access-log path="log/access.log"
9	format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
10	rollover-period="1W"/>
11		5
12	@@ -238,7 +238,7 @@	6	<!-- includes the app-default for default web-app behavior -->
13	</host-default>
14
15	<!-- includes the web-app-default for default web-app behavior -->
16	- <resin:import path="${resin.home}/conf/app-default.xml"/>	7	- <resin:import path="${resin.home}/conf/app-default.xml"/>
17	+ <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>	8	+ <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
18		9
19	<!-- configures a deployment directory for virtual hosts -->	10	<!--
20	<host-deploy path="hosts">	11	- Defaults applied to each web-app.

Lines 1-22 Link Here

(-)./pkg-plist (-8 / +10 lines)
1	@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.15 2006/08/09 21:18:09 hq Exp $	1	@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.11 2005/12/20 22:38:35 edwin Exp $
2	%%APP_NAME%%/lib/activation.jar	2	%%APP_NAME%%/lib/activation.jar
3	%%APP_NAME%%/lib/aopalliance.jar	3	%%APP_NAME%%/lib/ejb-15.jar
4	%%APP_NAME%%/lib/ejb-20.jar
5	%%APP_NAME%%/lib/ejb-30.jar
6	%%APP_NAME%%/lib/j2ee-deploy-10.jar	4	%%APP_NAME%%/lib/j2ee-deploy-10.jar
7	%%APP_NAME%%/lib/j2ee-management-10.jar	5	%%APP_NAME%%/lib/j2ee-management-10.jar
8	%%APP_NAME%%/lib/javamail-14.jar	6	%%APP_NAME%%/lib/javamail-14.jar
		7	%%APP_NAME%%/lib/jaxb-api.jar
		8	%%APP_NAME%%/lib/jaxb-impl.jar
		9	%%APP_NAME%%/lib/jaxb-xjc.jar
		10	%%APP_NAME%%/lib/jaxb1-impl.jar
		11	%%APP_NAME%%/lib/jaxrpc-15.jar
9	%%APP_NAME%%/lib/jca-15.jar	12	%%APP_NAME%%/lib/jca-15.jar
10	%%APP_NAME%%/lib/jms-11.jar	13	%%APP_NAME%%/lib/jms-11.jar
11	%%APP_NAME%%/lib/jmx-12.jar	14	%%APP_NAME%%/lib/jpa-15.jar
12	%%APP_NAME%%/lib/jsdk-24.jar	15	%%APP_NAME%%/lib/jsdk-15.jar
13	%%APP_NAME%%/lib/jstl-11.jar	16	%%APP_NAME%%/lib/jstl-11.jar
14	%%APP_NAME%%/lib/jta-101.jar	17	%%APP_NAME%%/lib/jta-101.jar
15	%%APP_NAME%%/lib/portlet-10.jar	18	%%APP_NAME%%/lib/portlet-10.jar
16	%%APP_NAME%%/lib/quercus.jar	19	%%APP_NAME%%/lib/quercus.jar
17	%%APP_NAME%%/lib/resin-jdk15.jar	20	%%APP_NAME%%/lib/resin-util.jar
18	%%APP_NAME%%/lib/resin.jar	21	%%APP_NAME%%/lib/resin.jar
19	%%APP_NAME%%/lib/resinboot.jar
20	%%APP_NAME%%/lib/script-10.jar	22	%%APP_NAME%%/lib/script-10.jar
21	%%APP_NAME%%/lib/webutil.jar	23	%%APP_NAME%%/lib/webutil.jar
22	%%APP_NAME%%/webapps/ROOT/index.jsp	24	%%APP_NAME%%/webapps/ROOT/index.jsp