[patch] files/freemarker-2.3.19-gentoo.patch

freemarker-2.3.19-gentoo.patch (text/plain), 4.42 KB, created by Ivan Baidakou (dmol) on 2012-06-12 13:43:35 UTC

diff -Nru /tmp/freemarker-2.3.19-vanilla/build.xml ./build.xml
--- /tmp/freemarker-2.3.19-vanilla/build.xml	2012-06-12 13:38:26.006881768 +0300
+++ ./build.xml	2012-06-12 15:53:32.799965578 +0300
@@ -54,13 +54,14 @@
     <property name="lib.dom4j" location="lib/dom4j.jar"/>
     <property name="lib.struts" location="lib/struts.jar"/>
     <property name="lib.rhino" location="lib/js.jar"/>
-    <property name="lib.servlet" location="lib/servlet.jar"/>
-    <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
-    <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
-    <property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
+    <property name="lib.servlet" location="lib/jsp-2.0/servlet-api.jar"/>
+    <property name="lib.jsp12" location="lib/jsp-2.0/jsp-api.jar"/>
+    <property name="lib.jsp20" location="lib/jsp-2.0/jsp-api.jar"/>
+    <property name="lib.jsp21" location="lib/jsp-2.1/jsp-api.jar"/>
+    <property name="lib.el" location="lib/tomcat-servlet-api-3.0/el-api.jar"/>
     
     <property name="lib.jython20" location="lib/jython-2.0.jar"/>
-    <property name="lib.jython22" location="lib/jython-2.2.1.jar"/>
+    <property name="lib.jython22" location="lib/jython.jar"/>
     <property name="lib.jython25" location="lib/jython-2.5.jar"/>
     <!-- If not overridden, use default -->
     <property name="boot.class.path" value="${sun.boot.class.path}"/>
@@ -86,11 +87,12 @@
     <path id="compile.classpath">
         <path refid="compile.nomultiversion.classpath"/>
         <pathelement path="${lib.jsp21}"/>
+	<pathelement path="${lib.el}"/>
     </path>
 
     <path id="compile.jsp1.classpath">
         <path refid="compile.nomultiversion.classpath"/>
-        <pathelement path="${lib.jsp12}"/>
+        <fileset dir="lib/jsp-2.1" includes="*.jar"/>
     </path>
 
     <path id="compile.jsp2.classpath">
@@ -561,8 +563,7 @@
         <antcall target="compile-commons-logging"/>
         <antcall target="compile-jdk14"/>
         <antcall target="compile-jdk15"/>
-        <antcall target="compile-jsp1"/>
-        <antcall target="compile-jsp2"/>
+	<antcall target="compile-jsp2"/>
         <antcall target="compile-jython20"/>
         <antcall target="compile-jython22"/>
         <antcall target="compile-jython25"/>
diff -Nru /tmp/freemarker-2.3.19-vanilla/src/freemarker/ext/beans/BeansWrapper.java ./src/freemarker/ext/beans/BeansWrapper.java
--- /tmp/freemarker-2.3.19-vanilla/src/freemarker/ext/beans/BeansWrapper.java	2012-06-12 13:38:26.050881216 +0300
+++ ./src/freemarker/ext/beans/BeansWrapper.java	2012-06-12 15:53:29.409008205 +0300
@@ -232,7 +232,7 @@
      */
     public BeansWrapper() {
         if(javaRebelAvailable) {
-            JavaRebelIntegration.registerWrapper(this);
+            //JavaRebelIntegration.registerWrapper(this);
         }
     }
     
@@ -1672,13 +1672,7 @@
 
     
     private static boolean isJavaRebelAvailable() {
-        try {
-            JavaRebelIntegration.testAvailability();
-            return true;
-        }
-        catch(NoClassDefFoundError e) {
-            return false;
-        }
+	return false;
     }
     
     /**
diff -Nru /tmp/freemarker-2.3.19-vanilla/src/freemarker/log/SLF4JLoggerFactory.java ./src/freemarker/log/SLF4JLoggerFactory.java
--- /tmp/freemarker-2.3.19-vanilla/src/freemarker/log/SLF4JLoggerFactory.java	2012-06-12 13:38:26.037881378 +0300
+++ ./src/freemarker/log/SLF4JLoggerFactory.java	2012-06-12 15:53:26.610043396 +0300
@@ -86,7 +86,7 @@
 
 		public void debug(String message, Throwable t) {
 			logger.log(null, ADAPTER_FQCN,
-					LocationAwareLogger.DEBUG_INT, message, null, t);
+					LocationAwareLogger.DEBUG_INT, message, t);
 		}
 
 		public void info(String message) {
@@ -95,7 +95,7 @@
 
 		public void info(String message, Throwable t) {
 			logger.log(null, ADAPTER_FQCN,
-					LocationAwareLogger.INFO_INT, message, null, t);
+					LocationAwareLogger.INFO_INT, message, t);
 		}
 
 		public void warn(String message) {
@@ -104,7 +104,7 @@
 
 		public void warn(String message, Throwable t) {
 			logger.log(null, ADAPTER_FQCN,
-					LocationAwareLogger.WARN_INT, message, null, t);
+					LocationAwareLogger.WARN_INT, message, t);
 		}
 
 		public void error(String message) {
@@ -113,7 +113,7 @@
 
 		public void error(String message, Throwable t) {
 			logger.log(null, ADAPTER_FQCN,
-					LocationAwareLogger.ERROR_INT, message, null, t);
+					LocationAwareLogger.ERROR_INT, message, t);
 		}
 
 		public boolean isDebugEnabled() {