Attachment #59385 for bug #89371

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

Lines 6-12 Link Here

(-)./Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= cocoon	8	PORTNAME= cocoon
9	PORTVERSION= 2.1.7	9	PORTVERSION= 2.1.8
10	CATEGORIES= www java	10	CATEGORIES= www java
11	MASTER_SITES= ${MASTER_SITE_APACHE}	11	MASTER_SITES= ${MASTER_SITE_APACHE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 142-148 Link Here
142	@${SED} ${SUBSTITUTIONS} ${MASTERDIR}/pkg-message > ${PKGMESSAGE}	142	@${SED} ${SUBSTITUTIONS} ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
143	@${ECHO_CMD}	143	@${ECHO_CMD}
144	@${ECHO_CMD} "********************************************************************************"	144	@${ECHO_CMD} "********************************************************************************"
145	@${CAT} ${PKGMESSAGE} \| fmt -w 80	145	@${FMT} -w80 ${PKGMESSAGE}
146	@${ECHO_CMD} "********************************************************************************"	146	@${ECHO_CMD} "********************************************************************************"
147	@${ECHO_CMD}	147	@${ECHO_CMD}
148		148




OPTIONS+=	JSP	'Enable the jsp block'	on
OPTIONS+=	LINKREWRITER	'Enable the linkrewriter block'	on
OPTIONS+=	LUCENE	'Enable the lucene block'	on
OPTIONS+=	MIDI	'Enable the midi block'	on
OPTIONS+=	NAMING	'Enable the naming block'	on
OPTIONS+=	OJB	'Enable the ojb block'	on
OPTIONS+=	PARANOID	'Enable the paranoid block'	on

OPTIONS+=	PORTAL_FW	'Enable the portal-fw block'	off
OPTIONS+=	SWF	'Enable the swf block'	off
OPTIONS+=	WOODY	'Enable the woody block'	off
OPTIONS+=	AJAX	'Enable the ajax block'	on
OPTIONS+=	APPLES	'Enable the apples block'	on
OPTIONS+=	ASCIIART	'Enable the asciiart block'	on
OPTIONS+=	AXIS	'Enable the axis block'	on
OPTIONS+=	CAPTCHA	'Enable the captcha block'	on
OPTIONS+=	CRON	'Enable the cron block'	on
OPTIONS+=	DELI	'Enable the deli block'	on
OPTIONS+=	EVENTCACHE	'Enable the eventcache block'	on
OPTIONS+=	FACES	'Enable the faces block'	on
OPTIONS+=	FORMS	'Enable the forms block'	on
OPTIONS+=	JAVAFLOW	'Enable the javaflow block'	on
OPTIONS+=	JCR	'Enable the jcr block'	on
OPTIONS+=	JMS	'Enable the jms block'	on
OPTIONS+=	LINOTYPE	'Enable the linotype block'	on
OPTIONS+=	MAIL	'Enable the mail block'	on
OPTIONS+=	MIDI	'Enable the midi block'	on
OPTIONS+=	PETSTORE	'Enable the petstore block'	on
OPTIONS+=	PROXY	'Enable the proxy block'	on
OPTIONS+=	QDOX	'Enable the qdox block'	on

OPTIONS+=	STX	'Enable the stx block'	on
OPTIONS+=	TAGLIB	'Enable the taglib block'	on
OPTIONS+=	TOUR	'Enable the tour block'	on
OPTIONS+=	VALIDATION	'Enable the validation block'	on
OPTIONS+=	WEBDAV	'Enable the webdav block'	on
OPTIONS+=	XSLTAL	'Enable the xsltal block'	on

Lines 38-43 Link Here

(-)./Makefile.test-options (-4 / +46 lines)
38		38
39	.if defined(WITH_ITEXT)	39	.if defined(WITH_ITEXT)
40	BLOCKS+= itext	40	BLOCKS+= itext
		41	BLOCKS+= xsp
41	.endif	42	.endif
42		43
43	.if defined(WITH_JFOR)	44	.if defined(WITH_JFOR)
Lines 57-68 Link Here
57	BLOCKS+= lucene	58	BLOCKS+= lucene
58	.endif	59	.endif
59		60
		61	.if defined(WITH_MIDI)
		62	BLOCKS+= midi
		63	.endif
		64
60	.if defined(WITH_NAMING)	65	.if defined(WITH_NAMING)
61	BLOCKS+= naming	66	BLOCKS+= naming
62	.endif	67	.endif
63		68
64	.if defined(WITH_OJB)	69	.if defined(WITH_OJB)
65	BLOCKS+= ojb	70	BLOCKS+= ojb
		71	BLOCKS+= ajax
66	BLOCKS+= databases	72	BLOCKS+= databases
67	BLOCKS+= forms	73	BLOCKS+= forms
68	BLOCKS+= hsqldb	74	BLOCKS+= hsqldb
Lines 79-87 Link Here
79		85
80	.if defined(WITH_PORTAL)	86	.if defined(WITH_PORTAL)
81	BLOCKS+= portal	87	BLOCKS+= portal
		88	BLOCKS+= ajax
82	BLOCKS+= authentication-fw	89	BLOCKS+= authentication-fw
83	BLOCKS+= cron	90	BLOCKS+= cron
		91	BLOCKS+= databases
84	BLOCKS+= forms	92	BLOCKS+= forms
		93	BLOCKS+= hsqldb
		94	BLOCKS+= ojb
85	BLOCKS+= session-fw	95	BLOCKS+= session-fw
86	BLOCKS+= xsp	96	BLOCKS+= xsp
87	.endif	97	.endif
Lines 138-145 Link Here
138	BLOCKS+= xsp	148	BLOCKS+= xsp
139	.endif	149	.endif
140		150
		151	.if defined(WITH_AJAX)
		152	BLOCKS+= ajax
		153	.endif
		154
141	.if defined(WITH_APPLES)	155	.if defined(WITH_APPLES)
142	BLOCKS+= apples	156	BLOCKS+= apples
		157	BLOCKS+= ajax
143	BLOCKS+= forms	158	BLOCKS+= forms
144	.endif	159	.endif
145		160
Lines 151-156 Link Here
151	BLOCKS+= axis	166	BLOCKS+= axis
152	.endif	167	.endif
153		168
		169	.if defined(WITH_CAPTCHA)
		170	BLOCKS+= captcha
		171	.endif
		172
154	.if defined(WITH_CRON)	173	.if defined(WITH_CRON)
155	BLOCKS+= cron	174	BLOCKS+= cron
156	.endif	175	.endif
Lines 161-166 Link Here
161		180
162	.if defined(WITH_EVENTCACHE)	181	.if defined(WITH_EVENTCACHE)
163	BLOCKS+= eventcache	182	BLOCKS+= eventcache
		183	BLOCKS+= cron
164	BLOCKS+= databases	184	BLOCKS+= databases
165	BLOCKS+= hsqldb	185	BLOCKS+= hsqldb
166	BLOCKS+= jms	186	BLOCKS+= jms
Lines 169-177 Link Here
169		189
170	.if defined(WITH_FACES)	190	.if defined(WITH_FACES)
171	BLOCKS+= faces	191	BLOCKS+= faces
		192	BLOCKS+= ajax
172	BLOCKS+= authentication-fw	193	BLOCKS+= authentication-fw
173	BLOCKS+= cron	194	BLOCKS+= cron
		195	BLOCKS+= databases
174	BLOCKS+= forms	196	BLOCKS+= forms
		197	BLOCKS+= hsqldb
		198	BLOCKS+= ojb
175	BLOCKS+= portal	199	BLOCKS+= portal
176	BLOCKS+= session-fw	200	BLOCKS+= session-fw
177	BLOCKS+= taglib	201	BLOCKS+= taglib
Lines 180-189 Link Here
180		204
181	.if defined(WITH_FORMS)	205	.if defined(WITH_FORMS)
182	BLOCKS+= forms	206	BLOCKS+= forms
		207	BLOCKS+= ajax
183	.endif	208	.endif
184		209
185	.if defined(WITH_JAVAFLOW)	210	.if defined(WITH_JAVAFLOW)
186	BLOCKS+= javaflow	211	BLOCKS+= javaflow
		212	BLOCKS+= ajax
187	BLOCKS+= databases	213	BLOCKS+= databases
188	BLOCKS+= forms	214	BLOCKS+= forms
189	BLOCKS+= hsqldb	215	BLOCKS+= hsqldb
Lines 191-198 Link Here
191	BLOCKS+= xsp	217	BLOCKS+= xsp
192	.endif	218	.endif
193		219
		220	.if defined(WITH_JCR)
		221	BLOCKS+= jcr
		222	.endif
		223
194	.if defined(WITH_JMS)	224	.if defined(WITH_JMS)
195	BLOCKS+= jms	225	BLOCKS+= jms
		226	BLOCKS+= cron
196	BLOCKS+= databases	227	BLOCKS+= databases
197	BLOCKS+= hsqldb	228	BLOCKS+= hsqldb
198	BLOCKS+= xsp	229	BLOCKS+= xsp
Lines 207-218 Link Here
207	BLOCKS+= asciiart	238	BLOCKS+= asciiart
208	.endif	239	.endif
209		240
210	.if defined(WITH_MIDI)
211	BLOCKS+= midi
212	.endif
213
214	.if defined(WITH_PETSTORE)	241	.if defined(WITH_PETSTORE)
215	BLOCKS+= petstore	242	BLOCKS+= petstore
		243	BLOCKS+= ajax
216	BLOCKS+= databases	244	BLOCKS+= databases
217	BLOCKS+= forms	245	BLOCKS+= forms
218	BLOCKS+= hsqldb	246	BLOCKS+= hsqldb
Lines 230-235 Link Here
230		258
231	.if defined(WITH_QUERYBEAN)	259	.if defined(WITH_QUERYBEAN)
232	BLOCKS+= querybean	260	BLOCKS+= querybean
		261	BLOCKS+= ajax
233	BLOCKS+= databases	262	BLOCKS+= databases
234	BLOCKS+= forms	263	BLOCKS+= forms
235	BLOCKS+= hsqldb	264	BLOCKS+= hsqldb
Lines 240-245 Link Here
240		269
241	.if defined(WITH_REPOSITORY)	270	.if defined(WITH_REPOSITORY)
242	BLOCKS+= repository	271	BLOCKS+= repository
		272	BLOCKS+= cron
243	BLOCKS+= databases	273	BLOCKS+= databases
244	BLOCKS+= eventcache	274	BLOCKS+= eventcache
245	BLOCKS+= hsqldb	275	BLOCKS+= hsqldb
Lines 253-258 Link Here
253		283
254	.if defined(WITH_SLIDE)	284	.if defined(WITH_SLIDE)
255	BLOCKS+= slide	285	BLOCKS+= slide
		286	BLOCKS+= cron
256	BLOCKS+= databases	287	BLOCKS+= databases
257	BLOCKS+= eventcache	288	BLOCKS+= eventcache
258	BLOCKS+= hsqldb	289	BLOCKS+= hsqldb
Lines 275-292 Link Here
275		306
276	.if defined(WITH_TOUR)	307	.if defined(WITH_TOUR)
277	BLOCKS+= tour	308	BLOCKS+= tour
		309	BLOCKS+= ajax
278	BLOCKS+= batik	310	BLOCKS+= batik
279	BLOCKS+= fop	311	BLOCKS+= fop
280	BLOCKS+= forms	312	BLOCKS+= forms
		313	BLOCKS+= slop
		314	.endif
		315
		316	.if defined(WITH_VALIDATION)
		317	BLOCKS+= validation
281	.endif	318	.endif
282		319
283	.if defined(WITH_WEBDAV)	320	.if defined(WITH_WEBDAV)
284	BLOCKS+= webdav	321	BLOCKS+= webdav
		322	BLOCKS+= cron
285	BLOCKS+= databases	323	BLOCKS+= databases
286	BLOCKS+= eventcache	324	BLOCKS+= eventcache
287	BLOCKS+= hsqldb	325	BLOCKS+= hsqldb
288	BLOCKS+= jms	326	BLOCKS+= jms
289	BLOCKS+= repository	327	BLOCKS+= repository
290	BLOCKS+= xsp	328	BLOCKS+= xsp
		329	.endif
		330
		331	.if defined(WITH_XSLTAL)
		332	BLOCKS+= xsltal
291	.endif	333	.endif
292		334

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	MD5 (cocoon-2.1.7-src.tar.gz) = 423209dad3650e4f4fb1d76bd64a4747	1	MD5 (cocoon-2.1.8-src.tar.gz) = 98ecb00c42ed41525cb6f098eacf76e5
2	SIZE (cocoon-2.1.7-src.tar.gz) = 41950734	2	SIZE (cocoon-2.1.8-src.tar.gz) = 44885682




    APP_HOME = "%%APP_HOME%%"
    PID_FILE = "%%PID_FILE%%"
    COMMAND = "%%PREFIX%%/sbin/%%APP_NAME%%.sh"
    os.environ["JAVA_OPTIONS"] = " ".join(sys.argv[1:-1])
    ARGS = [COMMAND, "servlet"]

    if len(sys.argv) < 2:
        usage()
        sys.exit(1)

    if sys.argv[-1] == "start":
        start()

    elif sys.argv[-1] == "stop":
        stop()

    elif sys.argv[-1] == "restart":
        stop()
        start()


Lines 43-53 Link Here

(-)./files/pkg-deinstall (-5 / +7 lines)
43	fi	43	fi
44	fi	44	fi
45		45
46	echo -n ">> Removing log file (${LOG_FILE})..."	46	if [ -e ${LOG_FILE} ] ; then
47	if rm ${LOG_FILE} > /dev/null 2> /dev/null ; then	47	echo -n ">> Removing log file (${LOG_FILE})..."
48	echo " [ DONE ]"	48	if rm ${LOG_FILE} > /dev/null 2> /dev/null ; then
49	else	49	echo " [ DONE ]"
50	echo " [ FAILED ]"	50	else
		51	echo " [ FAILED ]"
		52	fi
51	fi	53	fi
52	fi	54	fi
53		55




In order to be able to run Cocoon, please add the following line to
/etc/rc.conf:

  %%APP_NAME%%_enable="YES"

If you wish to start cocoon right now, invoke the startup script with
`%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'
and point your web browser to the default home page at
http://localhost:%%PORT%%/ where you may read the documentation and test the
samples.

For this control script to run seamlessly, it is recommended to increase the
maximum length of commands displayed by ps(1).  Please append the following
setting to /etc/sysctl.conf:

  # Do not truncate command line arguments in ps(1) listing
  kern.ps_arg_cache_limit=10000

This setting will take effect at next reboot, however it is possible to have
immediate effect with the following command as root:

  # sysctl kern.ps_arg_cache_limit=10000

If you wish to skip this setting, please note that the `stop', `restart' and
`status' will not function properly with %%APP_NAME%%.sh.


Enjoy!

--------------------------------------------------------------------------------
ADVANCED USAGE

If you need to pass special options to Java, please set the
%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:

  # Prevent Java from opening an X11 display
  %%APP_NAME%%_flags="-Djava.awt.headless=true"

  # Increase memory limit of the Java virtual machine
  %%APP_NAME%%_flags="-Xms32m -Xmx256m"

  # Run Java virtual machine with remote debugging turned on on port 8000
  %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"

Return to bug 89371

Lines 17-22 Link Here

(-)./Makefile.options (-1 / +6 lines)
17	OPTIONS+= JSP 'Enable the jsp block' on	17	OPTIONS+= JSP 'Enable the jsp block' on
18	OPTIONS+= LINKREWRITER 'Enable the linkrewriter block' on	18	OPTIONS+= LINKREWRITER 'Enable the linkrewriter block' on
19	OPTIONS+= LUCENE 'Enable the lucene block' on	19	OPTIONS+= LUCENE 'Enable the lucene block' on
		20	OPTIONS+= MIDI 'Enable the midi block' on
20	OPTIONS+= NAMING 'Enable the naming block' on	21	OPTIONS+= NAMING 'Enable the naming block' on
21	OPTIONS+= OJB 'Enable the ojb block' on	22	OPTIONS+= OJB 'Enable the ojb block' on
22	OPTIONS+= PARANOID 'Enable the paranoid block' on	23	OPTIONS+= PARANOID 'Enable the paranoid block' on
Lines 33-51 Link Here
33	OPTIONS+= PORTAL_FW 'Enable the portal-fw block' off	34	OPTIONS+= PORTAL_FW 'Enable the portal-fw block' off
34	OPTIONS+= SWF 'Enable the swf block' off	35	OPTIONS+= SWF 'Enable the swf block' off
35	OPTIONS+= WOODY 'Enable the woody block' off	36	OPTIONS+= WOODY 'Enable the woody block' off
		37	OPTIONS+= AJAX 'Enable the ajax block' on
36	OPTIONS+= APPLES 'Enable the apples block' on	38	OPTIONS+= APPLES 'Enable the apples block' on
37	OPTIONS+= ASCIIART 'Enable the asciiart block' on	39	OPTIONS+= ASCIIART 'Enable the asciiart block' on
38	OPTIONS+= AXIS 'Enable the axis block' on	40	OPTIONS+= AXIS 'Enable the axis block' on
		41	OPTIONS+= CAPTCHA 'Enable the captcha block' on
39	OPTIONS+= CRON 'Enable the cron block' on	42	OPTIONS+= CRON 'Enable the cron block' on
40	OPTIONS+= DELI 'Enable the deli block' on	43	OPTIONS+= DELI 'Enable the deli block' on
41	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on	44	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on
42	OPTIONS+= FACES 'Enable the faces block' on	45	OPTIONS+= FACES 'Enable the faces block' on
43	OPTIONS+= FORMS 'Enable the forms block' on	46	OPTIONS+= FORMS 'Enable the forms block' on
44	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on	47	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on
		48	OPTIONS+= JCR 'Enable the jcr block' on
45	OPTIONS+= JMS 'Enable the jms block' on	49	OPTIONS+= JMS 'Enable the jms block' on
46	OPTIONS+= LINOTYPE 'Enable the linotype block' on	50	OPTIONS+= LINOTYPE 'Enable the linotype block' on
47	OPTIONS+= MAIL 'Enable the mail block' on	51	OPTIONS+= MAIL 'Enable the mail block' on
48	OPTIONS+= MIDI 'Enable the midi block' on
49	OPTIONS+= PETSTORE 'Enable the petstore block' on	52	OPTIONS+= PETSTORE 'Enable the petstore block' on
50	OPTIONS+= PROXY 'Enable the proxy block' on	53	OPTIONS+= PROXY 'Enable the proxy block' on
51	OPTIONS+= QDOX 'Enable the qdox block' on	54	OPTIONS+= QDOX 'Enable the qdox block' on
Lines 57-60 Link Here
57	OPTIONS+= STX 'Enable the stx block' on	60	OPTIONS+= STX 'Enable the stx block' on
58	OPTIONS+= TAGLIB 'Enable the taglib block' on	61	OPTIONS+= TAGLIB 'Enable the taglib block' on
59	OPTIONS+= TOUR 'Enable the tour block' on	62	OPTIONS+= TOUR 'Enable the tour block' on
		63	OPTIONS+= VALIDATION 'Enable the validation block' on
60	OPTIONS+= WEBDAV 'Enable the webdav block' on	64	OPTIONS+= WEBDAV 'Enable the webdav block' on
		65	OPTIONS+= XSLTAL 'Enable the xsltal block' on

Lines 141-159 Link Here

(-)./files/cocoonctl (-4 / +5 lines)
141	APP_HOME = "%%APP_HOME%%"	141	APP_HOME = "%%APP_HOME%%"
142	PID_FILE = "%%PID_FILE%%"	142	PID_FILE = "%%PID_FILE%%"
143	COMMAND = "%%PREFIX%%/sbin/%%APP_NAME%%.sh"	143	COMMAND = "%%PREFIX%%/sbin/%%APP_NAME%%.sh"
		144	os.environ["JAVA_OPTIONS"] = " ".join(sys.argv[1:-1])
144	ARGS = [COMMAND, "servlet"]	145	ARGS = [COMMAND, "servlet"]
145		146
146	if len(sys.argv) != 2:	147	if len(sys.argv) < 2:
147	usage()	148	usage()
148	sys.exit(1)	149	sys.exit(1)
149		150
150	if sys.argv[1] == "start":	151	if sys.argv[-1] == "start":
151	start()	152	start()
152		153
153	elif sys.argv[1] == "stop":	154	elif sys.argv[-1] == "stop":
154	stop()	155	stop()
155		156
156	elif sys.argv[1] == "restart":	157	elif sys.argv[-1] == "restart":
157	stop()	158	stop()
158	start()	159	start()
159		160

Lines 3-12 Link Here

(-)./pkg-message (-1 / +34 lines)
3	In order to be able to run Cocoon, please add the following line to	3	In order to be able to run Cocoon, please add the following line to
4	/etc/rc.conf:	4	/etc/rc.conf:
5		5
6	%%APP_NAME%%_enable="YES"	6	%%APP_NAME%%_enable="YES"
7		7
8	If you wish to start cocoon right now, invoke the startup script with	8	If you wish to start cocoon right now, invoke the startup script with
9	`%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'	9	`%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'
10	and point your web browser to the default home page at	10	and point your web browser to the default home page at
11	http://localhost:%%PORT%%/ where you may read the documentation and test the	11	http://localhost:%%PORT%%/ where you may read the documentation and test the
12	samples.	12	samples.
		13
		14	For this control script to run seamlessly, it is recommended to increase the
		15	maximum length of commands displayed by ps(1). Please append the following
		16	setting to /etc/sysctl.conf:
		17
		18	# Do not truncate command line arguments in ps(1) listing
		19	kern.ps_arg_cache_limit=10000
		20
		21	This setting will take effect at next reboot, however it is possible to have
		22	immediate effect with the following command as root:
		23
		24	# sysctl kern.ps_arg_cache_limit=10000
		25
		26	If you wish to skip this setting, please note that the `stop', `restart' and
		27	`status' will not function properly with %%APP_NAME%%.sh.
		28
		29
		30	Enjoy!
		31
		32	--------------------------------------------------------------------------------
		33	ADVANCED USAGE
		34
		35	If you need to pass special options to Java, please set the
		36	%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
		37
		38	# Prevent Java from opening an X11 display
		39	%%APP_NAME%%_flags="-Djava.awt.headless=true"
		40
		41	# Increase memory limit of the Java virtual machine
		42	%%APP_NAME%%_flags="-Xms32m -Xmx256m"
		43
		44	# Run Java virtual machine with remote debugging turned on on port 8000
		45	%%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"