[jbossws-commits] JBossWS SVN: r16863 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: core and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Oct 12 04:30:12 EDT 2012
Author: alessio.soldano at jboss.com
Date: 2012-10-12 04:30:12 -0400 (Fri, 12 Oct 2012)
New Revision: 16863
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/Message.properties
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeLoggers.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/WSTimeoutException.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyHelper.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
Log:
[JBWS-3509] WIP on converting native messages to new logging...
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeLoggers.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeLoggers.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeLoggers.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -32,6 +32,7 @@
import java.util.List;
import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.Handler;
import javax.xml.rpc.handler.HandlerInfo;
import org.jboss.logging.BasicLogger;
@@ -49,6 +50,8 @@
public interface NativeLoggers extends BasicLogger
{
NativeLoggers ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(NativeLoggers.class, "org.jboss.ws.native");
+ NativeLoggers CLIENT_LOGGER = org.jboss.logging.Logger.getMessageLogger(NativeLoggers.class, "org.jboss.ws.native.client");
+ NativeLoggers JAXRPC_LOGGER = org.jboss.logging.Logger.getMessageLogger(NativeLoggers.class, "org.jboss.ws.native.jaxrpc");
@LogMessage(level = ERROR)
@Message(id = 25006, value = "Cannot process metrics")
@@ -198,4 +201,76 @@
@Message(id = 25193, value = "Multiple service endoints found for: %s")
void multipleServiceEndpointFoundFor(String s);
+ @LogMessage(level = ERROR)
+ @Message(id = 25201, value = "Error while parsing headers for configuring keep-alive, closing connection.")
+ void errorParsingHeadersForConfiguringKeepAlive(@Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25204, value = "Channel closed by remote peer while sending message.")
+ void channelClosed();
+
+ @LogMessage(level = WARN)
+ @Message(id = 25205, value = "Can't set chunk size from call properties, illegal value provided.")
+ void cannotSetChunkSize();
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 25217, value = "Could not find keytore url.")
+ void couldNotFindKeystore(@Cause Throwable cause);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 25218, value = "Could not find truststore url.")
+ void couldNotFindTruststore(@Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25226, value = "Cannot deserialize fault detail")
+ void cannotDeserializeFaultDetail(@Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25227, value = "Error creating SOAPFault message")
+ void errorCreatingSoapFaultMessage(@Cause Throwable cause);
+
+ @LogMessage(level = WARN)
+ @Message(id = 25229, value = "Empty namespace URI with fault code %s, assuming: %s")
+ void emptyNamespaceURI(QName q, String s);
+
+ @LogMessage(level = INFO)
+ @Message(id = 25231, value = "Ignoring Call.SOAPACTION_USE_PROPERTY because of BP-1.0 R2745, R2745")
+ void ignoreCallSoapActionUseProperty();
+
+ @LogMessage(level = WARN)
+ @Message(id = 25240, value = "Handler is in state DOES_NOT_EXIST, skipping Handler.handleRequest for: %s")
+ void handlerDoesNotExistSkippingHandleRequest(Handler h);
+
+ @LogMessage(level = WARN)
+ @Message(id = 25241, value = "Handler is in state DOES_NOT_EXIST, skipping Handler.handleResponse for: %s")
+ void handlerDoesNotExistSkippingHandleResponse(Handler h);
+
+ @LogMessage(level = WARN)
+ @Message(id = 25242, value = "Handler is in state DOES_NOT_EXIST, skipping Handler.handleFault for: %s")
+ void handlerDoesNotExistSkippingHandleFault(Handler h);
+
+ @LogMessage(level = WARN)
+ @Message(id = 25243, value = "RuntimeException in handler method, transition to does not exist")
+ void handlerTransitionToDoesNotExist();
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25244, value = "RuntimeException in request handler")
+ void runtimeExceptionInRequestHandler(@Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25245, value = "RuntimeException in response handler")
+ void runtimeExceptionInResponseHandler(@Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25246, value = "Cannot trace SOAP message")
+ void cannotTraceJAXRPCSoapMessage(@Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25247, value = "Cannot create handler instance for: %s")
+ void cannotCreateHandlerInstance(Object handlerInfo, @Cause Throwable cause);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 25250, value = "JAX-RPC Service error")
+ void jaxRpcServiceError(@Cause Throwable cause);
+
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -23,12 +23,15 @@
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.ConnectException;
import java.net.URL;
import java.util.Collection;
import javax.management.ObjectName;
import javax.wsdl.Part;
import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPException;
import javax.xml.transform.Source;
@@ -38,7 +41,9 @@
import org.jboss.logging.Cause;
import org.jboss.logging.Message;
import org.jboss.logging.MessageBundle;
+import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.soap.utils.Style;
import org.jboss.ws.core.soap.utils.Use;
import org.jboss.ws.metadata.wsdl.WSDLException;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
@@ -541,4 +546,106 @@
@Message(id = 25199, value = "Cannot get channel future before closing the stream")
IllegalStateException cannotGetChannelFuture();
+ @Message(id = 25200, value = "Could not connect to %s")
+ ConnectException couldNotConnectTo(String host);
+
+ @Message(id = 25202, value = "Timeout after: %s ms")
+ WSTimeoutException timeout(Long timeout);
+
+ @Message(id = 25203, value = "Receive timeout")
+ WSTimeoutException receiveTimeout();
+
+ @Message(id = 25206, value = "Could not transmit message")
+ IOException couldNotTransmitMessage();
+
+ @Message(id = 25207, value = "Connection timeout %s")
+ WSTimeoutException connectionTimeout(Long timeout);
+
+ @Message(id = 25208, value = "Can not set remoting socket factory with null protocol")
+ IllegalArgumentException cannotSetRemotingSocketFactory();
+
+ @Message(id = 25209, value = "Error creating server socket factory SSL context")
+ IOException errorCreatingServerSocketFactorySSLContext(@Cause Exception cause);
+
+ @Message(id = 25210, value = "Error creating socket factory SSL context")
+ IOException errorCreatingSocketFactorySSLContext(@Cause Exception cause);
+
+ @Message(id = 25211, value = "Can not find keystore url.")
+ IOException cannotFindKeystoreUrl(@Cause Exception cause);
+
+ @Message(id = 25212, value = "Error initializing server socket factory SSL context")
+ IOException errorInitializingServerSocketFactorySSLContext(@Cause Exception cause);
+
+ @Message(id = 25213, value = "Can not find truststore url.")
+ IOException cannotFindTruststoreUrl(@Cause Exception cause);
+
+ @Message(id = 25214, value = "Error initializing socket factory SSL context")
+ IOException errorInitializingSocketFactorySSLContext(@Cause Exception cause);
+
+ @Message(id = 25215, value = "Can not find key entry for key store (%s) with given alias (%s)")
+ IOException cannotFindKeyEntry(URL ksUrl, String alias);
+
+ @Message(id = 25216, value = "Can not find store file for url because store url is null")
+ String nullStoreURL();
+
+ @Message(id = 25219, value = "Cannot compare IQName to %s")
+ IllegalArgumentException cannotCompareIQNameTo(Object obj);
+
+ @Message(id = 25220, value = "Only element nodes are supported")
+ UnsupportedOperationException onlyElementNotesSupported();
+
+ @Message(id = 25221, value = "Only DOMSource is supported")
+ UnsupportedOperationException onlyDOMSourceSupported();
+
+ @Message(id = 25222, value = "Unsupported encoding style: %s")
+ JAXRPCException unsupportedEncodingStyle(String s);
+
+ @Message(id = 25223, value = "Cannot obtain deserializer factory for: %s")
+ JAXRPCException cannotObtainDeserializerFactory(QName qname);
+
+ @Message(id = 25224, value = "Cannot obtain serializer factory for: %s")
+ JAXRPCException cannotObtainSerializerFactory(QName qname);
+
+ @Message(id = 25225, value = "Invalid deserialization result: %s")
+ WSException invalidDeserializationResult(Object res);
+
+ @Message(id = 25228, value = "Cannot create SOAPFault message")
+ JAXRPCException cannotCreateSoapFaultMessage(@Cause Throwable cause);
+
+ @Message(id = 25230, value = "Illegal faultcode '%s', allowed values are: %s")
+ IllegalArgumentException illegalFaultCode(QName fc, Collection<QName> allowed);
+
+ @Message(id = 25232, value = "RoleSource was not available")
+ IllegalStateException roleSourceNotAvailable();
+
+ @Message(id = 25233, value = "Cannot generate xsd schema for: %s")
+ JAXRPCException cannotGenerateXsdSchemaFor(QName qname, @Cause Throwable cause);
+
+ @Message(id = 25234, value = "Cannot generate XSModel")
+ WSException cannotGenerateXsdModel();
+
+ @Message(id = 25235, value = "Unexpected style: %s")
+ WSException unexpectedStyle(Style style);
+
+ @Message(id = 25236, value = "Cannot generate XSModel")
+ WSException unexpectedParameterStyle();
+
+ @Message(id = 25237, value = "Operation is not document/literal (wrapped)")
+ WSException operationIsNotDocLitWrapped();
+
+ @Message(id = 25238, value = "Cannot generate a type when there is no wrapped parameter")
+ WSException cannotGenerateTypeWithNoWrappedParams();
+
+ @Message(id = 25239, value = "Could not generate wrapper type: %s")
+ WSException cannotGenerateWrapperType(String type, @Cause Throwable cause);
+
+ @Message(id = 25248, value = "No handler at position: %s")
+ IllegalArgumentException noHandlerAtPosition(int p);
+
+ @Message(id = 25249, value = "Invalid handler entry")
+ IllegalStateException invalidHandlerEntry();
+
+ @Message(id = 25251, value = "Don't know how to invoke method %s")
+ JAXRPCException dontKnowHowToInvoke(Method method);
+
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/WSTimeoutException.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/WSTimeoutException.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/WSTimeoutException.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -31,11 +31,21 @@
{
private long timeout;
+ public WSTimeoutException(String message)
+ {
+ super(message);
+ }
+
public WSTimeoutException(String message, long timeout)
{
super(message);
this.timeout = timeout;
}
+
+ public void setTimeout(long timeout)
+ {
+ this.timeout = timeout;
+ }
public long getTimeout()
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,15 +21,12 @@
*/
package org.jboss.ws.core.binding;
-import java.util.ResourceBundle;
-
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.common.DOMUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.core.soap.SOAPContentElement;
@@ -44,8 +41,6 @@
*/
public abstract class DeserializerSupport implements Deserializer
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(DeserializerSupport.class);
- private static final Logger log = Logger.getLogger(DeserializerSupport.class);
private static final QName XSI_NIL = new QName("http://www.w3.org/2001/XMLSchema-instance", "nil");
public Object deserialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
@@ -95,9 +90,9 @@
if (nodeType == Node.ELEMENT_NODE)
{
return (Element)node;
- } else throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "ONLY_ELEMENT_NODES_ARE_SUPPORTED"));
+ } else throw NativeMessages.MESSAGES.onlyElementNotesSupported();
}
- else throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "ONLY_DOMSOURCE_IS_SUPPORTED"));
+ else throw NativeMessages.MESSAGES.onlyDOMSourceSupported();
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/Message.properties 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/Message.properties 2012-10-12 08:30:12 UTC (rev 16863)
@@ -1,5 +0,0 @@
-JAVATYPE_CANNOT_BE_NULL=javaType cannot be null for: {0}
-XMLTYPE_CANNOT_BE_NULL=xmlType cannot be null for: {0}
-CANNOT_COMPARE_IQNAME=Cannot compare IQName to {0}
-ONLY_ELEMENT_NODES_ARE_SUPPORTED=Only element nodes are supported
-ONLY_DOMSOURCE_IS_SUPPORTED=Only DOMSource is supported
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -34,7 +34,7 @@
*/
public abstract class SerializationContext
{
- private Class javaType;
+ private Class<?> javaType;
private TypeMappingImpl typeMapping;
// The namespace registry that is valid for this serialization context
@@ -67,12 +67,12 @@
return namespaceRegistry;
}
- public Class getJavaType()
+ public Class<?> getJavaType()
{
return javaType;
}
- public void setJavaType(Class javaType)
+ public void setJavaType(Class<?> javaType)
{
this.javaType = javaType;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -30,7 +30,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.ResourceBundle;
import java.util.concurrent.ConcurrentHashMap;
import javax.xml.namespace.QName;
@@ -39,7 +38,7 @@
import javax.xml.rpc.encoding.TypeMapping;
import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.JavaUtils;
import org.jboss.ws.common.utils.HashCodeUtil;
@@ -68,7 +67,6 @@
*/
public abstract class TypeMappingImpl implements TypeMapping
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(TypeMappingImpl.class);
// provide logging
private static final Logger log = Logger.getLogger(TypeMappingImpl.class);
@@ -150,9 +148,9 @@
private void registerInternal(Class javaType, IQName xmlType, SerializerFactory sf, DeserializerFactory df)
{
if (javaType == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "JAVATYPE_CANNOT_BE_NULL", xmlType));
+ throw NativeMessages.MESSAGES.illegalNullArgument("javaType");
if (xmlType == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "XMLTYPE_CANNOT_BE_NULL", javaType));
+ throw NativeMessages.MESSAGES.illegalNullArgument("xmlType");
KeyPair kPair = new KeyPair(xmlType, javaType);
FactoryPair fPair = new FactoryPair(sf, df);
@@ -708,7 +706,7 @@
public boolean equals(Object object) {
if(!(object instanceof IQName))
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_COMPARE_IQNAME", object));
+ throw NativeMessages.MESSAGES.cannotCompareIQNameTo(object);
IQName iqn = (IQName)object;
return (iqn.namespace == this.namespace && iqn.localPart == this.localPart);
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/Message.properties 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/Message.properties 2012-10-12 08:30:12 UTC (rev 16863)
@@ -1,9 +0,0 @@
-CAN_NOT_SET_REMOTING_SOCKET_FACTORY=Can not set remoting socket factory with null protocol
-ERROR_CREATING_SERVER_SOCKET_FACTORY=Error creating server socket factory SSL context: {0}
-ERROR_CREATING_SOCKET_FACTORY=Error creating socket factory SSL context: {0}
-CAN_NOT_FIND_KEYSTORE_URL=Can not find keystore url.
-ERROR_INITIALIZING_SERVER_SOCKET_FACTORY=Error initializing server socket factory SSL context: {0}
-CAN_NOT_FIND_TRUSTSTORE_URL=Can not find truststore url.
-ERROR_INITIALIZING_SOCKET_FACTORY=Error initializing socket factory SSL context: {0}
-CAN_NOT_FIND_KEY_ENTRY=Can not find key entry for key store ({0}) with given alias ({1})
-CAN_NOT_FIND_STORE_FILE=Can not find store file for url because store url is null.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,6 +21,8 @@
*/
package org.jboss.ws.core.client.ssl;
+import static org.jboss.ws.NativeMessages.MESSAGES;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -36,7 +38,6 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Map;
-import java.util.ResourceBundle;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -46,8 +47,7 @@
import javax.net.ssl.X509KeyManager;
import javax.net.ssl.X509TrustManager;
-import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeLoggers;
import org.jboss.ws.core.StubExt;
/**
@@ -165,10 +165,6 @@
private Boolean serverSocketUseClientMode = null;
private Boolean serverAuthMode = null;
- private static final ResourceBundle bundle = BundleUtils.getBundle(SSLContextFactory.class);
-
- private static final Logger log = Logger.getLogger(SSLContextFactory.class);
-
/**
* Constructor for {@link SSLContextFactory} that does not have
* any configuration so it falls back to all defaults.
@@ -240,7 +236,7 @@
}
else
{
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CAN_NOT_SET_REMOTING_SOCKET_FACTORY"));
+ throw MESSAGES.cannotSetRemotingSocketFactory();
}
}
@@ -848,9 +844,7 @@
}
catch(Exception e)
{
- IOException ioe = new IOException(BundleUtils.getMessage(bundle, "ERROR_CREATING_SERVER_SOCKET_FACTORY", e.getMessage()));
- ioe.setStackTrace(e.getStackTrace());
- throw ioe;
+ throw MESSAGES.errorCreatingServerSocketFactorySSLContext(e);
}
return;
@@ -887,9 +881,7 @@
}
catch(Exception e)
{
- IOException ioe = new IOException(BundleUtils.getMessage(bundle, "ERROR_CREATING_SOCKET_FACTORY", e.getMessage()));
- ioe.setStackTrace(e.getStackTrace());
- throw ioe;
+ throw MESSAGES.errorCreatingSocketFactorySSLContext(e);
}
return;
@@ -923,14 +915,12 @@
if (isServerSocketUseClientMode())
{
keyManagers = null;
- log.debugf("Could not find keytore url. %s", e.getMessage());
+ NativeLoggers.CLIENT_LOGGER.couldNotFindKeystore(e);
}
else
{
// because this ssl context will create server socket factories, will throw if can not find keystore
- IOException ioe = new IOException(BundleUtils.getMessage(bundle, "CAN_NOT_FIND_KEYSTORE_URL"));
- ioe.initCause(e);
- throw ioe;
+ throw MESSAGES.cannotFindKeystoreUrl(e);
}
}
@@ -942,7 +932,7 @@
catch (NullStoreURLException e)
{
trustManagers = null;
- log.debugf("Could not find truststore url. %s", e.getMessage());
+ NativeLoggers.CLIENT_LOGGER.couldNotFindTruststore(e);
}
secureRandom = getSecureRandom();
@@ -951,9 +941,7 @@
}
catch(Exception e)
{
- IOException ioe = new IOException(BundleUtils.getMessage(bundle, "ERROR_INITIALIZING_SERVER_SOCKET_FACTORY", e.getMessage()));
- ioe.setStackTrace(e.getStackTrace());
- throw ioe;
+ throw MESSAGES.errorInitializingServerSocketFactorySSLContext(e);
}
return;
@@ -986,7 +974,7 @@
{
// this is allowable since would be the normal scenario
keyManagers = null;
- log.debugf("Could not find keystore url. %s ", e.getMessage());
+ NativeLoggers.CLIENT_LOGGER.couldNotFindKeystore(e);
}
try
@@ -1002,13 +990,11 @@
if(keyManagers != null)
{
trustManagers = null;
- log.debugf("Could not find truststore url. %s", e.getMessage());
+ NativeLoggers.CLIENT_LOGGER.couldNotFindTruststore(e);
}
else
{
- IOException ioe = new IOException(BundleUtils.getMessage(bundle, "CAN_NOT_FIND_TRUSTSTORE_URL"));
- ioe.initCause(e);
- throw ioe;
+ throw MESSAGES.cannotFindTruststoreUrl(e);
}
}
@@ -1018,9 +1004,7 @@
}
catch(Exception e)
{
- IOException ioe = new IOException(BundleUtils.getMessage(bundle, "ERROR_INITIALIZING_SOCKET_FACTORY", e.getMessage()));
- ioe.setStackTrace(e.getStackTrace());
- throw ioe;
+ throw MESSAGES.errorInitializingSocketFactorySSLContext(e);
}
return;
@@ -1121,7 +1105,7 @@
if(!containsAlias)
{
// can not continue as supplied alias does not exist as key entry
- throw new IOException(BundleUtils.getMessage(bundle, "CAN_NOT_FIND_KEY_ENTRY", new Object[]{ ksPathURL, alias }));
+ throw MESSAGES.cannotFindKeyEntry(ksPathURL, alias);
}
}
@@ -1202,7 +1186,7 @@
if ( storePathURL == null )
{
- throw new NullStoreURLException(BundleUtils.getMessage(bundle, "CAN_NOT_FIND_STORE_FILE"));
+ throw new NullStoreURLException(MESSAGES.nullStoreURL());
}
// now that keystore instance created, need to load data from file
@@ -1266,7 +1250,7 @@
if(tst.exists() == true)
{
- url = tst.toURL();
+ url = tst.toURI().toURL();
}
else
{
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/Message.properties 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/Message.properties 2012-10-12 08:30:12 UTC (rev 16863)
@@ -1,11 +0,0 @@
-OPERATION_CANCELLED=Operation Cancelled
-TIMEOUT_EXCEEDED=Timeout Exceeded
-COULD_NOT_CONNECT_TO=Could not connect to {0}
-ERROR_WHILE_PARSING_HEADERS=Error while parsing headers for configuring keep-alive, closing connection.
-INVALID_ADDRESS=Invalid address: {0}
-RECEIVE_TIMEOUT=Receive timeout
-CHANNEL_CLOSED=Channel closed by remote peer while sending message
-CONNECTION_TIMEOUT=Connection timeout
-COULD_NOT_TRANSMIT_MESSAGE=Could not transmit message
-CAN_NOT_SET_CHUNK_SIZE=Can't set chunk size from call properties, illegal value provided!
-TIMEOUT=Timeout after: {0}ms
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -29,7 +29,6 @@
import java.nio.channels.ClosedChannelException;
import java.util.HashMap;
import java.util.Map;
-import java.util.ResourceBundle;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -39,7 +38,6 @@
import javax.net.ssl.SSLEngine;
import javax.xml.rpc.Stub;
-import org.jboss.logging.Logger;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferOutputStream;
import org.jboss.netty.buffer.ChannelBuffers;
@@ -53,7 +51,8 @@
import org.jboss.netty.handler.codec.http.HttpVersion;
import org.jboss.netty.handler.ssl.SslHandler;
import org.jboss.util.Base64;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeLoggers;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.client.Marshaller;
@@ -70,12 +69,10 @@
*/
public class NettyClient
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(NettyClient.class);
public static final String RESPONSE_CODE = "org.jboss.ws.core.client.transport.NettyClient#ResponseCode";
public static final String RESPONSE_CODE_MESSAGE = "org.jboss.ws.core.client.transport.NettyClient#ResponseCodeMessage";
public static final String PROTOCOL = "org.jboss.ws.core.client.transport.NettyClient#Protocol";
public static final String RESPONSE_HEADERS = "org.jboss.ws.core.client.transport.NettyClient#ResponseHeaders";
- private static Logger log = Logger.getLogger(NettyClient.class);
private Marshaller marshaller;
private UnMarshaller unmarshaller;
@@ -122,7 +119,7 @@
{
if (NettyTransportHandler.getHttpKeepAliveSet())
{
- log.info("Retrying with a new connection..."); //because using keep-alive connections it's possible to try re-using closed connections before they've been evicted
+ //because using keep-alive connections it's possible to try re-using closed connections before they've been evicted
return invokeInternal(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
}
else
@@ -141,7 +138,7 @@
}
catch (MalformedURLException e)
{
- throw new RuntimeException(BundleUtils.getMessage(bundle, "INVALID_ADDRESS", targetAddress), e);
+ throw new RuntimeException(e);
}
NettyTransportHandler transport = NettyTransportHandler.getInstance(target, NettyHelper.getChannelPipelineFactory(getSSLHandler(target, callProps)));
@@ -213,10 +210,12 @@
Throwable t = ee.getCause();
throw t != null ? t : ee;
}
- catch (TimeoutException te)
- {
- throw new WSTimeoutException(BundleUtils.getMessage(bundle, "RECEIVE_TIMEOUT"), receiveTimeout == null ? -1 : receiveTimeout);
- }
+ catch (TimeoutException te)
+ {
+ WSTimeoutException e = NativeMessages.MESSAGES.receiveTimeout();
+ e.setTimeout(receiveTimeout == null ? -1 : receiveTimeout);
+ throw e;
+ }
resHeaders = result.getResponseHeaders();
resMetadata = result.getMetadata();
Object resMessage = oneway ? null : unmarshaller.read(result.getResponse(), resMetadata, resHeaders);
@@ -232,7 +231,7 @@
}
catch (ClosedChannelException cce)
{
- log.error(BundleUtils.getMessage(bundle, "CHANNEL_CLOSED"));
+ NativeLoggers.CLIENT_LOGGER.channelClosed();
transport.end();
throw cce;
}
@@ -243,7 +242,7 @@
}
catch (TimeoutException te)
{
- throw new WSTimeoutException(BundleUtils.getMessage(bundle, "CONNECTION_TIMEOUT"), connectionTimeout == null ? -1 : connectionTimeout);
+ throw NativeMessages.MESSAGES.connectionTimeout(connectionTimeout == null ? -1 : connectionTimeout);
}
catch (IOException ioe)
{
@@ -255,7 +254,7 @@
}
catch (Throwable t)
{
- IOException io = new IOException(BundleUtils.getMessage(bundle, "COULD_NOT_TRANSMIT_MESSAGE"));
+ IOException io = NativeMessages.MESSAGES.couldNotTransmitMessage();
io.initCause(t);
transport.end();
throw io;
@@ -348,7 +347,7 @@
}
catch (Exception e)
{
- log.warn(BundleUtils.getMessage(bundle, "CAN_NOT_SET_CHUNK_SIZE"));
+ NativeLoggers.CLIENT_LOGGER.cannotSetChunkSize();
}
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyHelper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyHelper.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyHelper.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -25,7 +25,6 @@
import java.util.Collection;
import java.util.Map;
-import java.util.ResourceBundle;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
@@ -36,7 +35,7 @@
import org.jboss.netty.handler.codec.http.HttpRequestEncoder;
import org.jboss.netty.handler.codec.http.HttpResponseDecoder;
import org.jboss.netty.handler.ssl.SslHandler;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.core.WSTimeoutException;
/**
@@ -48,7 +47,6 @@
*/
public class NettyHelper
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(NettyHelper.class);
public static final String RESPONSE_HANDLER_NAME = "handler";
public static ChannelPipelineFactory getChannelPipelineFactory()
@@ -92,7 +90,7 @@
boolean bool = future.awaitUninterruptibly(timeout);
if (!bool)
{
- throw new WSTimeoutException(BundleUtils.getMessage(bundle, "TIMEOUT"), timeout);
+ throw NativeMessages.MESSAGES.timeout(timeout);
}
}
else
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -27,10 +27,8 @@
import java.net.URL;
import java.security.AccessController;
import java.util.Map;
-import java.util.ResourceBundle;
import java.util.StringTokenizer;
-import org.jboss.logging.Logger;
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFactory;
@@ -38,7 +36,8 @@
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.handler.codec.http.HttpHeaders;
import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeLoggers;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.common.Constants;
@@ -52,8 +51,6 @@
*/
public class NettyTransportHandler
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(NettyTransportHandler.class);
- private static Logger log = Logger.getLogger(NettyTransportHandler.class);
private static final int DEFAULT_KEEP_ALIVE_CONS = 5;
private URL url;
@@ -165,7 +162,7 @@
NettyHelper.awaitUninterruptibly(connectFuture, timeout);
if (!connectFuture.isSuccess())
{
- ConnectException ce = new ConnectException(BundleUtils.getMessage(bundle, "COULD_NOT_CONNECT_TO", url.getHost()));
+ ConnectException ce = NativeMessages.MESSAGES.couldNotConnectTo(url.getHost());
ce.initCause(connectFuture.getCause());
throw ce;
}
@@ -259,7 +256,7 @@
}
catch (Exception ex)
{
- log.error(BundleUtils.getMessage(bundle, "ERROR_WHILE_PARSING_HEADERS"), ex);
+ NativeLoggers.CLIENT_LOGGER.errorParsingHeadersForConfiguringKeepAlive(ex);
keepAliveConnections = -1;
keepingAlive = false;
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-10-12 08:30:12 UTC (rev 16863)
@@ -1,25 +0,0 @@
-CANNOT_GENERATE_XSMODEL=Cannot generate XSModel
-CANNOT_GENERATE_XSDSCHEMA=Cannot generate xsdSchema for: {0}
-INVALID_NAMESPACE_FOR_TYPE=Invalid namespace for type: {0}
-MESSAGECONTEXT_NOT_AVAILABLE=MessageContext not available
-UNEXPECTED_STYLE=Unexpected style: {0}
-UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style
-CANNOT_WRAP_REQUEST_STRUCTURE=Cannot wrap request structure: {0}
-REQUEST_STRUCT_CANNOT_BE_NULL=Request struct cannot be null
-CANNOT_UNWRAP_REQUEST_STRUCTURE=Cannot unwrap request structure: {0}
-CANNOT_WRAP_RESPONSE_STRUCTURE=Cannot wrap response structure: {0}
-OPERATION_IS_NOT_DOC_LIT=Operation is not document/literal (wrapped)
-CANNOT_GENERATE_TYPE=Cannot generate a type when their is no wrapped parameters
-COULD_NOT_GENERATE_WRAPPER_TYPE=Could not generate wrapper type: {0}
-ROLESOURCE_WAS_NOT_AVAILABLE=RoleSource was not available
-CANNOT_OBTAIN_DESERIALIZER_FACTORY=Cannot obtain deserializer factory for: {0}
-INVALID_DESERIALIZATION_RESULT=Invalid deserialization result: {0}
-CANNOT_DESERIALIZE_FAULT_DETAIL=Cannot deserialize fault detail
-SOAP_REQUEST_EXCEPTION=SOAP request exception
-ERROR_CREATING_SOAPFAULT_MESSAGE=Error creating SOAPFault message
-CANNOT_CREATE_SOAPFAULT_MESSAGE=Cannot create SOAPFault message for: {0}
-CANNOT_OBTAIN_SERIALIZER_FACTORY=Cannot obtain serializer factory for: {0}
-FAULTCODE_CANNOT_BE_NULL=faultcode cannot be null
-EMPTY_NAMESPACE_URI=Empty namespace URI with fault code {0}, assuming: {1}
-ILLEGAL_FAULTCODE=Illegal faultcode '{0}', allowed values are: {1}
-UNSUPPORTED_ENCODING_STYLE=Unsupported encoding style: {0}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,12 +21,13 @@
*/
package org.jboss.ws.core.jaxrpc;
+import static org.jboss.ws.NativeMessages.MESSAGES;
+
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.ResourceBundle;
import javassist.ClassPool;
import javassist.CtClass;
@@ -39,7 +40,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.JavaUtils;
import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
@@ -62,7 +62,6 @@
*/
public class ParameterWrapping
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(ParameterWrapping.class);
// provide logging
private static Logger log = Logger.getLogger(ParameterWrapping.class);
@@ -70,10 +69,10 @@
private static void assertOperationMetaData(OperationMetaData opMetaData)
{
if (opMetaData.getStyle() != Style.DOCUMENT)
- throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_STYLE", opMetaData.getStyle()));
+ throw MESSAGES.unexpectedStyle(opMetaData.getStyle());
if (!opMetaData.isWrappedParameterStyle())
- throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE"));
+ throw MESSAGES.unexpectedParameterStyle();
}
private static Object holderValue(Object holder)
@@ -86,7 +85,7 @@
return HolderUtils.getHolderValue(holder);
}
- public static Class getWrappedType(String variable, Class wrapperType)
+ public static Class<?> getWrappedType(String variable, Class<?> wrapperType)
{
try
{
@@ -105,7 +104,7 @@
{
assertOperationMetaData(request.getOperationMetaData());
- Class reqStructType = request.getJavaType();
+ Class<?> reqStructType = request.getJavaType();
if(log.isDebugEnabled()) log.debug("wrapRequestParameters: " + reqStructType.getName());
List<WrappedParameter> wrappedParameters = request.getWrappedParameters();
try
@@ -125,7 +124,7 @@
}
catch (Exception e)
{
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_WRAP_REQUEST_STRUCTURE", e));
+ throw new WSException(e);
}
}
@@ -135,19 +134,19 @@
assertOperationMetaData(opMetaData);
if (reqStruct == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "REQUEST_STRUCT_CANNOT_BE_NULL"));
+ throw MESSAGES.illegalNullArgument("reqStruct");
- Class[] targetParameterTypes = opMetaData.getJavaMethod().getParameterTypes();
+ Class<?>[] targetParameterTypes = opMetaData.getJavaMethod().getParameterTypes();
Map<Integer, Object> outParameters = new HashMap<Integer, Object>(targetParameterTypes.length);
List<WrappedParameter> wrappedParameters = request.getWrappedParameters();
- Class reqStructType = reqStruct.getClass();
+ Class<?> reqStructType = reqStruct.getClass();
if(log.isDebugEnabled()) log.debug("unwrapRequestParameters: " + reqStructType.getName());
try
{
for (WrappedParameter param : wrappedParameters)
{
- Class targetType = targetParameterTypes[param.getIndex()];
+ Class<?> targetType = targetParameterTypes[param.getIndex()];
Object value = param.accessor().get(reqStruct);
// INOUT Parameter
@@ -166,7 +165,7 @@
}
catch (Exception e)
{
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_UNWRAP_REQUEST_STRUCTURE", e));
+ throw new IllegalArgumentException(e);
}
return outParameters;
@@ -176,7 +175,7 @@
{
assertOperationMetaData(returnMetaData.getOperationMetaData());
- Class resStructType = returnMetaData.getJavaType();
+ Class<?> resStructType = returnMetaData.getJavaType();
if (returnValue != null && returnValue.getClass() == resStructType)
{
if(log.isDebugEnabled()) log.debug("Response parameter already wrapped" + resStructType.getName());
@@ -202,7 +201,7 @@
}
catch (Exception e)
{
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_WRAP_RESPONSE_STRUCTURE", e));
+ throw new WSException(e);
}
}
@@ -214,11 +213,11 @@
Object retValue = null;
if (resStruct != null)
{
- Class resStructType = resStruct.getClass();
+ Class<?> resStructType = resStruct.getClass();
if(log.isDebugEnabled()) log.debug("unwrapResponseParameter: " + resStructType.getName());
List<WrappedParameter> wrappedParameters = retMetaData.getWrappedParameters();
- Class[] targetTypes = operationMetaData.getJavaMethod().getParameterTypes();
+ Class<?>[] targetTypes = operationMetaData.getJavaMethod().getParameterTypes();
try
{
for (WrappedParameter param : wrappedParameters)
@@ -230,7 +229,7 @@
}
else
{
- Class targetType = targetTypes[param.getIndex()];
+ Class<?> targetType = targetTypes[param.getIndex()];
if (HolderUtils.isHolderType(targetType))
HolderUtils.setHolderValue(methodParams[param.getIndex()], value);
methodParams[param.getIndex()] = value;
@@ -243,7 +242,7 @@
}
catch (Exception e)
{
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_UNWRAP_REQUEST_STRUCTURE", e));
+ throw new IllegalArgumentException(e);
}
}
return retValue;
@@ -275,10 +274,10 @@
ClassLoader loader = serviceMetaData.getUnifiedMetaData().getClassLoader();
if (operationMetaData.isDocumentWrapped() == false)
- throw new WSException(BundleUtils.getMessage(bundle, "OPERATION_IS_NOT_DOC_LIT"));
+ throw MESSAGES.operationIsNotDocLitWrapped();
if (wrappedParameters == null)
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_GENERATE_TYPE"));
+ throw MESSAGES.cannotGenerateTypeWithNoWrappedParams();
String serviceName = serviceMetaData.getServiceName().getLocalPart();
String parameterName = pmd.getXmlName().getLocalPart();
@@ -288,7 +287,7 @@
String wrapperName = packageName + "._JBossWS_" + serviceName + "_" + endpointName + "_" + parameterName;
if(log.isDebugEnabled()) log.debug("Generating wrapper: " + wrapperName);
- Class wrapperType;
+ Class<?> wrapperType;
try
{
ClassPool pool = new ClassPool(true);
@@ -309,7 +308,7 @@
}
catch (Exception e)
{
- throw new WSException(BundleUtils.getMessage(bundle, "COULD_NOT_GENERATE_WRAPPER_TYPE", wrapperName), e);
+ throw MESSAGES.cannotGenerateWrapperType(wrapperName, e);
}
// Register type mapping if needed
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,12 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc;
-import java.util.ResourceBundle;
import java.util.Set;
import javax.xml.soap.SOAPMessage;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.core.CommonSOAP11Binding;
import org.jboss.ws.core.RoleSource;
import org.jboss.ws.core.soap.SOAPFaultImpl;
@@ -40,7 +39,6 @@
*/
public class SOAP11BindingJAXRPC extends CommonSOAP11Binding
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(SOAP11BindingJAXRPC.class);
// Delegate to JAXWS SOAP binding
private SOAPBindingJAXRPC delegate = new SOAPBindingJAXRPC();
@@ -63,7 +61,7 @@
public Set<String> getRoles()
{
if (!(headerSource instanceof RoleSource))
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "ROLESOURCE_WAS_NOT_AVAILABLE"));
+ throw NativeMessages.MESSAGES.roleSourceNotAvailable();
return ((RoleSource)headerSource).getRoles();
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,12 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc;
-import java.util.ResourceBundle;
import java.util.Set;
import javax.xml.soap.SOAPMessage;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.core.CommonSOAP12Binding;
import org.jboss.ws.core.RoleSource;
import org.jboss.ws.core.soap.SOAPFaultImpl;
@@ -40,7 +39,6 @@
*/
public class SOAP12BindingJAXRPC extends CommonSOAP12Binding
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(SOAP12BindingJAXRPC.class);
// Delegate to JAXWS SOAP binding
private SOAPBindingJAXRPC delegate = new SOAPBindingJAXRPC();
@@ -58,7 +56,7 @@
public Set<String> getRoles()
{
if (!(headerSource instanceof RoleSource))
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "ROLESOURCE_WAS_NOT_AVAILABLE"));
+ throw NativeMessages.MESSAGES.roleSourceNotAvailable();
return ((RoleSource)headerSource).getRoles();
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -25,7 +25,7 @@
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPMessage;
-import org.jboss.logging.Logger;
+import org.jboss.ws.NativeLoggers;
import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -38,9 +38,6 @@
*/
class SOAPBindingJAXRPC
{
- // provide logging
- private static Logger log = Logger.getLogger(SOAPBindingJAXRPC.class);
-
public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage)
{
MessageContextJAXRPC msgContext = (MessageContextJAXRPC)MessageContextAssociation.peekMessageContext();
@@ -57,7 +54,7 @@
// present with an empty string as its value.
if (msgContext.getProperty(Call.SOAPACTION_USE_PROPERTY) != null)
- log.info("Ignore Call.SOAPACTION_USE_PROPERTY because of BP-1.0 R2745, R2745");
+ NativeLoggers.JAXRPC_LOGGER.ignoreCallSoapActionUseProperty();
String soapActionProperty = (String)msgContext.getProperty(Call.SOAPACTION_URI_PROPERTY);
if (soapActionProperty != null)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,10 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc;
+import static org.jboss.ws.NativeMessages.MESSAGES;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.ResourceBundle;
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
@@ -48,8 +49,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.NativeLoggers;
-import org.jboss.ws.WSException;
-import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPFaultException;
@@ -76,7 +75,6 @@
*/
public class SOAPFaultHelperJAXRPC
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(SOAPFaultHelperJAXRPC.class);
// provide logging
private static Logger log = Logger.getLogger(SOAPFaultHelperJAXRPC.class);
/**
@@ -134,7 +132,7 @@
// Get the deserializer from the type mapping
AbstractDeserializerFactory desFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(javaType, xmlType);
if (desFactory == null)
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_DESERIALIZER_FACTORY", xmlType));
+ throw MESSAGES.cannotObtainDeserializerFactory(xmlType);
try
{
@@ -153,7 +151,7 @@
DeserializerSupport des = (DeserializerSupport)desFactory.getDeserializer();
Object userEx = des.deserialize(xmlName, xmlType, xmlFragment, serContext);
if (userEx == null || (userEx instanceof Exception) == false)
- throw new WSException(BundleUtils.getMessage(bundle, "INVALID_DESERIALIZATION_RESULT", userEx));
+ throw MESSAGES.invalidDeserializationResult(userEx);
faultEx.initCause((Exception)userEx);
}
@@ -163,7 +161,7 @@
}
catch (Exception ex)
{
- log.error(BundleUtils.getMessage(bundle, "CANNOT_DESERIALIZE_FAULT_DETAIL"), ex);
+ NativeLoggers.JAXRPC_LOGGER.cannotDeserializeFaultDetail(ex);
}
}
else
@@ -213,7 +211,7 @@
}
Throwable faultCause = faultEx.getCause();
- NativeLoggers.ROOT_LOGGER.soapRequestException(faultCause != null ? faultCause : faultEx);
+ NativeLoggers.JAXRPC_LOGGER.soapRequestException(faultCause != null ? faultCause : faultEx);
try
{
@@ -226,8 +224,8 @@
}
catch (Exception ex)
{
- log.error(BundleUtils.getMessage(bundle, "ERROR_CREATING_SOAPFAULT_MESSAGE"), ex);
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_CREATE_SOAPFAULT_MESSAGE", faultEx));
+ NativeLoggers.JAXRPC_LOGGER.errorCreatingSoapFaultMessage(ex);
+ throw MESSAGES.cannotCreateSoapFaultMessage(faultEx);
}
}
@@ -283,7 +281,7 @@
// Get the serializer from the type mapping
AbstractSerializerFactory serFactory = (AbstractSerializerFactory)typeMapping.getSerializer(javaType, xmlType);
if (serFactory == null)
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_SERIALIZER_FACTORY", xmlType));
+ throw MESSAGES.cannotObtainSerializerFactory(xmlType);
try
{
@@ -347,19 +345,19 @@
private static void assertFaultCode(QName faultCode)
{
if (faultCode == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "FAULTCODE_CANNOT_BE_NULL"));
+ throw MESSAGES.illegalNullArgument("faultCode");
// For lazy folkes like the CTS that don't bother to give
// a namesapce URI, assume they use a standard code
String nsURI = faultCode.getNamespaceURI();
if ("".equals(nsURI))
{
- log.warn(BundleUtils.getMessage(bundle, "EMPTY_NAMESPACE_URI", new Object[]{ faultCode , Constants.NS_SOAP11_ENV}));
+ NativeLoggers.JAXRPC_LOGGER.emptyNamespaceURI(faultCode , Constants.NS_SOAP11_ENV);
faultCode = new QName(Constants.NS_SOAP11_ENV, faultCode.getLocalPart());
}
// WS-I allows non custom faultcodes if you use a non soap namespace
if (Constants.NS_SOAP11_ENV.equals(nsURI) && allowedFaultCodes.contains(faultCode) == false)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "ILLEGAL_FAULTCODE", new Object[]{ faultCode , allowedFaultCodes}));
+ throw MESSAGES.illegalFaultCode(faultCode, allowedFaultCodes);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -23,14 +23,11 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.ResourceBundle;
import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.JavaToXSD;
@@ -42,7 +39,7 @@
*/
public class SchemaGenerator
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(SchemaGenerator.class);
+// private static final ResourceBundle bundle = BundleUtils.getBundle(SchemaGenerator.class);
// provide logging
private static final Logger log = Logger.getLogger(SchemaGenerator.class);
@@ -71,7 +68,7 @@
JBossXSModel xsModel = javaToXSD.generateForSingleType(xmlType, javaType);
if (xsModel == null)
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_GENERATE_XSMODEL"));
+ throw NativeMessages.MESSAGES.cannotGenerateXsdModel();
if(log.isDebugEnabled()) log.debug("\n" + xsModel.serialize());
return xsModel;
@@ -82,7 +79,7 @@
}
catch (Exception e)
{
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_GENERATE_XSDSCHEMA", xmlType), e);
+ throw NativeMessages.MESSAGES.cannotGenerateXsdSchemaFor(xmlType, e);
}
}
@@ -102,6 +99,6 @@
{
String nsURI = xmlType.getNamespaceURI();
if (nsURI.length() == 0)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_NAMESPACE_FOR_TYPE", xmlType));
+ throw new IllegalArgumentException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,14 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc;
-import java.util.ResourceBundle;
-
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.JavaUtils;
import org.jboss.ws.core.binding.SerializationContext;
@@ -49,7 +45,6 @@
*/
public class SerializationContextJAXRPC extends SerializationContext
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(SerializationContextJAXRPC.class);
// provide logging
private static final Logger log = Logger.getLogger(SerializationContextJAXRPC.class);
@@ -120,8 +115,7 @@
public XSModel getXsModel()
{
SOAPMessageContextJAXRPC msgContext = (SOAPMessageContextJAXRPC)MessageContextAssociation.peekMessageContext();
- if (msgContext == null)
- throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE"));
+ assert(msgContext != null);
OperationMetaData opMetaData = msgContext.getOperationMetaData();
ServiceMetaData serviceMetaData = opMetaData.getEndpointMetaData().getServiceMetaData();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -23,13 +23,11 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.ResourceBundle;
-import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.encoding.TypeMapping;
import javax.xml.rpc.encoding.TypeMappingRegistry;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.binding.TypeMappingImpl;
@@ -41,7 +39,6 @@
*/
public class TypeMappingRegistryImpl implements TypeMappingRegistry
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(TypeMappingRegistryImpl.class);
// The registered typeMapping for the literal encoding style
private Map<String, TypeMappingImpl> typeMappings = new HashMap<String, TypeMappingImpl>();
@@ -160,6 +157,6 @@
private void assertEncodingStyle(String encURI)
{
if (Constants.URI_LITERAL_ENC.equals(encURI) == false && Constants.URI_SOAP11_ENC.equals(encURI) == false)
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "UNSUPPORTED_ENCODING_STYLE", encURI));
+ throw NativeMessages.MESSAGES.unsupportedEncodingStyle(encURI);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/Message.properties 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/Message.properties 2012-10-12 08:30:12 UTC (rev 16863)
@@ -1,5 +1,3 @@
-NOT_KNOW_HOW_TO_INVOKE=Don't know how to invoke: {0}
-SERVICE_ERROR=Service error
REGISTER_UNQUALIFIED_PARAMETER=Register unqualified call parameter for: {0}
INVALID_NULL_PARAMETER=Invalid null parameter
OUTPUT_PARAMS_NOT_AVAILABLE=Output params not available
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -33,13 +33,13 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.ResourceBundle;
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.Service;
import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeLoggers;
+import org.jboss.ws.NativeMessages;
/**
* This is the proxy that implements the service interface .
@@ -51,7 +51,6 @@
*/
public class ServiceProxy implements InvocationHandler, Serializable, Externalizable
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(ServiceProxy.class);
// provide logging
private static final Logger log = Logger.getLogger(ServiceProxy.class);
@@ -152,7 +151,7 @@
return retObj;
}
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "NOT_KNOW_HOW_TO_INVOKE", method));
+ throw NativeMessages.MESSAGES.dontKnowHowToInvoke(method);
}
catch (Exception e)
{
@@ -170,7 +169,7 @@
if (ex instanceof InvocationTargetException)
th = ((InvocationTargetException)ex).getTargetException();
- log.error(BundleUtils.getMessage(bundle, "SERVICE_ERROR"), th);
+ NativeLoggers.JAXRPC_LOGGER.jaxRpcServiceError(th);
throw th;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -30,7 +30,6 @@
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import java.util.ResourceBundle;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -43,7 +42,8 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.NativeLoggers;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.MessageTrace;
import org.jboss.ws.core.soap.SOAPEnvelopeImpl;
@@ -63,7 +63,6 @@
*/
public abstract class HandlerChainBaseImpl implements HandlerChain
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(HandlerChainBaseImpl.class);
private static Logger log = Logger.getLogger(HandlerChainBaseImpl.class);
public static final int STATE_DOES_NOT_EXIST = 0;
@@ -146,7 +145,7 @@
}
catch (Exception ex)
{
- throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_INITIALIZE_HANDLER_CHAIN"), ex);
+ throw new JAXRPCException(ex);
}
// set state to created
@@ -305,7 +304,7 @@
}
catch (RuntimeException e)
{
- log.error(BundleUtils.getMessage(bundle, "RUNTIMEEXCEPTION_IN_REQUEST_HANDLER"), e);
+ NativeLoggers.JAXRPC_LOGGER.runtimeExceptionInRequestHandler(e);
doNext = false;
throw e;
}
@@ -382,7 +381,7 @@
}
catch (RuntimeException rte)
{
- log.error(BundleUtils.getMessage(bundle, "RUNTIMEEXCEPTION_IN_RESPONSE_HANDLER"), rte);
+ NativeLoggers.JAXRPC_LOGGER.runtimeExceptionInResponseHandler(rte);
doNext = false;
throw rte;
}
@@ -472,7 +471,7 @@
}
catch (Exception ex)
{
- log.error(BundleUtils.getMessage(bundle, "CANNOT_TRACE_SOAP_MESSAGE"), ex);
+ NativeLoggers.JAXRPC_LOGGER.cannotTraceJAXRPCSoapMessage(ex);
return null;
}
}
@@ -500,7 +499,7 @@
}
catch (Exception ex)
{
- log.error(BundleUtils.getMessage(bundle, "CANNOT_CREATE_HANDLER_INSTANCE", entry.info), ex);
+ NativeLoggers.JAXRPC_LOGGER.cannotCreateHandlerInstance(entry.info, ex);
}
}
}
@@ -512,7 +511,7 @@
protected Handler getHandlerAt(int pos)
{
if (pos < 0 || handlers.size() <= pos)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NO_HANDLER_AT_POSITION", pos));
+ throw NativeMessages.MESSAGES.noHandlerAtPosition(pos);
HandlerEntry entry = (HandlerEntry)handlers.get(pos);
return entry.handler;
@@ -530,7 +529,7 @@
public HandlerEntry(HandlerWrapper handler, HandlerInfo info, HandlerType type)
{
if (handler == null || info == null)
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "INVALID_HANDLER_ENTRY"));
+ throw NativeMessages.MESSAGES.invalidHandlerEntry();
if (type == null)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.core.jaxrpc.handler;
-import java.util.ResourceBundle;
+import static org.jboss.ws.NativeLoggers.JAXRPC_LOGGER;
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
@@ -31,7 +31,6 @@
import javax.xml.rpc.soap.SOAPFaultException;
import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
/**
* A wrapper arround a {@link javax.xml.rpc.handler.Handler} that takes care of its lifecycle.
@@ -40,7 +39,6 @@
*/
public class HandlerWrapper implements Handler
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(HandlerWrapper.class);
private static Logger log = Logger.getLogger(HandlerWrapper.class);
public final static int DOES_NOT_EXIST = 0;
@@ -114,7 +112,7 @@
{
if (state == DOES_NOT_EXIST)
{
- log.warn(BundleUtils.getMessage(bundle, "HANDLER_DOES_NOT_EXIST_SKIPHANDLEREQUEST", delegate));
+ JAXRPC_LOGGER.handlerDoesNotExistSkippingHandleRequest(delegate);
return true;
}
@@ -135,7 +133,7 @@
{
if (state == DOES_NOT_EXIST)
{
- log.warn(BundleUtils.getMessage(bundle, "HANDLER_DOES_NOT_EXIST_SKIPHANDLERESPONSE", delegate));
+ JAXRPC_LOGGER.handlerDoesNotExistSkippingHandleResponse(delegate);
return true;
}
@@ -156,7 +154,7 @@
{
if (state == DOES_NOT_EXIST)
{
- log.warn(BundleUtils.getMessage(bundle, "HANDLER_DOES_NOT_EXIST_SKIPHANDLEFAULT", delegate));
+ JAXRPC_LOGGER.handlerDoesNotExistSkippingHandleFault(delegate);
return true;
}
@@ -178,7 +176,7 @@
{
if ((e instanceof SOAPFaultException) == false)
{
- log.warn(BundleUtils.getMessage(bundle, "TRANSITION_TO_DOES_NOT_EXIST"));
+ JAXRPC_LOGGER.handlerTransitionToDoesNotExist();
destroy();
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/Message.properties 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/Message.properties 2012-10-12 08:30:12 UTC (rev 16863)
@@ -1,11 +0,0 @@
-CANNOT_INITIALIZE_HANDLER_CHAIN=Cannot initialize handler chain
-RUNTIMEEXCEPTION_IN_REQUEST_HANDLER=RuntimeException in request handler
-RUNTIMEEXCEPTION_IN_RESPONSE_HANDLER=RuntimeException in response handler
-CANNOT_TRACE_SOAP_MESSAGE=Cannot trace SOAP message
-CANNOT_CREATE_HANDLER_INSTANCE=Cannot create handler instance for: {0}
-NO_HANDLER_AT_POSITION=No handler at position: {0}
-INVALID_HANDLER_ENTRY=Invalid handler entry
-HANDLER_DOES_NOT_EXIST_SKIPHANDLEREQUEST=Handler is in state DOES_NOT_EXIST, skipping Handler.handleRequest for: {0}
-HANDLER_DOES_NOT_EXIST_SKIPHANDLERESPONSE=Handler is in state DOES_NOT_EXIST, skipping Handler.handleResponse for: {0}
-HANDLER_DOES_NOT_EXIST_SKIPHANDLEFAULT=Handler is in state DOES_NOT_EXIST, skipping Handler.handleFault for: {0}
-TRANSITION_TO_DOES_NOT_EXIST=RuntimeException in handler method, transition to does not exist
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2012-10-12 07:07:00 UTC (rev 16862)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2012-10-12 08:30:12 UTC (rev 16863)
@@ -27,7 +27,6 @@
import javax.xml.rpc.handler.MessageContext;
-import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
@@ -48,8 +47,6 @@
*/
public abstract class MessageContextJAXRPC extends CommonMessageContext implements MessageContext
{
- private static Logger log = Logger.getLogger(MessageContextJAXRPC.class);
-
public static final String SERVLET_CONTEXT = "javax.xml.ws.servlet.context";
public static final String SERVLET_REQUEST = "javax.xml.ws.servlet.request";
public static final String SERVLET_RESPONSE = "javax.xml.ws.servlet.response";
@@ -84,7 +81,6 @@
public static CommonMessageContext processPivot(CommonMessageContext requestContext)
{
- log.debug("Begin response processing");
return requestContext;
}
More information about the jbossws-commits
mailing list