Author: dkulp Date: Thu Mar 7 19:27:17 2013 New Revision: 1454029 URL: http://svn.apache.org/r1454029 Log: Merged revisions 1454020 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1454020 | dkulp | 2013-03-07 14:23:11 -0500 (Thu, 07 Mar 2013) | 10 lines Merged revisions 1453958 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1453958 | dkulp | 2013-03-07 12:01:53 -0500 (Thu, 07 Mar 2013) | 2 lines [CXF-4881] Updates to the js tests to make the tracer act directly as a function which is what typeof returns. ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java Modified: cxf/branches/2.6.x-fixes/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js?rev=1454029&r1=1454028&r2=1454029&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js (original) +++ cxf/branches/2.6.x-fixes/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js Thu Mar 7 19:27:17 2013 @@ -27,9 +27,12 @@ function cxf_apache_org_util_null_trace( function CxfApacheOrgUtil() { // Set up tracing if there is a trace object. - if ("function" == typeof(org_apache_cxf_trace)) { + if ("object" == typeof(org_apache_cxf_trace)) { this.trace = org_apache_cxf_trace.trace; this.trace("Javascript tracing enabled."); + } else if ("function" == typeof(org_apache_cxf_trace)) { + this.trace = org_apache_cxf_trace; + this.trace("Javascript tracing enabled."); } else { this.trace = cxf_apache_org_util_null_trace; } Modified: cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java?rev=1454029&r1=1454028&r2=1454029&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java (original) +++ cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java Thu Mar 7 19:27:17 2013 @@ -89,6 +89,10 @@ public class JavascriptTestUtilities ext public Trace() { } + //when acting as a function + public Trace(String msg) { + jsStaticFunction_trace(msg); + } @Override public String getClassName() {
