svn commit: r1402161 - in /cxf/trunk: api/src/main/java/org/apache/cxf/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/

[dk...@apache.org]

Author: dkulp
Date: Thu Oct 25 14:21:30 2012
New Revision: 1402161

URL: http://svn.apache.org/viewvc?rev=1402161&view=rev
Log:
[CXF-4602] With all the split package things resolved, we don't need separate properties files for messages from the various areas.

Added:
    cxf/trunk/api/src/main/java/org/apache/cxf/Messages.properties
      - copied, changed from r1402160, cxf/trunk/api/src/main/java/org/apache/cxf/APIMessages.properties
Removed:
    cxf/trunk/api/src/main/java/org/apache/cxf/APIMessages.properties
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/APIMessages.properties
Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/InitParamResourceResolver.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/Messages.properties

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java?rev=1402161&r1=1402160&r2=1402161&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java Thu Oct 25 14:21:30 2012
@@ -76,7 +76,7 @@ public abstract class BusFactory {
     protected static Map<Thread, BusHolder> threadBusses = new WeakHashMap<Thread, BusHolder>();
     protected static ThreadLocal<BusHolder> threadBus = new ThreadLocal<BusHolder>();
 
-    private static final Logger LOG = LogUtils.getL7dLogger(BusFactory.class, "APIMessages");
+    private static final Logger LOG = LogUtils.getL7dLogger(BusFactory.class);
 
     /**
      * Creates a new bus. While concrete <code>BusFactory</code> may offer differently parameterized methods

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/Messages.properties (from r1402160, cxf/trunk/api/src/main/java/org/apache/cxf/APIMessages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/Messages.properties?p2=cxf/trunk/api/src/main/java/org/apache/cxf/Messages.properties&p1=cxf/trunk/api/src/main/java/org/apache/cxf/APIMessages.properties&r1=1402160&r2=1402161&rev=1402161&view=diff
==============================================================================
    (empty)

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/InitParamResourceResolver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/InitParamResourceResolver.java?rev=1402161&r1=1402160&r2=1402161&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/InitParamResourceResolver.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/InitParamResourceResolver.java Thu Oct 25 14:21:30 2012
@@ -28,7 +28,7 @@ import org.apache.cxf.resource.ResourceR
 
 public class InitParamResourceResolver implements ResourceResolver {
 
-    private static final Logger LOG = LogUtils.getL7dLogger(InitParamResourceResolver.class, "APIMessages");
+    private static final Logger LOG = LogUtils.getL7dLogger(InitParamResourceResolver.class);
     
     Map<String, String> params;
     

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/Messages.properties?rev=1402161&r1=1402160&r2=1402161&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/Messages.properties (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/Messages.properties Thu Oct 25 14:21:30 2012
@@ -28,3 +28,7 @@ SEI_LOAD_FAILURE_EXC = Failed to load se
 NOT_A_QNAME_PATTER = Pattern {0} is not a qname pattern in xml {1}
 NOT_VALID_ELEMENT_IN_HANDLER = Element {0} is not allowed in handler chain
 NOT_VALID_ROOT_ELEMENT = {0} {1} Element {2} is not a valid root element in file {3}
+HANDLER_RAISED_RUNTIME_EXCEPTION = Handler execution raised a runtime exception.
+NO_INIT_METHOD_ON_HANDLER=Handler of type {0} has no init method but has been configured with init-params.
+CANNOT_ACCESS_INIT=The init method of handler type {0} is not accessible.
+INIT_METHOD_THREW_EXCEPTION=The init method on handler {0} threw an exception.
\ No newline at end of file