Attachment #325342 for bug #279348




    <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/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/jsp-2.1/el-api.jar"/>
    
    <property name="lib.jython20" location="lib/jython-2.0.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}"/>

    <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"/>
        <fileset dir="lib/jsp-2.1" includes="*.jar"/>
    </path>

    <path id="compile.jsp2.classpath">

        <antcall target="compile-commons-logging"/>
        <antcall target="compile-jdk14"/>
        <antcall target="compile-jdk15"/>
	<antcall target="compile-jsp2"/>
        <antcall target="compile-jsp2"/>
        <antcall target="compile-jython20"/>
        <antcall target="compile-jython22"/>
        <antcall target="compile-jython25"/>




     */
    public BeansWrapper() {
        if(javaRebelAvailable) {
            //JavaRebelIntegration.registerWrapper(this);
        }
    }
    


    
    private static boolean isJavaRebelAvailable() {
	return false;
            JavaRebelIntegration.testAvailability();
            return true;
        }
        catch(NoClassDefFoundError e) {
            return false;
        }
    }
    
    /**





		public void debug(String message, Throwable t) {
			logger.log(null, ADAPTER_FQCN,
					LocationAwareLogger.DEBUG_INT, message, t);
		}

		public void info(String message) {


		public void info(String message, Throwable t) {
			logger.log(null, ADAPTER_FQCN,
					LocationAwareLogger.INFO_INT, message, t);
		}

		public void warn(String message) {


		public void warn(String message, Throwable t) {
			logger.log(null, ADAPTER_FQCN,
					LocationAwareLogger.WARN_INT, message, t);
		}

		public void error(String message) {


		public void error(String message, Throwable t) {
			logger.log(null, ADAPTER_FQCN,
					LocationAwareLogger.ERROR_INT, message, t);
		}

		public boolean isDebugEnabled() {

Return to bug 279348

Lines 232-238 Link Here

(-)/tmp/freemarker-2.3.19.orig/src/freemarker/ext/beans/BeansWrapper.java (-8 / +2 lines)
232	*/	232	*/
233	public BeansWrapper() {	233	public BeansWrapper() {
234	if(javaRebelAvailable) {	234	if(javaRebelAvailable) {
235	JavaRebelIntegration.registerWrapper(this);	235	//JavaRebelIntegration.registerWrapper(this);
236	}	236	}
237	}	237	}
238		238
Lines 1672-1684 Link Here
1672		1672
1673		1673
1674	private static boolean isJavaRebelAvailable() {	1674	private static boolean isJavaRebelAvailable() {
1675	try {	1675	return false;
1676	JavaRebelIntegration.testAvailability();
1677	return true;
1678	}
1679	catch(NoClassDefFoundError e) {
1680	return false;
1681	}
1682	}	1676	}
1683		1677
1684	/**	1678	/**

Lines 54-66 Link Here

(-)/tmp/freemarker-2.3.19.orig/build.xml (-8 / +9 lines)
54	<property name="lib.dom4j" location="lib/dom4j.jar"/>	54	<property name="lib.dom4j" location="lib/dom4j.jar"/>
55	<property name="lib.struts" location="lib/struts.jar"/>	55	<property name="lib.struts" location="lib/struts.jar"/>
56	<property name="lib.rhino" location="lib/js.jar"/>	56	<property name="lib.rhino" location="lib/js.jar"/>
57	<property name="lib.servlet" location="lib/servlet.jar"/>	57	<property name="lib.servlet" location="lib/jsp-2.0/servlet-api.jar"/>
58	<property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>	58	<property name="lib.jsp12" location="lib/jsp-2.0/jsp-api.jar"/>
59	<property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>	59	<property name="lib.jsp20" location="lib/jsp-2.0/jsp-api.jar"/>
60	<property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>	60	<property name="lib.jsp21" location="lib/jsp-2.1/jsp-api.jar"/>
		61	<property name="lib.el" location="lib/jsp-2.1/el-api.jar"/>
61		62
62	<property name="lib.jython20" location="lib/jython-2.0.jar"/>	63	<property name="lib.jython20" location="lib/jython-2.0.jar"/>
63	<property name="lib.jython22" location="lib/jython-2.2.1.jar"/>	64	<property name="lib.jython22" location="lib/jython.jar"/>
64	<property name="lib.jython25" location="lib/jython-2.5.jar"/>	65	<property name="lib.jython25" location="lib/jython-2.5.jar"/>
65	<!-- If not overridden, use default -->	66	<!-- If not overridden, use default -->
66	<property name="boot.class.path" value="${sun.boot.class.path}"/>	67	<property name="boot.class.path" value="${sun.boot.class.path}"/>
Lines 86-96 Link Here
86	<path id="compile.classpath">	87	<path id="compile.classpath">
87	<path refid="compile.nomultiversion.classpath"/>	88	<path refid="compile.nomultiversion.classpath"/>
88	<pathelement path="${lib.jsp21}"/>	89	<pathelement path="${lib.jsp21}"/>
		90	<pathelement path="${lib.el}"/>
89	</path>	91	</path>
90		92
91	<path id="compile.jsp1.classpath">	93	<path id="compile.jsp1.classpath">
92	<path refid="compile.nomultiversion.classpath"/>	94	<path refid="compile.nomultiversion.classpath"/>
93	<pathelement path="${lib.jsp12}"/>	95	<fileset dir="lib/jsp-2.1" includes="*.jar"/>
94	</path>	96	</path>
95		97
96	<path id="compile.jsp2.classpath">	98	<path id="compile.jsp2.classpath">
Lines 561-568 Link Here
561	<antcall target="compile-commons-logging"/>	563	<antcall target="compile-commons-logging"/>
562	<antcall target="compile-jdk14"/>	564	<antcall target="compile-jdk14"/>
563	<antcall target="compile-jdk15"/>	565	<antcall target="compile-jdk15"/>
564	<antcall target="compile-jsp1"/>	566	<antcall target="compile-jsp2"/>
565	<antcall target="compile-jsp2"/>
566	<antcall target="compile-jython20"/>	567	<antcall target="compile-jython20"/>
567	<antcall target="compile-jython22"/>	568	<antcall target="compile-jython22"/>
568	<antcall target="compile-jython25"/>	569	<antcall target="compile-jython25"/>

Lines 86-92 Link Here

(-)/tmp/freemarker-2.3.19.orig/src/freemarker/log/SLF4JLoggerFactory.java (-4 / +4 lines)
86		86
87	public void debug(String message, Throwable t) {	87	public void debug(String message, Throwable t) {
88	logger.log(null, ADAPTER_FQCN,	88	logger.log(null, ADAPTER_FQCN,
89	LocationAwareLogger.DEBUG_INT, message, null, t);	89	LocationAwareLogger.DEBUG_INT, message, t);
90	}	90	}
91		91
92	public void info(String message) {	92	public void info(String message) {
Lines 95-101 Link Here
95		95
96	public void info(String message, Throwable t) {	96	public void info(String message, Throwable t) {
97	logger.log(null, ADAPTER_FQCN,	97	logger.log(null, ADAPTER_FQCN,
98	LocationAwareLogger.INFO_INT, message, null, t);	98	LocationAwareLogger.INFO_INT, message, t);
99	}	99	}
100		100
101	public void warn(String message) {	101	public void warn(String message) {
Lines 104-110 Link Here
104		104
105	public void warn(String message, Throwable t) {	105	public void warn(String message, Throwable t) {
106	logger.log(null, ADAPTER_FQCN,	106	logger.log(null, ADAPTER_FQCN,
107	LocationAwareLogger.WARN_INT, message, null, t);	107	LocationAwareLogger.WARN_INT, message, t);
108	}	108	}
109		109
110	public void error(String message) {	110	public void error(String message) {
Lines 113-119 Link Here
113		113
114	public void error(String message, Throwable t) {	114	public void error(String message, Throwable t) {
115	logger.log(null, ADAPTER_FQCN,	115	logger.log(null, ADAPTER_FQCN,
116	LocationAwareLogger.ERROR_INT, message, null, t);	116	LocationAwareLogger.ERROR_INT, message, t);
117	}	117	}
118		118
119	public boolean isDebugEnabled() {	119	public boolean isDebugEnabled() {