Attachment #74839 for bug #108195




#

PORTNAME=	cocoon
PORTVERSION=	2.1.10
CATEGORIES=	www java
MASTER_SITES=	${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR=	${PORTNAME}

LATEST_LINK=		${APP_NAME}
PLIST=			${WRKDIR}/pkg-plist
PDISTNAME=		${PORTNAME}-${PORTVERSION}
PKGMESSAGE=	${WRKDIR}/pkg-message

COCOON_LIB=	${JAVASHAREDIR}/${APP_NAME}
PLIST_SUB+=	"COCOON_LIB=${COCOON_LIB}"

		${APP_NAME}ctl \
		${APP_NAME}.sh \
		upstreams-cocoon.sh \
		message \
		message-advanced

# Load options (before including bsd.port.pre.mk)
.include "${.CURDIR}/Makefile.options"


	@${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}

pre-install:
	@${FMT} -w80 ${WRKDIR}/message > ${PKGMESSAGE}
	@${CAT} ${WRKDIR}/message-advanced >> ${PKGMESSAGE}

do-install:
	@${ECHO_MSG} "===> Installing ${COPYDIRS}"
	@${MKDIR} ${APP_HOME}

	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	@${ECHO_CMD}
	@${ECHO_CMD} "********************************************************************************"
	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD} "********************************************************************************"
	@${ECHO_CMD}





OPTIONS+=	OJB	'Enable the ojb block'	on
OPTIONS+=	PARANOID	'Enable the paranoid block'	on
OPTIONS+=	POI	'Enable the poi block'	on
OPTIONS+=	PORTAL	'Enable the portal block'	on
OPTIONS+=	PROFILER	'Enable the profiler block'	on
OPTIONS+=	PYTHON	'Enable the python block'	on
OPTIONS+=	SESSION_FW	'Enable the session-fw block'	on

OPTIONS+=	AJAX	'Enable the ajax block'	on
OPTIONS+=	APPLES	'Enable the apples block'	on
OPTIONS+=	ASCIIART	'Enable the asciiart block'	on
OPTIONS+=	AUTH	'Enable the auth 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+=	IMAGEOP	'Enable the imageop block'	on
OPTIONS+=	JAVAFLOW	'Enable the javaflow block'	on
OPTIONS+=	JCR	'Enable the jcr block'	off
OPTIONS+=	JMS	'Enable the jms block'	on

OPTIONS+=	SLOP	'Enable the slop block'	on
OPTIONS+=	STX	'Enable the stx block'	on
OPTIONS+=	TAGLIB	'Enable the taglib block'	on
OPTIONS+=	TEMPLATE	'Enable the template block'	on
OPTIONS+=	TOUR	'Enable the tour block'	on
OPTIONS+=	VALIDATION	'Enable the validation block'	on
OPTIONS+=	WEBDAV	'Enable the webdav block'	on




.if defined(WITH_FOP)
BLOCKS+=	fop
BLOCKS+=	batik
BLOCKS+=	xsp
.endif

.if defined(WITH_FORMS)
BLOCKS+=	forms
BLOCKS+=	ajax
BLOCKS+=	template
.endif

.if defined(WITH_HSQLDB)

BLOCKS+=	databases
BLOCKS+=	forms
BLOCKS+=	hsqldb
BLOCKS+=	template
BLOCKS+=	xsp
.endif


.if defined(WITH_PORTAL)
BLOCKS+=	portal
BLOCKS+=	ajax
BLOCKS+=	auth
BLOCKS+=	authentication-fw
BLOCKS+=	cron
BLOCKS+=	databases

BLOCKS+=	hsqldb
BLOCKS+=	ojb
BLOCKS+=	session-fw
BLOCKS+=	template
BLOCKS+=	xsp
.endif

.if defined(WITH_PROFILER)
BLOCKS+=	profiler
BLOCKS+=	auth
.endif

.if defined(WITH_PYTHON)


.if defined(WITH_AJAX)
BLOCKS+=	ajax
BLOCKS+=	template
.endif

.if defined(WITH_APPLES)
BLOCKS+=	apples
BLOCKS+=	ajax
BLOCKS+=	forms
BLOCKS+=	template
.endif

.if defined(WITH_ASCIIART)
BLOCKS+=	asciiart
.endif

.if defined(WITH_AUTH)
BLOCKS+=	auth
.endif

.if defined(WITH_AXIS)
BLOCKS+=	axis
BLOCKS+=	xsp
.endif

.if defined(WITH_CAPTCHA)
BLOCKS+=	captcha
BLOCKS+=	template
.endif

.if defined(WITH_CRON)

.if defined(WITH_FACES)
BLOCKS+=	faces
BLOCKS+=	ajax
BLOCKS+=	auth
BLOCKS+=	authentication-fw
BLOCKS+=	cron
BLOCKS+=	databases

BLOCKS+=	portal
BLOCKS+=	session-fw
BLOCKS+=	taglib
BLOCKS+=	template
BLOCKS+=	xsp
.endif


BLOCKS+=	forms
BLOCKS+=	hsqldb
BLOCKS+=	ojb
BLOCKS+=	template
BLOCKS+=	xsp
.endif


BLOCKS+=	databases
BLOCKS+=	forms
BLOCKS+=	hsqldb
BLOCKS+=	template
BLOCKS+=	velocity
BLOCKS+=	xsp
.endif

BLOCKS+=	hsqldb
BLOCKS+=	lucene
BLOCKS+=	ojb
BLOCKS+=	template
BLOCKS+=	xsp
.endif


BLOCKS+=	fop
BLOCKS+=	forms
BLOCKS+=	slop
BLOCKS+=	template
BLOCKS+=	xsp
.endif

.if defined(WITH_VALIDATION)

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (cocoon-2.1.9-src.tar.gz) = f69fb596d50f7942a22c81d9c6061b29	1	MD5 (cocoon-2.1.10-src.tar.gz) = d073b36274ab359b59bbb760e083a934
2	SHA256 (cocoon-2.1.9-src.tar.gz) = 0ff238cd5c1b20dcbd3459c74a5395a0cdc8ee636e204f1eaa0155b7dd48a6f2	2	SHA256 (cocoon-2.1.10-src.tar.gz) = 326b591cb2b43a70f56eec825e6605c99bf283e0fc3be8fe5085e45bcaca3135
3	SIZE (cocoon-2.1.9-src.tar.gz) = 46893866	3	SIZE (cocoon-2.1.10-src.tar.gz) = 49941251

Lines 4-9 Link Here

(-)./files/cocoon.sh.in (-3 / +15 lines)
4	#	4	#
5		5
6	# PROVIDE: %%APP_NAME%%	6	# PROVIDE: %%APP_NAME%%
		7	# REQUIRE: LOGIN
		8	# KEYWORD: shutdown
7		9
8	#	10	#
9	# Add the following line to /etc/rc.conf to enable %%APP_NAME%%:	11	# Add the following line to /etc/rc.conf to enable %%APP_NAME%%:
Lines 16-25 Link Here
16	name=%%APP_NAME%%	18	name=%%APP_NAME%%
17	rcvar=`set_rcvar`	19	rcvar=`set_rcvar`
18		20
19	command=%%PREFIX%%/sbin/%%APP_NAME%%ctl	21	command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
20	command_args="$1"	22	command_args="start"
21	pidfile=%%PID_FILE%%	23	pidfile=%%PID_FILE%%
22	procname=%%JAVA%%
23		24
24	# set defaults	25	# set defaults
25		26
Lines 28-31 Link Here
28	%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}	29	%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}
29		30
30	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 %%LOCALBASE%%/bin/java \| grep JAVA_HOME \| cut -d= -f2)
		35	procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java \| grep JAVAVM_PROG \| cut -d= -f2)
		36	else
		37	JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java \| grep JAVA_HOME \| cut -d= -f2)
		38	procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java \| grep JAVAVM_PROG \| cut -d= -f2)
		39	fi
		40
		41	export JAVA_HOME
		42
31	run_rc_command "$1"	43	run_rc_command "$1"





--------------------------------------------------------------------------------
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 with remote debugging turned on on port 8000

  %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"

To specify the java version to use, please use %%APP_NAME%%_java_version:

  %%APP_NAME%%_java_version="1.4"





Cocoon is now installed in %%APP_HOME%%.

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!




Index: src/blocks/forms/samples/welcome.xml
===================================================================
--- src/blocks/forms/samples/welcome.xml	(revision 393856)
+++ src/blocks/forms/samples/welcome.xml	(working copy)
@@ -21,12 +21,6 @@
  <group name="Back">
   <sample name="Back" href="../..">to Cocoon Samples main page</sample>
   <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
-  <note>
-    Cocoon Forms is the upcoming forms framework for Cocoon.
-    Although it is marked as unstable it is the *only* supported solution - all
-    other similar approaches will be deprecated soon.
-    Of course, your feedback is very much welcome on the Cocoon mailing lists.
-  </note>
   <sample name="Cocoon Forms Documentation" href="http://cocoon.apache.org/2.1/userdocs/basics/index.html">
     Documentation is available on the Cocoon site.
   </sample>




Cocoon is now installed in %%APP_HOME%%.

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 108195

Lines 6-12 Link Here

(-)./Makefile (-3 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= cocoon	8	PORTNAME= cocoon
9	PORTVERSION= 2.1.9	9	PORTVERSION= 2.1.10
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 26-31 Link Here
26	LATEST_LINK= ${APP_NAME}	26	LATEST_LINK= ${APP_NAME}
27	PLIST= ${WRKDIR}/pkg-plist	27	PLIST= ${WRKDIR}/pkg-plist
28	PDISTNAME= ${PORTNAME}-${PORTVERSION}	28	PDISTNAME= ${PORTNAME}-${PORTVERSION}
		29	PKGMESSAGE= ${WRKDIR}/pkg-message
29		30
30	COCOON_LIB= ${JAVASHAREDIR}/${APP_NAME}	31	COCOON_LIB= ${JAVASHAREDIR}/${APP_NAME}
31	PLIST_SUB+= "COCOON_LIB=${COCOON_LIB}"	32	PLIST_SUB+= "COCOON_LIB=${COCOON_LIB}"
Lines 62-68 Link Here
62	${APP_NAME}ctl \	63	${APP_NAME}ctl \
63	${APP_NAME}.sh \	64	${APP_NAME}.sh \
64	upstreams-cocoon.sh \	65	upstreams-cocoon.sh \
65	pkg-message	66	message \
		67	message-advanced
66		68
67	# Load options (before including bsd.port.pre.mk)	69	# Load options (before including bsd.port.pre.mk)
68	.include "${.CURDIR}/Makefile.options"	70	.include "${.CURDIR}/Makefile.options"
Lines 122-127 Link Here
122		124
123	@${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}	125	@${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}
124		126
		127	pre-install:
		128	@${FMT} -w80 ${WRKDIR}/message > ${PKGMESSAGE}
		129	@${CAT} ${WRKDIR}/message-advanced >> ${PKGMESSAGE}
		130
125	do-install:	131	do-install:
126	@${ECHO_MSG} "===> Installing ${COPYDIRS}"	132	@${ECHO_MSG} "===> Installing ${COPYDIRS}"
127	@${MKDIR} ${APP_HOME}	133	@${MKDIR} ${APP_HOME}
Lines 138-144 Link Here
138	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	144	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
139	@${ECHO_CMD}	145	@${ECHO_CMD}
140	@${ECHO_CMD} "********************************************************************************"	146	@${ECHO_CMD} "********************************************************************************"
141	@${FMT} -w80 ${PKGMESSAGE}	147	@${CAT} ${PKGMESSAGE}
142	@${ECHO_CMD} "********************************************************************************"	148	@${ECHO_CMD} "********************************************************************************"
143	@${ECHO_CMD}	149	@${ECHO_CMD}
144		150

Lines 23-29 Link Here

(-)./Makefile.options (-3 / +4 lines)
23	OPTIONS+= OJB 'Enable the ojb block' on	23	OPTIONS+= OJB 'Enable the ojb block' on
24	OPTIONS+= PARANOID 'Enable the paranoid block' on	24	OPTIONS+= PARANOID 'Enable the paranoid block' on
25	OPTIONS+= POI 'Enable the poi block' on	25	OPTIONS+= POI 'Enable the poi block' on
26	OPTIONS+= PORTAL 'Enable the portal block' off	26	OPTIONS+= PORTAL 'Enable the portal block' on
27	OPTIONS+= PROFILER 'Enable the profiler block' on	27	OPTIONS+= PROFILER 'Enable the profiler block' on
28	OPTIONS+= PYTHON 'Enable the python block' on	28	OPTIONS+= PYTHON 'Enable the python block' on
29	OPTIONS+= SESSION_FW 'Enable the session-fw block' on	29	OPTIONS+= SESSION_FW 'Enable the session-fw block' on
Lines 38-50 Link Here
38	OPTIONS+= AJAX 'Enable the ajax block' on	38	OPTIONS+= AJAX 'Enable the ajax block' on
39	OPTIONS+= APPLES 'Enable the apples block' on	39	OPTIONS+= APPLES 'Enable the apples block' on
40	OPTIONS+= ASCIIART 'Enable the asciiart block' on	40	OPTIONS+= ASCIIART 'Enable the asciiart block' on
		41	OPTIONS+= AUTH 'Enable the auth block' on
41	OPTIONS+= AXIS 'Enable the axis block' on	42	OPTIONS+= AXIS 'Enable the axis block' on
42	OPTIONS+= CAPTCHA 'Enable the captcha block' on	43	OPTIONS+= CAPTCHA 'Enable the captcha block' on
43	OPTIONS+= CRON 'Enable the cron block' on	44	OPTIONS+= CRON 'Enable the cron block' on
44	OPTIONS+= DELI 'Enable the deli block' on	45	OPTIONS+= DELI 'Enable the deli block' on
45	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on	46	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on
46	OPTIONS+= FACES 'Enable the faces block' on	47	OPTIONS+= FACES 'Enable the faces block' on
47	OPTIONS+= IMAGEOP 'Enable the imageop block' off	48	OPTIONS+= IMAGEOP 'Enable the imageop block' on
48	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on	49	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on
49	OPTIONS+= JCR 'Enable the jcr block' off	50	OPTIONS+= JCR 'Enable the jcr block' off
50	OPTIONS+= JMS 'Enable the jms block' on	51	OPTIONS+= JMS 'Enable the jms block' on
Lines 60-66 Link Here
60	OPTIONS+= SLOP 'Enable the slop block' on	61	OPTIONS+= SLOP 'Enable the slop block' on
61	OPTIONS+= STX 'Enable the stx block' on	62	OPTIONS+= STX 'Enable the stx block' on
62	OPTIONS+= TAGLIB 'Enable the taglib block' on	63	OPTIONS+= TAGLIB 'Enable the taglib block' on
63	OPTIONS+= TEMPLATE 'Enable the template block' off	64	OPTIONS+= TEMPLATE 'Enable the template block' on
64	OPTIONS+= TOUR 'Enable the tour block' on	65	OPTIONS+= TOUR 'Enable the tour block' on
65	OPTIONS+= VALIDATION 'Enable the validation block' on	66	OPTIONS+= VALIDATION 'Enable the validation block' on
66	OPTIONS+= WEBDAV 'Enable the webdav block' on	67	OPTIONS+= WEBDAV 'Enable the webdav block' on

Lines 24-34 Link Here

(-)./Makefile.test-options (+21 lines)
24	.if defined(WITH_FOP)	24	.if defined(WITH_FOP)
25	BLOCKS+= fop	25	BLOCKS+= fop
26	BLOCKS+= batik	26	BLOCKS+= batik
		27	BLOCKS+= xsp
27	.endif	28	.endif
28		29
29	.if defined(WITH_FORMS)	30	.if defined(WITH_FORMS)
30	BLOCKS+= forms	31	BLOCKS+= forms
31	BLOCKS+= ajax	32	BLOCKS+= ajax
		33	BLOCKS+= template
32	.endif	34	.endif
33		35
34	.if defined(WITH_HSQLDB)	36	.if defined(WITH_HSQLDB)
Lines 77-82 Link Here
77	BLOCKS+= databases	79	BLOCKS+= databases
78	BLOCKS+= forms	80	BLOCKS+= forms
79	BLOCKS+= hsqldb	81	BLOCKS+= hsqldb
		82	BLOCKS+= template
80	BLOCKS+= xsp	83	BLOCKS+= xsp
81	.endif	84	.endif
82		85
Lines 91-96 Link Here
91	.if defined(WITH_PORTAL)	94	.if defined(WITH_PORTAL)
92	BLOCKS+= portal	95	BLOCKS+= portal
93	BLOCKS+= ajax	96	BLOCKS+= ajax
		97	BLOCKS+= auth
94	BLOCKS+= authentication-fw	98	BLOCKS+= authentication-fw
95	BLOCKS+= cron	99	BLOCKS+= cron
96	BLOCKS+= databases	100	BLOCKS+= databases
Lines 98-108 Link Here
98	BLOCKS+= hsqldb	102	BLOCKS+= hsqldb
99	BLOCKS+= ojb	103	BLOCKS+= ojb
100	BLOCKS+= session-fw	104	BLOCKS+= session-fw
		105	BLOCKS+= template
101	BLOCKS+= xsp	106	BLOCKS+= xsp
102	.endif	107	.endif
103		108
104	.if defined(WITH_PROFILER)	109	.if defined(WITH_PROFILER)
105	BLOCKS+= profiler	110	BLOCKS+= profiler
		111	BLOCKS+= auth
106	.endif	112	.endif
107		113
108	.if defined(WITH_PYTHON)	114	.if defined(WITH_PYTHON)
Lines 155-178 Link Here
155		161
156	.if defined(WITH_AJAX)	162	.if defined(WITH_AJAX)
157	BLOCKS+= ajax	163	BLOCKS+= ajax
		164	BLOCKS+= template
158	.endif	165	.endif
159		166
160	.if defined(WITH_APPLES)	167	.if defined(WITH_APPLES)
161	BLOCKS+= apples	168	BLOCKS+= apples
162	BLOCKS+= ajax	169	BLOCKS+= ajax
163	BLOCKS+= forms	170	BLOCKS+= forms
		171	BLOCKS+= template
164	.endif	172	.endif
165		173
166	.if defined(WITH_ASCIIART)	174	.if defined(WITH_ASCIIART)
167	BLOCKS+= asciiart	175	BLOCKS+= asciiart
168	.endif	176	.endif
169		177
		178	.if defined(WITH_AUTH)
		179	BLOCKS+= auth
		180	.endif
		181
170	.if defined(WITH_AXIS)	182	.if defined(WITH_AXIS)
171	BLOCKS+= axis	183	BLOCKS+= axis
		184	BLOCKS+= xsp
172	.endif	185	.endif
173		186
174	.if defined(WITH_CAPTCHA)	187	.if defined(WITH_CAPTCHA)
175	BLOCKS+= captcha	188	BLOCKS+= captcha
		189	BLOCKS+= template
176	.endif	190	.endif
177		191
178	.if defined(WITH_CRON)	192	.if defined(WITH_CRON)
Lines 195-200 Link Here
195	.if defined(WITH_FACES)	209	.if defined(WITH_FACES)
196	BLOCKS+= faces	210	BLOCKS+= faces
197	BLOCKS+= ajax	211	BLOCKS+= ajax
		212	BLOCKS+= auth
198	BLOCKS+= authentication-fw	213	BLOCKS+= authentication-fw
199	BLOCKS+= cron	214	BLOCKS+= cron
200	BLOCKS+= databases	215	BLOCKS+= databases
Lines 204-209 Link Here
204	BLOCKS+= portal	219	BLOCKS+= portal
205	BLOCKS+= session-fw	220	BLOCKS+= session-fw
206	BLOCKS+= taglib	221	BLOCKS+= taglib
		222	BLOCKS+= template
207	BLOCKS+= xsp	223	BLOCKS+= xsp
208	.endif	224	.endif
209		225
Lines 218-223 Link Here
218	BLOCKS+= forms	234	BLOCKS+= forms
219	BLOCKS+= hsqldb	235	BLOCKS+= hsqldb
220	BLOCKS+= ojb	236	BLOCKS+= ojb
		237	BLOCKS+= template
221	BLOCKS+= xsp	238	BLOCKS+= xsp
222	.endif	239	.endif
223		240
Lines 248-253 Link Here
248	BLOCKS+= databases	265	BLOCKS+= databases
249	BLOCKS+= forms	266	BLOCKS+= forms
250	BLOCKS+= hsqldb	267	BLOCKS+= hsqldb
		268	BLOCKS+= template
251	BLOCKS+= velocity	269	BLOCKS+= velocity
252	BLOCKS+= xsp	270	BLOCKS+= xsp
253	.endif	271	.endif
Lines 268-273 Link Here
268	BLOCKS+= hsqldb	286	BLOCKS+= hsqldb
269	BLOCKS+= lucene	287	BLOCKS+= lucene
270	BLOCKS+= ojb	288	BLOCKS+= ojb
		289	BLOCKS+= template
271	BLOCKS+= xsp	290	BLOCKS+= xsp
272	.endif	291	.endif
273		292
Lines 319-324 Link Here
319	BLOCKS+= fop	338	BLOCKS+= fop
320	BLOCKS+= forms	339	BLOCKS+= forms
321	BLOCKS+= slop	340	BLOCKS+= slop
		341	BLOCKS+= template
		342	BLOCKS+= xsp
322	.endif	343	.endif
323		344
324	.if defined(WITH_VALIDATION)	345	.if defined(WITH_VALIDATION)

Line 0 Link Here

(-)./files/message-advanced.in (+23 lines)
	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

Line 0 Link Here

(-)./files/message.in (+30 lines)
	1	Cocoon is now installed in %%APP_HOME%%.
	2
	3	In order to be able to run Cocoon, please add the following line to
	4	/etc/rc.conf:
	5
	6	%%APP_NAME%%_enable="YES"
	7
	8	If you wish to start cocoon right now, invoke the startup script with
	9	`%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'
	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
	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!

Lines 1-17 Link Here

(-)./files/patch-src-blocks-forms-samples-welcome.xml (-17 lines)
1	Index: src/blocks/forms/samples/welcome.xml
2	===================================================================
3	--- src/blocks/forms/samples/welcome.xml (revision 393856)
4	+++ src/blocks/forms/samples/welcome.xml (working copy)
5	@@ -21,12 +21,6 @@
6	<group name="Back">
7	<sample name="Back" href="../..">to Cocoon Samples main page</sample>
8	<sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
9	- <note>
10	- Cocoon Forms is the upcoming forms framework for Cocoon.
11	- Although it is marked as unstable it is the only supported solution - all
12	- other similar approaches will be deprecated soon.
13	- Of course, your feedback is very much welcome on the Cocoon mailing lists.
14	- </note>
15	<sample name="Cocoon Forms Documentation" href="http://cocoon.apache.org/2.1/userdocs/basics/index.html">
16	Documentation is available on the Cocoon site.
17	</sample>

Lines 1-45 Link Here

(-)./files/pkg-message.in (-45 lines)
1	Cocoon is now installed in %%APP_HOME%%.
2
3	In order to be able to run Cocoon, please add the following line to
4	/etc/rc.conf:
5
6	%%APP_NAME%%_enable="YES"
7
8	If you wish to start cocoon right now, invoke the startup script with
9	`%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'
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
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"