Attachment #64272 for bug #95627

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

Lines 6-12 Link Here

(-)./Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= cocoon	8	PORTNAME= cocoon
9	PORTVERSION= 2.1.8	9	PORTVERSION= 2.1.9
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}




OPTIONS+=	CHAPERON	'Enable the chaperon block'	on
OPTIONS+=	DATABASES	'Enable the databases block'	on
OPTIONS+=	FOP	'Enable the fop block'	on
OPTIONS+=	FORMS	'Enable the forms block'	on
OPTIONS+=	HSQLDB	'Enable the hsqldb block'	on
OPTIONS+=	HTML	'Enable the html block'	on
OPTIONS+=	ITEXT	'Enable the itext 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'	off
OPTIONS+=	JAVAFLOW	'Enable the javaflow block'	on
OPTIONS+=	JCR	'Enable the jcr block'	off
OPTIONS+=	JMS	'Enable the jms block'	on
OPTIONS+=	LINOTYPE	'Enable the linotype block'	on
OPTIONS+=	MAIL	'Enable the mail 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'	off
OPTIONS+=	TOUR	'Enable the tour block'	on
OPTIONS+=	VALIDATION	'Enable the validation block'	on
OPTIONS+=	WEBDAV	'Enable the webdav block'	on

Lines 26-31 Link Here

(-)./Makefile.test-options (-3 / +11 lines)
26	BLOCKS+= batik	26	BLOCKS+= batik
27	.endif	27	.endif
28		28
		29	.if defined(WITH_FORMS)
		30	BLOCKS+= forms
		31	BLOCKS+= ajax
		32	.endif
		33
29	.if defined(WITH_HSQLDB)	34	.if defined(WITH_HSQLDB)
30	BLOCKS+= hsqldb	35	BLOCKS+= hsqldb
31	BLOCKS+= databases	36	BLOCKS+= databases
Lines 202-210 Link Here
202	BLOCKS+= xsp	207	BLOCKS+= xsp
203	.endif	208	.endif
204		209
205	.if defined(WITH_FORMS)	210	.if defined(WITH_IMAGEOP)
206	BLOCKS+= forms	211	BLOCKS+= imageop
207	BLOCKS+= ajax
208	.endif	212	.endif
209		213
210	.if defined(WITH_JAVAFLOW)	214	.if defined(WITH_JAVAFLOW)
Lines 302-307 Link Here
302		306
303	.if defined(WITH_TAGLIB)	307	.if defined(WITH_TAGLIB)
304	BLOCKS+= taglib	308	BLOCKS+= taglib
		309	.endif
		310
		311	.if defined(WITH_TEMPLATE)
		312	BLOCKS+= template
305	.endif	313	.endif
306		314
307	.if defined(WITH_TOUR)	315	.if defined(WITH_TOUR)

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (cocoon-2.1.8-src.tar.gz) = 98ecb00c42ed41525cb6f098eacf76e5	1	MD5 (cocoon-2.1.9-src.tar.gz) = f69fb596d50f7942a22c81d9c6061b29
2	SHA256 (cocoon-2.1.8-src.tar.gz) = 3dd4987ee1f9f59476fab478feb890ff3b5c8bf01a5d09ef441952b42724fcb5	2	SHA256 (cocoon-2.1.9-src.tar.gz) = 0ff238cd5c1b20dcbd3459c74a5395a0cdc8ee636e204f1eaa0155b7dd48a6f2
3	SIZE (cocoon-2.1.8-src.tar.gz) = 44885682	3	SIZE (cocoon-2.1.9-src.tar.gz) = 46893866




   fi
 fi
 echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory"
@@ -111,7 +110,7 @@
 
 # ----- Set Local Variables ( used to minimize cut/paste) ---------------------
 
-JAVA="$JAVA_HOME/bin/java"
+JAVA="exec $JAVA_HOME/bin/java"
 ENDORSED_LIBS="$COCOON_HOME/lib/endorsed"
 ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS"
 PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser




--- src/blocks/ajax/samples/sitemap.xmap.orig	Tue Apr 11 18:05:10 2006
+++ src/blocks/ajax/samples/sitemap.xmap	Tue Apr 11 18:05:18 2006
@@ -19,13 +19,6 @@
   @version $Id: sitemap.xmap 385331 2006-03-12 18:25:56Z sylvain $
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:components>
-    <map:generators>
-	  <!-- use the new implementation of JX -->
-	  <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
-    </map:generators>
-  </map:components>
-
  <map:resources>
    <!-- this will later become a virtual transformer -->
    <map:resource name="simple-page2html">

Return to bug 95627

Lines 10-15 Link Here

(-)./Makefile.options (-2 / +4 lines)
10	OPTIONS+= CHAPERON 'Enable the chaperon block' on	10	OPTIONS+= CHAPERON 'Enable the chaperon block' on
11	OPTIONS+= DATABASES 'Enable the databases block' on	11	OPTIONS+= DATABASES 'Enable the databases block' on
12	OPTIONS+= FOP 'Enable the fop block' on	12	OPTIONS+= FOP 'Enable the fop block' on
		13	OPTIONS+= FORMS 'Enable the forms block' on
13	OPTIONS+= HSQLDB 'Enable the hsqldb block' on	14	OPTIONS+= HSQLDB 'Enable the hsqldb block' on
14	OPTIONS+= HTML 'Enable the html block' on	15	OPTIONS+= HTML 'Enable the html block' on
15	OPTIONS+= ITEXT 'Enable the itext block' on	16	OPTIONS+= ITEXT 'Enable the itext block' on
Lines 43-51 Link Here
43	OPTIONS+= DELI 'Enable the deli block' on	44	OPTIONS+= DELI 'Enable the deli block' on
44	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on	45	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on
45	OPTIONS+= FACES 'Enable the faces block' on	46	OPTIONS+= FACES 'Enable the faces block' on
46	OPTIONS+= FORMS 'Enable the forms block' on	47	OPTIONS+= IMAGEOP 'Enable the imageop block' off
47	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on	48	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on
48	OPTIONS+= JCR 'Enable the jcr block' on	49	OPTIONS+= JCR 'Enable the jcr block' off
49	OPTIONS+= JMS 'Enable the jms block' on	50	OPTIONS+= JMS 'Enable the jms block' on
50	OPTIONS+= LINOTYPE 'Enable the linotype block' on	51	OPTIONS+= LINOTYPE 'Enable the linotype block' on
51	OPTIONS+= MAIL 'Enable the mail block' on	52	OPTIONS+= MAIL 'Enable the mail block' on
Lines 59-64 Link Here
59	OPTIONS+= SLOP 'Enable the slop block' on	60	OPTIONS+= SLOP 'Enable the slop block' on
60	OPTIONS+= STX 'Enable the stx block' on	61	OPTIONS+= STX 'Enable the stx block' on
61	OPTIONS+= TAGLIB 'Enable the taglib block' on	62	OPTIONS+= TAGLIB 'Enable the taglib block' on
		63	OPTIONS+= TEMPLATE 'Enable the template block' off
62	OPTIONS+= TOUR 'Enable the tour block' on	64	OPTIONS+= TOUR 'Enable the tour block' on
63	OPTIONS+= VALIDATION 'Enable the validation block' on	65	OPTIONS+= VALIDATION 'Enable the validation block' on
64	OPTIONS+= WEBDAV 'Enable the webdav block' on	66	OPTIONS+= WEBDAV 'Enable the webdav block' on

Lines 30-41 Link Here

(-)./files/patch-cocoon.sh (-9 lines)
30	fi	30	fi
31	fi	31	fi
32	echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory"	32	echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory"
33	@@ -111,7 +110,7 @@
34
35	# ----- Set Local Variables ( used to minimize cut/paste) ---------------------
36
37	-JAVA="$JAVA_HOME/bin/java"
38	+JAVA="exec $JAVA_HOME/bin/java"
39	ENDORSED_LIBS="$COCOON_HOME/lib/endorsed"
40	ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS"
41	PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser

Line 0 Link Here

(-)./files/patch-src-blocks-ajax-samples (+16 lines)
	1	--- src/blocks/ajax/samples/sitemap.xmap.orig Tue Apr 11 18:05:10 2006
	2	+++ src/blocks/ajax/samples/sitemap.xmap Tue Apr 11 18:05:18 2006
	3	@@ -19,13 +19,6 @@
	4	@version $Id: sitemap.xmap 385331 2006-03-12 18:25:56Z sylvain $
	5	-->
	6	<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
	7	- <map:components>
	8	- <map:generators>
	9	- <!-- use the new implementation of JX -->
	10	- <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
	11	- </map:generators>
	12	- </map:components>
	13	-
	14	<map:resources>
	15	<!-- this will later become a virtual transformer -->
	16	<map:resource name="simple-page2html">