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

(-)./Makefile (-3 / +4 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=		resin
8
PORTNAME=		resin
9
PORTVERSION=		3.0.19
9
PORTVERSION=		3.0.20
10
PORTREVISION=		1
11
CATEGORIES=		www java
10
CATEGORIES=		www java
12
MASTER_SITES=		http://www.caucho.com/download/
11
MASTER_SITES=		http://www.caucho.com/download/
13
12
14
MAINTAINER=		jb.quenot@caraldi.com
13
MAINTAINER=		jbq@caraldi.com
15
COMMENT=		Resin, a Java-based Application Server, 3.x branch
14
COMMENT=		Resin, a Java-based Application Server, 3.x branch
16
15
17
USE_JAVA=		yes
16
USE_JAVA=		yes
Lines 49-54 Link Here
49
			${FILESDIR}/pkg-deinstall \
48
			${FILESDIR}/pkg-deinstall \
50
			${FILESDIR}/install.sh \
49
			${FILESDIR}/install.sh \
51
			${FILESDIR}/pkg-message.in \
50
			${FILESDIR}/pkg-message.in \
51
			${FILESDIR}/pkg-message-advanced.in \
52
			${WRKSRC}/conf/resin.conf \
52
			${WRKSRC}/conf/resin.conf \
53
			${FILESDIR}/resinctl \
53
			${FILESDIR}/resinctl \
54
			${FILESDIR}/resin.sh.in
54
			${FILESDIR}/resin.sh.in
Lines 119-124 Link Here
119
	    ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \
119
	    ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \
120
	    done
120
	    done
121
	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
121
	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
122
	@${CAT} < ${WRKDIR}/pkg-message-advanced.in >> ${PKGMESSAGE}
122
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
123
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
123
defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
124
defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
124
	@${ECHO_CMD} >> ${PKGMESSAGE}
125
	@${ECHO_CMD} >> ${PKGMESSAGE}
(-)./distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (resin-3.0.19.tar.gz) = 4f1a2faa9232b353859bcf9e0b333f16
1
MD5 (resin-3.0.20.tar.gz) = 8faa900dc64ccecf9d947d4cba39a0f4
2
SHA256 (resin-3.0.19.tar.gz) = b77c705eff83a575e17c7afb6a945a645991a0468855854c4d5aebb3b005dbab
2
SHA256 (resin-3.0.20.tar.gz) = 4842cd75efff5a5477a34bd85a172ceeaf7612e3914aec95e47b20640eb249eb
3
SIZE (resin-3.0.19.tar.gz) = 7393501
3
SIZE (resin-3.0.20.tar.gz) = 8237471
(-)./files/patch-resin.conf (-5 / +5 lines)
Lines 1-6 Link Here
1
--- conf/resin.conf.orig	Fri May  6 18:07:34 2005
1
--- conf/resin.conf.orig	Tue Aug  8 11:41:32 2006
2
+++ conf/resin.conf	Thu May 12 12:12:19 2005
2
+++ conf/resin.conf	Tue Aug  8 11:41:56 2006
3
@@ -198,7 +198,7 @@
3
@@ -210,7 +210,7 @@
4
          - With another web server, like Apache, this can be commented out
4
          - With another web server, like Apache, this can be commented out
5
          - because the web server will log this information.
5
          - because the web server will log this information.
6
         -->
6
         -->
Lines 9-19 Link Here
9
             format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
9
             format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
10
             rollover-period="1W"/>
10
             rollover-period="1W"/>
11
 
11
 
12
@@ -226,7 +226,7 @@
12
@@ -238,7 +238,7 @@
13
     </host-default>
13
     </host-default>
14
 
14
 
15
     <!-- includes the web-app-default for default web-app behavior -->
15
     <!-- includes the web-app-default for default web-app behavior -->
16
-    <resin:import path="${resinHome}/conf/app-default.xml"/>
16
-    <resin:import path="${resin.home}/conf/app-default.xml"/>
17
+    <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
17
+    <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
18
 
18
 
19
     <!-- configures a deployment directory for virtual hosts -->
19
     <!-- configures a deployment directory for virtual hosts -->
(-)./files/pkg-message-advanced.in (+23 lines)
Line 0 Link Here
1
2
--------------------------------------------------------------------------------
3
ADVANCED USAGE
4
5
If you need to pass special options to Java, please set the
6
%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
7
8
  # Prevent Java from opening an X11 display
9
10
  %%APP_NAME%%_flags="-Djava.awt.headless=true"
11
12
  # Increase memory limit of the Java virtual machine
13
14
  %%APP_NAME%%_flags="-Xms32m -Xmx256m"
15
16
  # Run Java with remote debugging turned on on port 8000
17
18
  %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
19
20
To specify the java version to use, please use %%APP_NAME%%_java_version:
21
22
  %%APP_NAME%%_java_version="1.4"
23
(-)./files/pkg-message.in (-18 lines)
Lines 30-50 Link Here
30
30
31
31
32
Enjoy!
32
Enjoy!
33
34
--------------------------------------------------------------------------------
35
ADVANCED USAGE
36
37
If you need to pass special options to Java, please set the
38
%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
39
40
  # Prevent Java from opening an X11 display
41
42
  %%APP_NAME%%_flags="-Djava.awt.headless=true"
43
44
  # Increase memory limit of the Java virtual machine
45
46
  %%APP_NAME%%_flags="-Xms32m -Xmx256m"
47
48
  # Run Java with remote debugging turned on on port 8000
49
50
  %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
(-)./files/resin.sh.in (-1 / +11 lines)
Lines 21-27 Link Here
21
command=%%PREFIX%%/sbin/%%APP_NAME%%ctl
21
command=%%PREFIX%%/sbin/%%APP_NAME%%ctl
22
command_args="$1"
22
command_args="$1"
23
pidfile=%%PID_FILE%%
23
pidfile=%%PID_FILE%%
24
procname=%%JAVA%%
25
24
26
# set defaults
25
# set defaults
27
26
Lines 30-33 Link Here
30
%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}
29
%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}
31
30
32
load_rc_config ${name}
31
load_rc_config ${name}
32
33
if test -n "${%%APP_NAME%%_java_version}" ; then
34
    JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%PREFIX%%/bin/java | grep JAVA_HOME | cut -d= -f2)
35
    procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%PREFIX%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
36
else
37
    JAVA_HOME=$(JAVAVM_DRYRUN=1 %%PREFIX%%/bin/java | grep JAVA_HOME | cut -d= -f2)
38
    procname=$(JAVAVM_DRYRUN=1 %%PREFIX%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
39
fi
40
41
export JAVA_HOME
42
33
run_rc_command "$1"
43
run_rc_command "$1"
(-)./files/resinctl (-2 / +1 lines)
Lines 154-160 Link Here
154
    APP_NAME = "%%APP_NAME%%"
154
    APP_NAME = "%%APP_NAME%%"
155
    APP_HOME = "%%APP_HOME%%"
155
    APP_HOME = "%%APP_HOME%%"
156
    PID_FILE = "%%PID_FILE%%"
156
    PID_FILE = "%%PID_FILE%%"
157
    COMMAND = "%%JAVA%%"
157
    COMMAND = "%%PREFIX%%/bin/java"
158
    ARGS = [COMMAND]
158
    ARGS = [COMMAND]
159
159
160
    ARGS += sys.argv[1:-1]
160
    ARGS += sys.argv[1:-1]
Lines 166-172 Link Here
166
        "-conf", "%%PREFIX%%/etc/%%APP_NAME%%/resin.xml"
166
        "-conf", "%%PREFIX%%/etc/%%APP_NAME%%/resin.xml"
167
        ]
167
        ]
168
168
169
    os.environ['JAVA_HOME'] = "%%JAVA_HOME%%"
170
    os.environ['CLASSPATH'] = classpath()
169
    os.environ['CLASSPATH'] = classpath()
171
170
172
    if len(sys.argv) < 2:
171
    if len(sys.argv) < 2:
(-)./pkg-plist (-2 / +5 lines)
Lines 1-8 Link Here
1
@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.14 2006/05/18 08:30:29 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/aopalliance.jar
3
%%APP_NAME%%/lib/aopalliance.jar
3
%%APP_NAME%%/lib/ejb-20.jar
4
%%APP_NAME%%/lib/ejb-20.jar
4
%%APP_NAME%%/lib/ejb-30.jar
5
%%APP_NAME%%/lib/ejb-30.jar
5
%%APP_NAME%%/lib/j2eedeploy.jar
6
%%APP_NAME%%/lib/j2ee-deploy-10.jar
7
%%APP_NAME%%/lib/j2ee-management-10.jar
8
%%APP_NAME%%/lib/javamail-14.jar
6
%%APP_NAME%%/lib/jca-15.jar
9
%%APP_NAME%%/lib/jca-15.jar
7
%%APP_NAME%%/lib/jms-11.jar
10
%%APP_NAME%%/lib/jms-11.jar
8
%%APP_NAME%%/lib/jmx-12.jar
11
%%APP_NAME%%/lib/jmx-12.jar

Return to bug 101648