1 |
nelchael 08/06/20 22:52:00 |
2 |
|
3 |
Added: freemarker-2.3.13-gentoo.patch |
4 |
Removed: freemarker-2.3.11-gentoo.patch |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-tuxonice-r5 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: freemarker-2.3.13-gentoo.patch |
16 |
=================================================================== |
17 |
diff -Nru freemarker-2.3.13.vanilla/build.xml freemarker-2.3.13/build.xml |
18 |
--- freemarker-2.3.13.vanilla/build.xml 2008-06-21 00:46:08.000000000 +0200 |
19 |
+++ freemarker-2.3.13/build.xml 2008-06-21 00:46:48.000000000 +0200 |
20 |
@@ -69,21 +69,28 @@ |
21 |
<pathelement path="${lib.log4j}"/> |
22 |
<pathelement path="${lib.rhino}"/> |
23 |
<pathelement path="${java.class.path}"/> |
24 |
+ <fileset dir="lib" includes="*.jar"/> |
25 |
</path> |
26 |
|
27 |
<path id="compile.classpath"> |
28 |
<path refid="compile.nojsp.classpath"/> |
29 |
<pathelement path="${lib.jsp21}"/> |
30 |
+ <fileset dir="lib" includes="*.jar"/> |
31 |
+ <fileset dir="lib/jsp-2.1" includes="*.jar"/> |
32 |
</path> |
33 |
|
34 |
<path id="compile.jsp1.classpath"> |
35 |
<path refid="compile.nojsp.classpath"/> |
36 |
<pathelement path="${lib.jsp12}"/> |
37 |
+ <fileset dir="lib" includes="*.jar"/> |
38 |
+ <fileset dir="lib/jsp-1.2" includes="*.jar"/> |
39 |
</path> |
40 |
|
41 |
<path id="compile.jsp2.classpath"> |
42 |
<path refid="compile.nojsp.classpath"/> |
43 |
<pathelement path="${lib.jsp20}"/> |
44 |
+ <fileset dir="lib" includes="*.jar"/> |
45 |
+ <fileset dir="lib/jsp-2.0" includes="*.jar"/> |
46 |
</path> |
47 |
|
48 |
<path id="compile.classpath.testcases"> |
49 |
@@ -92,6 +99,7 @@ |
50 |
<pathelement path="${lib.jdom}"/> |
51 |
<pathelement path="${lib.servlet}"/> |
52 |
<pathelement path="${lib.jsp20}"/> |
53 |
+ <fileset dir="lib" includes="*.jar"/> |
54 |
</path> |
55 |
|
56 |
<path id="compile.classpath.javadoc"> |
57 |
@@ -110,12 +118,14 @@ |
58 |
<pathelement path="${src.dir}"/> |
59 |
<pathelement path="${build.javacc.dir}"/> |
60 |
<pathelement path="${java.class.path}"/> |
61 |
+ <fileset dir="lib" includes="*.jar"/> |
62 |
</path> |
63 |
|
64 |
<path id="compile.classpath.examples"> |
65 |
<pathelement path="${lib.servlet}"/> |
66 |
<pathelement path="${lib.dir}/freemarker.jar"/> |
67 |
<pathelement path="${lib.struts}"/> |
68 |
+ <fileset dir="lib" includes="*.jar"/> |
69 |
</path> |
70 |
|
71 |
<path id="full.classpath"> |
72 |
@@ -131,6 +141,7 @@ |
73 |
<pathelement path="${lib.logkit}"/> |
74 |
<pathelement path="${lib.log4j}"/> |
75 |
<pathelement path="${java.class.path}"/> |
76 |
+ <fileset dir="lib" includes="*.jar"/> |
77 |
</path> |
78 |
|
79 |
|
80 |
@@ -180,7 +191,6 @@ |
81 |
|
82 |
<patternset id="freemarker.compile.jdk15"> |
83 |
<include name="freemarker/ext/beans/EnumModels.java"/> |
84 |
- <include name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/> |
85 |
</patternset> |
86 |
|
87 |
<patternset id="freemarker.compile.xalan"> |
88 |
@@ -311,7 +321,6 @@ |
89 |
<available file="lib/xalan.jar"/> |
90 |
</and> |
91 |
</condition> |
92 |
- <antcall target="fetchlibs"/> |
93 |
<available |
94 |
property="log4j.available" |
95 |
classname="org.apache.log4j.Logger" |
96 |
diff -Nru freemarker-2.3.13.vanilla/src/freemarker/ext/jsp/FreeMarkerPageContext21.java freemarker-2.3.13/src/freemarker/ext/jsp/FreeMarkerPageContext21.java |
97 |
--- freemarker-2.3.13.vanilla/src/freemarker/ext/jsp/FreeMarkerPageContext21.java 2008-06-21 00:46:08.000000000 +0200 |
98 |
+++ freemarker-2.3.13/src/freemarker/ext/jsp/FreeMarkerPageContext21.java 2008-06-21 00:46:12.000000000 +0200 |
99 |
@@ -2,11 +2,13 @@ |
100 |
|
101 |
import java.security.AccessController; |
102 |
import java.security.PrivilegedAction; |
103 |
+import java.util.Enumeration; |
104 |
|
105 |
import javax.el.ELContext; |
106 |
import javax.servlet.jsp.JspApplicationContext; |
107 |
import javax.servlet.jsp.JspContext; |
108 |
import javax.servlet.jsp.JspFactory; |
109 |
+import javax.servlet.jsp.ErrorData; |
110 |
import javax.servlet.jsp.PageContext; |
111 |
import javax.servlet.jsp.el.ELException; |
112 |
import javax.servlet.jsp.el.ExpressionEvaluator; |
113 |
@@ -24,6 +26,9 @@ |
114 |
class FreeMarkerPageContext21 extends FreeMarkerPageContext { |
115 |
private static final Logger logger = Logger.getLogger("freemarker.jsp"); |
116 |
|
117 |
+ public ErrorData getErrorData() { return null; } |
118 |
+ public Enumeration getAttributeNames() { return getServletContext().getAttributeNames(); } |
119 |
+ |
120 |
static { |
121 |
if(JspFactory.getDefaultFactory() == null) { |
122 |
JspFactory.setDefaultFactory(new FreeMarkerJspFactory21()); |
123 |
diff -Nru freemarker-2.3.13.vanilla/src/freemarker/ext/jython/JythonHashModel.java freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java |
124 |
--- freemarker-2.3.13.vanilla/src/freemarker/ext/jython/JythonHashModel.java 2008-06-21 00:46:08.000000000 +0200 |
125 |
+++ freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java 2008-06-21 00:46:12.000000000 +0200 |
126 |
@@ -137,7 +137,7 @@ |
127 |
{ |
128 |
throw new TemplateModelException(e); |
129 |
} |
130 |
- throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__); |
131 |
+ throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType()); |
132 |
} |
133 |
|
134 |
/** |
135 |
@@ -157,6 +157,6 @@ |
136 |
{ |
137 |
throw new TemplateModelException(e); |
138 |
} |
139 |
- throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__); |
140 |
+ throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType()); |
141 |
} |
142 |
} |
143 |
|
144 |
|
145 |
|
146 |
-- |
147 |
gentoo-commits@l.g.o mailing list |