Author: sergeyb Date: Fri Feb 10 10:55:48 2012 New Revision: 1242737 URL: http://svn.apache.org/viewvc?rev=1242737&view=rev Log: Merged revisions 1242736 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1242736 | sergeyb | 2012-02-10 10:53:43 +0000 (Fri, 10 Feb 2012) | 16 lines Merged revisions 1242734 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1242734 | sergeyb | 2012-02-10 10:46:33 +0000 (Fri, 10 Feb 2012) | 9 lines Merged revisions 1242729 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1242729 | sergeyb | 2012-02-10 10:42:54 +0000 (Fri, 10 Feb 2012) | 1 line Minor update to ProviderFactory to minimize the noise when Jettison is missing ........ ................ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 10 10:55:48 2012 @@ -1,3 +1,3 @@ -/cxf/branches/2.4.x-fixes:1235732,1236170,1236646,1239371,1240148,1240260,1240347,1241413 -/cxf/branches/2.5.x-fixes:1235731,1236169,1236643,1239368,1240147,1240255,1241412 -/cxf/trunk:1235730,1236166,1236624,1239365,1240136,1240252,1241195 +/cxf/branches/2.4.x-fixes:1235732,1236170,1236646,1239371,1240148,1240260,1240347,1241413,1242736 +/cxf/branches/2.5.x-fixes:1235731,1236169,1236643,1239368,1240147,1240255,1241412,1242734 +/cxf/trunk:1235730,1236166,1236624,1239365,1240136,1240252,1241195,1242729 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1242737&r1=1242736&r2=1242737&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Fri Feb 10 10:55:48 2012 @@ -108,13 +108,13 @@ public final class ProviderFactory { Object provider = ClassLoaderUtils.loadClass(className, ProviderFactory.class).newInstance(); factory.setProviders(provider); } catch (Throwable ex) { - String message = "Problem with setting the default provider " + className; + String message = "Problem with creating the default provider " + className; if (ex.getMessage() != null) { - message += ex.getMessage(); + message += ": " + ex.getMessage(); } else { message += ", exception class : " + ex.getClass().getName(); } - LOG.info(message); + LOG.fine(message); } }
