You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/17 09:53:05 UTC
svn commit: r1611274 [9/15] - in /tomee/tomee/branches/tomee-1.7.x/server:
./ openejb-activemq/
openejb-activemq/src/main/java/org/apache/openejb/server/activemq/
openejb-axis/ openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/src...
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfServiceConfiguration.java Thu Jul 17 07:52:58 2014
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
public class CxfServiceConfiguration extends AbstractServiceConfiguration {
private PortData port;
- public CxfServiceConfiguration(PortData portData) {
+ public CxfServiceConfiguration(final PortData portData) {
this.port = portData;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java Thu Jul 17 07:52:58 2014
@@ -60,6 +60,7 @@ public abstract class CxfWsContainer imp
}
protected abstract CxfEndpoint createEndpoint();
+
protected abstract ObjectName registerMBean();
protected abstract void setWsldUrl(String wsdl);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/JaxWsImplementorInfoImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/JaxWsImplementorInfoImpl.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/JaxWsImplementorInfoImpl.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/JaxWsImplementorInfoImpl.java Thu Jul 17 07:52:58 2014
@@ -28,7 +28,7 @@ import javax.xml.ws.soap.SOAPBinding;
public class JaxWsImplementorInfoImpl extends JaxWsImplementorInfo {
private final String bindingURI;
- public JaxWsImplementorInfoImpl(Class clazz, String bindingURI) {
+ public JaxWsImplementorInfoImpl(final Class clazz, final String bindingURI) {
super(clazz);
this.bindingURI = bindingURI;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java Thu Jul 17 07:52:58 2014
@@ -38,10 +38,10 @@ public class OpenEJBLoginValidator exten
// get the plain text password
final WSPasswordCallback pwCb = new WSPasswordCallback(usernameToken.getName(),
- null, usernameToken.getPasswordType(), WSPasswordCallback.USERNAME_TOKEN, data);
+ null, usernameToken.getPasswordType(), WSPasswordCallback.USERNAME_TOKEN, data);
try {
data.getCallbackHandler().handle(new Callback[]{pwCb});
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op: the login will fail
}
@@ -56,7 +56,7 @@ public class OpenEJBLoginValidator exten
token = securityService.login(user, password);
securityService.associate(token);
- } catch (LoginException e) {
+ } catch (final LoginException e) {
throw new SecurityException("cannot log user " + user, e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSSPassThroughInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSSPassThroughInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSSPassThroughInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSSPassThroughInterceptor.java Thu Jul 17 07:52:58 2014
@@ -46,7 +46,7 @@ public class WSSPassThroughInterceptor e
super(Phase.PRE_PROTOCOL);
}
- public WSSPassThroughInterceptor(String phase) {
+ public WSSPassThroughInterceptor(final String phase) {
super(phase);
}
@@ -55,7 +55,7 @@ public class WSSPassThroughInterceptor e
return HEADERS;
}
- public void handleMessage(SoapMessage soapMessage) {
+ public void handleMessage(final SoapMessage soapMessage) {
// do nothing
// this interceptor simply returns all WS-Security headers in its getUnderstoodHeaders()
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInFaultInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInFaultInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInFaultInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInFaultInterceptor.java Thu Jul 17 07:52:58 2014
@@ -23,14 +23,14 @@ import org.apache.cxf.phase.Phase;
import org.apache.openejb.server.webservices.saaj.SaajUniverse;
public class SaajInFaultInterceptor extends SaajInterceptor {
- public SaajInFaultInterceptor(SaajUniverse universe) {
+ public SaajInFaultInterceptor(final SaajUniverse universe) {
super(Phase.RECEIVE, universe);
}
- public void handleMessage(Message arg0) throws Fault {
+ public void handleMessage(final Message arg0) throws Fault {
}
- public void handleFault(Message msg) {
+ public void handleFault(final Message msg) {
this.universe.unset();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java Thu Jul 17 07:52:58 2014
@@ -23,11 +23,11 @@ import org.apache.cxf.phase.Phase;
import org.apache.openejb.server.webservices.saaj.SaajUniverse;
public class SaajInInterceptor extends SaajInterceptor {
- public SaajInInterceptor(SaajUniverse universe) {
+ public SaajInInterceptor(final SaajUniverse universe) {
super(Phase.POST_INVOKE, universe);
}
-
- public void handleMessage(Message msg) throws Fault {
+
+ public void handleMessage(final Message msg) throws Fault {
this.universe.unset();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java Thu Jul 17 07:52:58 2014
@@ -28,18 +28,18 @@ public abstract class SaajInterceptor ex
private static boolean interceptorsRegistered = false;
protected SaajUniverse universe;
- public SaajInterceptor(String phase, SaajUniverse universe) {
+ public SaajInterceptor(final String phase, final SaajUniverse universe) {
super(phase);
this.universe = universe;
}
-
+
public static synchronized void registerInterceptors() {
if (!interceptorsRegistered) {
final Bus bus = CxfUtil.getBus();
final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(CxfUtil.initBusLoader());
try {
- SaajUniverse universe = new SaajUniverse();
+ final SaajUniverse universe = new SaajUniverse();
bus.getOutInterceptors().add(new SaajOutInterceptor(universe));
bus.getInInterceptors().add(new SaajInInterceptor(universe));
bus.getInInterceptors().add(new SaajInFaultInterceptor(universe));
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java Thu Jul 17 07:52:58 2014
@@ -23,15 +23,15 @@ import org.apache.cxf.phase.Phase;
import org.apache.openejb.server.webservices.saaj.SaajUniverse;
public class SaajOutInterceptor extends SaajInterceptor {
- public SaajOutInterceptor(SaajUniverse universe) {
+ public SaajOutInterceptor(final SaajUniverse universe) {
super(Phase.SETUP, universe);
}
-
- public void handleMessage(Message msg) throws Fault {
+
+ public void handleMessage(final Message msg) throws Fault {
this.universe.set(SaajUniverse.DEFAULT);
}
-
- public void handleFault(Message msg) {
+
+ public void handleFault(final Message msg) {
this.universe.unset();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java Thu Jul 17 07:52:58 2014
@@ -33,13 +33,13 @@ public class WSS4JInInterceptorFactory {
return properties;
}
- public void setProperties(Properties properties) {
+ public void setProperties(final Properties properties) {
this.properties = properties;
}
public WSS4JInInterceptor create() {
final Map<String, Object> map = new HashMap<String, Object>();
- for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+ for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
map.put(entry.getKey().toString(), entry.getValue());
}
properties.clear();
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbEndpoint.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbEndpoint.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbEndpoint.java Thu Jul 17 07:52:58 2014
@@ -46,11 +46,11 @@ import java.util.logging.Level;
public class EjbEndpoint extends CxfEndpoint {
private final BeanContext beanContext;
- public EjbEndpoint(Bus bus, PortData portData, BeanContext beanContext, HTTPTransportFactory httpTransportFactory, ServiceConfiguration config) {
+ public EjbEndpoint(final Bus bus, final PortData portData, final BeanContext beanContext, final HTTPTransportFactory httpTransportFactory, final ServiceConfiguration config) {
super(bus, portData, beanContext.getJndiEnc(), beanContext.getBeanClass(), httpTransportFactory, config);
this.beanContext = beanContext;
- String bindingURI = JaxWsUtils.getBindingURI(portData.getBindingID());
+ final String bindingURI = JaxWsUtils.getBindingURI(portData.getBindingID());
implInfo = new JaxWsImplementorInfoImpl((Class) implementor, bindingURI);
serviceFactory = configureService(new JaxWsServiceFactoryBean(implInfo), config, CXF_JAXWS_PREFIX);
@@ -58,7 +58,7 @@ public class EjbEndpoint extends CxfEndp
serviceFactory.setServiceClass(beanContext.getBeanClass());
// install as first to overwrite annotations (wsdl-file, wsdl-port, wsdl-service)
- CxfServiceConfiguration configuration = new CxfServiceConfiguration(portData);
+ final CxfServiceConfiguration configuration = new CxfServiceConfiguration(portData);
serviceFactory.getConfigurations().add(0, configuration);
service = doServiceCreate();
@@ -72,7 +72,7 @@ public class EjbEndpoint extends CxfEndp
// configure handlers
try {
initHandlers();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new WebServiceException("Error configuring handlers", e);
}
@@ -81,7 +81,7 @@ public class EjbEndpoint extends CxfEndp
// Remove interceptors that perform handler processing since
// handler processing must happen within the EJB container.
- Endpoint endpoint = getEndpoint();
+ final Endpoint endpoint = getEndpoint();
removeHandlerInterceptors(bus.getInInterceptors());
removeHandlerInterceptors(endpoint.getInInterceptors());
removeHandlerInterceptors(endpoint.getBinding().getInInterceptors());
@@ -96,8 +96,8 @@ public class EjbEndpoint extends CxfEndp
ConfigureCxfSecurity.configure(endpoint, port);
}
- private static void removeHandlerInterceptors(List<? extends Interceptor> interceptors) {
- for (Interceptor interceptor : interceptors) {
+ private static void removeHandlerInterceptors(final List<? extends Interceptor> interceptors) {
+ for (final Interceptor interceptor : interceptors) {
if (interceptor instanceof MustUnderstandInterceptor || interceptor instanceof LogicalHandlerInInterceptor || interceptor instanceof SOAPHandlerInterceptor) {
interceptors.remove(interceptor);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbInterceptor.java Thu Jul 17 07:52:58 2014
@@ -58,15 +58,15 @@ public class EjbInterceptor {
private List<Object> params;
private Method method;
- public EjbInterceptor(List<Object> params, Method method, Bus bus, Exchange exchange) {
+ public EjbInterceptor(final List<Object> params, final Method method, final Bus bus, final Exchange exchange) {
this.params = params;
this.method = method;
this.bus = bus;
this.exchange = exchange;
}
- private static void copyDataBindingInterceptors(PhaseInterceptorChain newChain, InterceptorChain oldChain) {
- for (Interceptor interceptor : oldChain) {
+ private static void copyDataBindingInterceptors(final PhaseInterceptorChain newChain, final InterceptorChain oldChain) {
+ for (final Interceptor interceptor : oldChain) {
if (interceptor instanceof AbstractInDatabindingInterceptor) {
log.debug("Added data binding interceptor: " + interceptor);
newChain.add(interceptor);
@@ -75,10 +75,10 @@ public class EjbInterceptor {
}
@AroundInvoke
- public Object intercept(InvocationContext context) throws Exception {
- Endpoint endpoint = this.exchange.get(Endpoint.class);
- Service service = endpoint.getService();
- Binding binding = ((JaxWsEndpointImpl) endpoint).getJaxwsBinding();
+ public Object intercept(final InvocationContext context) throws Exception {
+ final Endpoint endpoint = this.exchange.get(Endpoint.class);
+ final Service service = endpoint.getService();
+ final Binding binding = ((JaxWsEndpointImpl) endpoint).getJaxwsBinding();
this.exchange.put(InvocationContext.class, context);
@@ -86,7 +86,7 @@ public class EjbInterceptor {
// no handlers so let's just directly invoke the bean
log.debug("No handlers found.");
- EjbMethodInvoker invoker = (EjbMethodInvoker) service.getInvoker();
+ final EjbMethodInvoker invoker = (EjbMethodInvoker) service.getInvoker();
return invoker.directEjbInvoke(this.exchange, this.method, this.params);
} else {
@@ -94,8 +94,8 @@ public class EjbInterceptor {
// as handlers can change the soap message
log.debug("Handlers found.");
- Message inMessage = exchange.getInMessage();
- PhaseInterceptorChain chain = new PhaseInterceptorChain(bus.getExtension(PhaseManager.class).getInPhases());
+ final Message inMessage = exchange.getInMessage();
+ final PhaseInterceptorChain chain = new PhaseInterceptorChain(bus.getExtension(PhaseManager.class).getInPhases());
chain.setFaultObserver(endpoint.getOutFaultObserver());
@@ -108,7 +108,7 @@ public class EjbInterceptor {
if (inMessage instanceof SoapMessage) {
try {
reserialize((SoapMessage) inMessage);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServerRuntimeException("Failed to reserialize soap message", e);
}
} else {
@@ -134,7 +134,7 @@ public class EjbInterceptor {
// install data binding interceptors
copyDataBindingInterceptors(chain, inMessage.getInterceptorChain());
- InterceptorChain oldChain = inMessage.getInterceptorChain();
+ final InterceptorChain oldChain = inMessage.getInterceptorChain();
inMessage.setInterceptorChain(chain);
try {
chain.doIntercept(inMessage);
@@ -143,18 +143,18 @@ public class EjbInterceptor {
}
// TODO: the result should be deserialized from SOAPMessage
- Object result = getResult();
+ final Object result = getResult();
return result;
}
}
private Object getResult() {
- Message outMessage = this.exchange.getOutMessage();
+ final Message outMessage = this.exchange.getOutMessage();
if (outMessage == null) {
return null;
} else {
- List<?> result = outMessage.getContent(List.class);
+ final List<?> result = outMessage.getContent(List.class);
if (result == null) {
return outMessage.get(Object.class);
} else if (result.isEmpty()) {
@@ -165,14 +165,14 @@ public class EjbInterceptor {
}
}
- private void reserialize(SoapMessage message) throws Exception {
- SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
+ private void reserialize(final SoapMessage message) throws Exception {
+ final SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
if (soapMessage == null) {
return;
}
- DOMSource bodySource = new DOMSource(soapMessage.getSOAPPart());
- XMLStreamReader xmlReader = StaxUtils.createXMLStreamReader(bodySource);
+ final DOMSource bodySource = new DOMSource(soapMessage.getSOAPPart());
+ final XMLStreamReader xmlReader = StaxUtils.createXMLStreamReader(bodySource);
message.setContent(XMLStreamReader.class, xmlReader);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMessageContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMessageContext.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMessageContext.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMessageContext.java Thu Jul 17 07:52:58 2014
@@ -29,21 +29,21 @@ import org.w3c.dom.Element;
public class EjbMessageContext extends WrappedMessageContext implements AddressingSupport {
- public EjbMessageContext(Message m, Scope defScope) {
+ public EjbMessageContext(final Message m, final Scope defScope) {
super(m, defScope);
}
- public EndpointReference getEndpointReference(Element... referenceParameters) {
- org.apache.cxf.message.Message msg = getWrappedMessage();
- Endpoint ep = msg.getExchange().get(Endpoint.class);
+ public EndpointReference getEndpointReference(final Element... referenceParameters) {
+ final org.apache.cxf.message.Message msg = getWrappedMessage();
+ final Endpoint ep = msg.getExchange().get(Endpoint.class);
- W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+ final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
builder.address(ep.getEndpointInfo().getAddress());
builder.serviceName(ep.getService().getName());
builder.endpointName(ep.getEndpointInfo().getName());
if (referenceParameters != null) {
- for (Element referenceParameter : referenceParameters) {
+ for (final Element referenceParameter : referenceParameters) {
builder.referenceParameter(referenceParameter);
}
}
@@ -51,7 +51,7 @@ public class EjbMessageContext extends W
return builder.build();
}
- public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters) {
+ public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) {
if (W3CEndpointReference.class.isAssignableFrom(clazz)) {
return clazz.cast(getEndpointReference(referenceParameters));
} else {
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java Thu Jul 17 07:52:58 2014
@@ -49,25 +49,25 @@ public class EjbMethodInvoker extends Ab
private BeanContext beanContext;
private Bus bus;
- public EjbMethodInvoker(Bus bus, BeanContext beanContext) {
+ public EjbMethodInvoker(final Bus bus, final BeanContext beanContext) {
super((Factory) null);
this.bus = bus;
this.beanContext = beanContext;
}
- public Object getServiceObject(Exchange context) {
+ public Object getServiceObject(final Exchange context) {
return null;
}
- public void releaseServiceObject(Exchange ex, Object obj) {
+ public void releaseServiceObject(final Exchange ex, final Object obj) {
// do nothing
}
- protected Object invoke(Exchange exchange, Object serviceObject, Method m,
- List<Object> params) {
+ protected Object invoke(final Exchange exchange, final Object serviceObject, final Method m,
+ final List<Object> params) {
Object result = null;
- InvocationContext invContext = exchange.get(InvocationContext.class);
+ final InvocationContext invContext = exchange.get(InvocationContext.class);
if (invContext == null) {
log.debug("PreEJBInvoke");
result = preEjbInvoke(exchange, serviceObject, m, params);
@@ -79,16 +79,16 @@ public class EjbMethodInvoker extends Ab
return result;
}
- protected Object performInvocation(Exchange exchange, Object serviceObject,
- Method m, Object[] paramArray) throws Exception {
- InvocationContext invContext = exchange.get(InvocationContext.class);
+ protected Object performInvocation(final Exchange exchange, final Object serviceObject,
+ final Method m, final Object[] paramArray) throws Exception {
+ final InvocationContext invContext = exchange.get(InvocationContext.class);
invContext.setParameters(paramArray);
- Object res = invContext.proceed();
+ final Object res = invContext.proceed();
- EjbMessageContext ctx = (EjbMessageContext) invContext.getContextData();
+ final EjbMessageContext ctx = (EjbMessageContext) invContext.getContextData();
- Map<String, Object> handlerProperties = (Map<String, Object>) exchange
- .get(HANDLER_PROPERTIES);
+ final Map<String, Object> handlerProperties = (Map<String, Object>) exchange
+ .get(HANDLER_PROPERTIES);
addHandlerProperties(ctx, handlerProperties);
updateWebServiceContext(exchange, ctx);
@@ -96,38 +96,38 @@ public class EjbMethodInvoker extends Ab
return res;
}
- private Object preEjbInvoke(Exchange exchange, Object serviceObject,
- Method method, List<Object> params) {
+ private Object preEjbInvoke(final Exchange exchange, final Object serviceObject,
+ Method method, final List<Object> params) {
- EjbMessageContext ctx = new EjbMessageContext(exchange.getInMessage(),
- Scope.APPLICATION);
+ final EjbMessageContext ctx = new EjbMessageContext(exchange.getInMessage(),
+ Scope.APPLICATION);
WebServiceContextImpl.setMessageContext(ctx);
- Map<String, Object> handlerProperties = removeHandlerProperties(ctx);
+ final Map<String, Object> handlerProperties = removeHandlerProperties(ctx);
exchange.put(HANDLER_PROPERTIES, handlerProperties);
try {
- EjbInterceptor interceptor = new EjbInterceptor(params, method,
- this.bus, exchange);
- Object[] arguments = { ctx, interceptor };
+ final EjbInterceptor interceptor = new EjbInterceptor(params, method,
+ this.bus, exchange);
+ final Object[] arguments = {ctx, interceptor};
- RpcContainer container = (RpcContainer) this.beanContext
- .getContainer();
+ final RpcContainer container = (RpcContainer) this.beanContext
+ .getContainer();
- Class callInterface = this.beanContext
- .getServiceEndpointInterface();
+ final Class callInterface = this.beanContext
+ .getServiceEndpointInterface();
method = getMostSpecificMethod(beanContext, method, callInterface);
- Object res = container.invoke(
- this.beanContext.getDeploymentID(),
- InterfaceType.SERVICE_ENDPOINT, callInterface, method,
- arguments, null);
+ final Object res = container.invoke(
+ this.beanContext.getDeploymentID(),
+ InterfaceType.SERVICE_ENDPOINT, callInterface, method,
+ arguments, null);
if (exchange.isOneWay()) {
return null;
}
return new MessageContentsList(res);
- } catch (ApplicationException e) {
+ } catch (final ApplicationException e) {
// when no handler is defined, EjbInterceptor will directly delegate
// to #directEjbInvoke. So if an application exception is thrown by
// the end user, when must consider the ApplicationException as a
@@ -135,15 +135,15 @@ public class EjbMethodInvoker extends Ab
Throwable t = e.getCause();
if (t != null) {
if (RuntimeException.class.isAssignableFrom(t.getClass())
- && t.getClass().isAnnotationPresent(
- javax.ejb.ApplicationException.class)) {
+ && t.getClass().isAnnotationPresent(
+ javax.ejb.ApplicationException.class)) {
// it's not a checked exception so it can not be a WebFault
throw (RuntimeException) t;
} else if (!t.getClass().isAnnotationPresent(WebFault.class)) {
// not a web fault even if it's an EJB ApplicationException
exchange.getInMessage().put(FaultMode.class,
- FaultMode.UNCHECKED_APPLICATION_FAULT);
+ FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(t, method, params, false);
}
@@ -152,11 +152,11 @@ public class EjbMethodInvoker extends Ab
}
// TODO may be we can change to FaultMode.CHECKED_APPLICATION_FAULT
exchange.getInMessage().put(FaultMode.class,
- FaultMode.UNCHECKED_APPLICATION_FAULT);
+ FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(t, method, params, false);
- } catch (Exception e) {
+ } catch (final Exception e) {
exchange.getInMessage().put(FaultMode.class,
- FaultMode.UNCHECKED_APPLICATION_FAULT);
+ FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(e, method, params, false);
} finally {
WebServiceContextImpl.clear();
@@ -188,13 +188,13 @@ public class EjbMethodInvoker extends Ab
return m;
}
- public Object directEjbInvoke(Exchange exchange, Method m,
- List<Object> params) throws Exception {
- Object[] paramArray;
+ public Object directEjbInvoke(final Exchange exchange, final Method m,
+ final List<Object> params) throws Exception {
+ final Object[] paramArray;
if (params != null) {
paramArray = params.toArray();
} else {
- paramArray = new Object[] {};
+ paramArray = new Object[]{};
}
return performInvocation(exchange, null, m, paramArray);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java Thu Jul 17 07:52:58 2014
@@ -62,12 +62,12 @@ public class EjbWsContainer extends CxfW
protected ObjectName registerMBean() {
final ObjectName name = new ObjectNameBuilder("openejb.management")
- .set("j2eeType", "JAX-WS")
- .set("J2EEServer", "openejb")
- .set("J2EEApplication", null)
- .set("EndpointType", "EJB")
- .set("name", beanContext.getEjbName())
- .build();
+ .set("j2eeType", "JAX-WS")
+ .set("J2EEServer", "openejb")
+ .set("J2EEApplication", null)
+ .set("EndpointType", "EJB")
+ .set("name", beanContext.getEjbName())
+ .build();
mbean = new WsServiceMBean(beanContext, port);
LocalMBeanServer.registerDynamicWrapperSilently(mbean, name);
@@ -75,7 +75,7 @@ public class EjbWsContainer extends CxfW
}
@Override
- protected void setWsldUrl(String wsdl) {
+ protected void setWsldUrl(final String wsdl) {
mbean.wsdl(wsdl);
}
@@ -147,8 +147,8 @@ public class EjbWsContainer extends CxfW
}
return LocalMBeanServer.tabularData(
- "handlers", "The list of handlers",
- names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
+ "handlers", "The list of handlers",
+ names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
}
@ManagedAttribute
@@ -167,10 +167,10 @@ public class EjbWsContainer extends CxfW
@Description("Service configuration properties")
public TabularData getProperties() {
return LocalMBeanServer.tabularData(
- "properties",
- "Service configuration properties",
- "Service configuration properties",
- port.getProperties()
+ "properties",
+ "Service configuration properties",
+ "Service configuration properties",
+ port.getProperties()
);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java Thu Jul 17 07:52:58 2014
@@ -67,9 +67,9 @@ public class PojoEndpoint extends CxfEnd
private final ResourceInjector injector;
private CreationalContextImpl toClean = null;
- public PojoEndpoint(ClassLoader loader, Bus bus, PortData port, Context context, Class<?> instance,
- HTTPTransportFactory httpTransportFactory,
- Map<String, Object> bindings, ServiceConfiguration config) {
+ public PojoEndpoint(final ClassLoader loader, final Bus bus, final PortData port, final Context context, final Class<?> instance,
+ final HTTPTransportFactory httpTransportFactory,
+ final Map<String, Object> bindings, final ServiceConfiguration config) {
super(bus, port, context, instance, httpTransportFactory, config);
String bindingURI = null;
@@ -83,7 +83,7 @@ public class PojoEndpoint extends CxfEnd
serviceFactory.setServiceClass(instance);
// install as first to overwrite annotations (wsdl-file, wsdl-port, wsdl-service)
- CxfServiceConfiguration configuration = new CxfServiceConfiguration(port);
+ final CxfServiceConfiguration configuration = new CxfServiceConfiguration(port);
serviceFactory.getConfigurations().add(0, configuration);
service = doServiceCreate();
@@ -113,9 +113,9 @@ public class PojoEndpoint extends CxfEnd
try {
final Set<Bean<?>> beans = bm.getBeans(instance);
final Bean<?> bean = bm.resolve(beans);
- CreationalContextImpl creationalContext = bm.createCreationalContext(bean);
+ final CreationalContextImpl creationalContext = bm.createCreationalContext(bean);
if (bean != null) {
- Bean<?> oldBean = creationalContext.putBean(bean);
+ final Bean<?> oldBean = creationalContext.putBean(bean);
try {
if (AbstractOwbBean.class.isInstance(bean)) {
final AbstractOwbBean<?> aob = AbstractOwbBean.class.cast(bean);
@@ -195,7 +195,7 @@ public class PojoEndpoint extends CxfEnd
// configure and inject handlers
try {
initHandlers();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new WebServiceException("Error configuring handlers", e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java Thu Jul 17 07:52:58 2014
@@ -73,12 +73,12 @@ public class PojoWsContainer extends Cxf
@Override
protected ObjectName registerMBean() {
final ObjectName name = new ObjectNameBuilder("openejb.management")
- .set("j2eeType", "JAX-WS")
- .set("J2EEServer", "openejb")
- .set("J2EEApplication", null)
- .set("EndpointType", "POJO")
- .set("name", target.getSimpleName())
- .build();
+ .set("j2eeType", "JAX-WS")
+ .set("J2EEServer", "openejb")
+ .set("J2EEApplication", null)
+ .set("EndpointType", "POJO")
+ .set("name", target.getSimpleName())
+ .build();
mbean = new WsServiceMBean(context, target, port);
LocalMBeanServer.registerDynamicWrapperSilently(mbean, name);
@@ -148,8 +148,8 @@ public class PojoWsContainer extends Cxf
}
return LocalMBeanServer.tabularData(
- "handlers", "The list of handlers",
- names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
+ "handlers", "The list of handlers",
+ names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
}
@ManagedAttribute
@@ -168,10 +168,10 @@ public class PojoWsContainer extends Cxf
@Description("Service configuration properties")
public TabularData getProperties() {
return LocalMBeanServer.tabularData(
- "properties",
- "Service configuration properties",
- "Service configuration properties",
- port.getProperties()
+ "properties",
+ "Service configuration properties",
+ "Service configuration properties",
+ port.getProperties()
);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java Thu Jul 17 07:52:58 2014
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
@RunWith(ApplicationComposer.class)
public class CdiHandlersTest {
@Module
- @Classes(value = { MyHandledWebservice.class, ACdiSimpleTaste.class, SimpleHandler.class }, cdi = true)
+ @Classes(value = {MyHandledWebservice.class, ACdiSimpleTaste.class, SimpleHandler.class}, cdi = true)
public WebApp module() {
return new WebApp().contextRoot("/test").addServlet("ws", MyHandledWebservice.class.getName(), "/ws");
}
@@ -48,14 +48,14 @@ public class CdiHandlersTest {
public void checkHandlersAreCDIBeans() throws MalformedURLException {
SimpleHandler.reset();
Service.create(new URL("http://localhost:4204/test/ws?wsdl"),
- new QName("http://cxf.server.openejb.apache.org/", "MyHandledWebserviceService"))
- .getPort(MyHandledWsApi.class).test();
+ new QName("http://cxf.server.openejb.apache.org/", "MyHandledWebserviceService"))
+ .getPort(MyHandledWsApi.class).test();
assertTrue(SimpleHandler.close);
assertTrue(SimpleHandler.handled);
assertTrue(SimpleHandler.pre);
assertTrue(SimpleHandler.post);
}
-
+
public static class ACdiSimpleTaste {
public String ok() {
return "ok";
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java Thu Jul 17 07:52:58 2014
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTru
@RunWith(ApplicationComposer.class)
public class CdiPojoTest {
@Module
- @Classes(value = { MyWebservice.class, ACdiTaste.class }, cdi = true)
+ @Classes(value = {MyWebservice.class, ACdiTaste.class}, cdi = true)
public WebApp module() {
return new WebApp().contextRoot("/test").addServlet("ws", MyWebservice.class.getName(), "/ws");
}
@@ -50,8 +50,8 @@ public class CdiPojoTest {
@Test
public void checkInjection() throws MalformedURLException {
final MyWsApi api = Service.create(new URL("http://localhost:4204/test/ws?wsdl"),
- new QName("http://cxf.server.openejb.apache.org/", "MyWebserviceService"))
- .getPort(MyWsApi.class);
+ new QName("http://cxf.server.openejb.apache.org/", "MyWebserviceService"))
+ .getPort(MyWsApi.class);
assertEquals("ok", api.test());
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java Thu Jul 17 07:52:58 2014
@@ -38,18 +38,18 @@ public class CxfJaxWsProviderTest extend
//START SNIPPET: setup
private InitialContext initialContext;
-
- //Random port to avoid test conflicts
+
+ //Random port to avoid test conflicts
private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
protected void setUp() throws Exception {
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf.*");
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
-
- //Just for this test we change the default port from 4204 to avoid conflicts
- properties.setProperty("httpejbd.port", "" + port);
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
initialContext = new InitialContext(properties);
}
@@ -57,13 +57,13 @@ public class CxfJaxWsProviderTest extend
public void test00_runCheckedException() {
try {
- AuthenticatorService withHandler = Service.create(
+ final AuthenticatorService withHandler = Service.create(
new URL("http://localhost:" + port + "/openejb-cxf/AuthenticatorServiceBean?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanService"))
.getPort(AuthenticatorService.class);
assertNotNull(withHandler);
- AuthenticatorService noHandler = Service.create(
+ final AuthenticatorService noHandler = Service.create(
new URL("http://localhost:" + port + "/openejb-cxf/AuthenticatorServiceBeanNoHandler?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanNoHandlerService"))
.getPort(AuthenticatorService.class);
@@ -71,23 +71,23 @@ public class CxfJaxWsProviderTest extend
try {
withHandler.authenticate("John", "Doe");
- } catch (WrongPasswordException e) {
+ } catch (final WrongPasswordException e) {
System.out.println("My lovely checked exception...");
- } catch (Throwable e) {
+ } catch (final Throwable e) {
e.printStackTrace();
fail("A throwable instead of a checked exception...");
}
try {
noHandler.authenticate("John", "Doe");
- } catch (WrongPasswordException e) {
+ } catch (final WrongPasswordException e) {
System.out.println("My lovely checked exception...");
- } catch (Throwable e) {
+ } catch (final Throwable e) {
e.printStackTrace();
fail("A throwable instead of a checked exception...");
}
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
e.printStackTrace();
fail("?!? invalid URL ???");
}
@@ -96,13 +96,13 @@ public class CxfJaxWsProviderTest extend
public void test01_runRuntimeException() {
try {
- AuthenticatorService withHandler = Service.create(
+ final AuthenticatorService withHandler = Service.create(
new URL("http://localhost:" + port + "/openejb-cxf/AuthenticatorServiceBean?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanService"))
.getPort(AuthenticatorService.class);
assertNotNull(withHandler);
- AuthenticatorService noHandler = Service.create(
+ final AuthenticatorService noHandler = Service.create(
new URL("http://localhost:" + port + "/openejb-cxf/AuthenticatorServiceBeanNoHandler?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanNoHandlerService"))
.getPort(AuthenticatorService.class);
@@ -110,24 +110,24 @@ public class CxfJaxWsProviderTest extend
try {
withHandler.authenticateRuntime("John", "Doe");
- } catch (WrongPasswordRuntimeException e) {
+ } catch (final WrongPasswordRuntimeException e) {
e.printStackTrace();
fail("My checked exception instead of a throwableS...");
- } catch (Throwable e) {
+ } catch (final Throwable e) {
System.out.println("A throwable exception...");
}
try {
noHandler.authenticateRuntime("John", "Doe");
- } catch (WrongPasswordRuntimeException e) {
+ } catch (final WrongPasswordRuntimeException e) {
e.printStackTrace();
fail("My checked exception instead of a throwableS...");
- } catch (Throwable e) {
+ } catch (final Throwable e) {
System.out.println("A throwable exception...");
}
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
e.printStackTrace();
fail("?!? invalid URL ???");
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java Thu Jul 17 07:52:58 2014
@@ -35,18 +35,15 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-ws")
@RunWith(ApplicationComposer.class)
-public class DynamicPortTest
-{
+public class DynamicPortTest {
@Configuration
- public Properties config()
- {
+ public Properties config() {
return new PropertiesBuilder().property("httpejbd.port", "0").build();
}
@Module
@Classes(value = DynamicImpl.class)
- public WebApp module()
- {
+ public WebApp module() {
return new WebApp().contextRoot("/test").addServlet("ws", DynamicImpl.class.getName(), "/ws");
}
@@ -54,23 +51,19 @@ public class DynamicPortTest
private Dynamic client;
@Test
- public void checkHandlersAreCDIBeans() throws MalformedURLException
- {
+ public void checkHandlersAreCDIBeans() throws MalformedURLException {
assertEquals("ok", client.test());
}
@WebService
- public static interface Dynamic
- {
+ public static interface Dynamic {
String test();
}
@WebService
- public static class DynamicImpl implements Dynamic
- {
+ public static class DynamicImpl implements Dynamic {
@Override
- public String test()
- {
+ public String test() {
return "ok";
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java Thu Jul 17 07:52:58 2014
@@ -90,7 +90,7 @@ public class FeatureTest {
public static boolean ok = false;
@Override
- public void initialize(Server server, Bus bus) {
+ public void initialize(final Server server, final Bus bus) {
ok = true;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java Thu Jul 17 07:52:58 2014
@@ -76,7 +76,7 @@ public class SoapBinding12ClientTest {
*/
public static class MockWebService12 extends HttpServlet {
@Override
- protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
if ("GET".equals(req.getMethod())) {
resp.getWriter().write("<?xml version='1.0' encoding='UTF-8'?>" +
"<wsdl:definitions xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:tns=\"http://cxf.server.openejb.apache.org/\" xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:ns1=\"http://schemas.xmlsoap.org/soap/http\" name=\"MyWebservice12Service\" targetNamespace=\"http://cxf.server.openejb.apache.org/\">\n" +
@@ -172,7 +172,7 @@ public class SoapBinding12ClientTest {
return attribute;
}
- public void setAttribute(String attribute) {
+ public void setAttribute(final String attribute) {
this.attribute = attribute;
}
}
@@ -193,7 +193,7 @@ public class SoapBinding12ClientTest {
return attribute;
}
- public void setAttribute(String attribute) {
+ public void setAttribute(final String attribute) {
this.attribute = attribute;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java Thu Jul 17 07:52:58 2014
@@ -56,10 +56,10 @@ public class WebServiceWithAnUserInterce
@Test
public void test() throws Exception {
- Foo foo = Service.create(
- new URL("http://localhost:4204/openejb-cxf/FooImpl?wsdl"),
- new QName("http://cxf.server.openejb.apache.org/", "FooImplService"))
- .getPort(Foo.class);
+ final Foo foo = Service.create(
+ new URL("http://localhost:4204/openejb-cxf/FooImpl?wsdl"),
+ new QName("http://cxf.server.openejb.apache.org/", "FooImplService"))
+ .getPort(Foo.class);
assertNotNull(foo);
assertEquals("bar", foo.hi());
}
@@ -80,7 +80,7 @@ public class WebServiceWithAnUserInterce
public static class BarInterceptor {
@AroundInvoke
- public Object around(InvocationContext ic) throws Exception {
+ public Object around(final InvocationContext ic) throws Exception {
return "bar";
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java Thu Jul 17 07:52:58 2014
@@ -51,11 +51,11 @@ public class WsJMXTest {
public WebApp war() {
final WebApp webapp = new WebApp().contextRoot("app");
- Servlet servlet = new Servlet();
+ final Servlet servlet = new Servlet();
servlet.setServletName("toto");
servlet.setServletClass(AnPojoEndpoint.class.getName());
- ServletMapping servletMapping = new ServletMapping();
+ final ServletMapping servletMapping = new ServletMapping();
servletMapping.setServletName("pojo");
servletMapping.getUrlPattern().add("/toto");
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBean.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBean.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBean.java Thu Jul 17 07:52:58 2014
@@ -28,15 +28,15 @@ import javax.jws.WebService;
@HandlerChain(file = "handler.xml")
public class AuthenticatorServiceBean implements AuthenticatorService {
- public boolean authenticate(String name, String password)throws WrongPasswordException {
- System.out.println(String.format("AuthenticatorServiceBean.authenticate(%s, %s)",
- name, password));
+ public boolean authenticate(final String name, final String password) throws WrongPasswordException {
+ System.out.println(String.format("AuthenticatorServiceBean.authenticate(%s, %s)",
+ name, password));
throw new WrongPasswordException("Checked exception");
}
- public boolean authenticateRuntime(String name, String password) {
- System.out.println(String.format("AuthenticatorServiceBean.authenticateRuntime(%s, %s)",
- name, password));
+ public boolean authenticateRuntime(final String name, final String password) {
+ System.out.println(String.format("AuthenticatorServiceBean.authenticateRuntime(%s, %s)",
+ name, password));
throw new WrongPasswordRuntimeException("Runtime exception");
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBeanNoHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBeanNoHandler.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBeanNoHandler.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/AuthenticatorServiceBeanNoHandler.java Thu Jul 17 07:52:58 2014
@@ -27,15 +27,15 @@ import javax.jws.WebService;
// @HandlerChain(file="handler.xml")
public class AuthenticatorServiceBeanNoHandler implements AuthenticatorService {
- public boolean authenticate(String name, String password) throws WrongPasswordException {
- System.out.println(String.format("AuthenticatorServiceBeanNoHandler.authenticate(%s, %s)",
- name,password));
+ public boolean authenticate(final String name, final String password) throws WrongPasswordException {
+ System.out.println(String.format("AuthenticatorServiceBeanNoHandler.authenticate(%s, %s)",
+ name, password));
throw new WrongPasswordException("Checked exception");
}
- public boolean authenticateRuntime(String name, String password) {
+ public boolean authenticateRuntime(final String name, final String password) {
System.out.println(String.format("AuthenticatorServiceBeanNoHandler.authenticateRuntime(%s, %s)",
- name, password));
+ name, password));
throw new WrongPasswordRuntimeException("Runtime exception");
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/DummyInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/DummyInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/DummyInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/DummyInterceptor.java Thu Jul 17 07:52:58 2014
@@ -36,14 +36,14 @@ public class DummyInterceptor implements
return Collections.emptySet();
}
- public void close(MessageContext mc) {
+ public void close(final MessageContext mc) {
}
- public boolean handleFault(SOAPMessageContext mc) {
+ public boolean handleFault(final SOAPMessageContext mc) {
return true;
}
- public boolean handleMessage(SOAPMessageContext mc) {
+ public boolean handleMessage(final SOAPMessageContext mc) {
return true;
}
}
\ No newline at end of file
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordException.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordException.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordException.java Thu Jul 17 07:52:58 2014
@@ -28,15 +28,15 @@ public class WrongPasswordException exte
super();
}
- public WrongPasswordException(String message, Throwable cause) {
+ public WrongPasswordException(final String message, final Throwable cause) {
super(message, cause);
}
- public WrongPasswordException(String message) {
+ public WrongPasswordException(final String message) {
super(message);
}
- public WrongPasswordException(Throwable cause) {
+ public WrongPasswordException(final Throwable cause) {
super(cause);
}
}
\ No newline at end of file
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordRuntimeException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordRuntimeException.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordRuntimeException.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/fault/WrongPasswordRuntimeException.java Thu Jul 17 07:52:58 2014
@@ -29,15 +29,15 @@ public class WrongPasswordRuntimeExcepti
super();
}
- public WrongPasswordRuntimeException(String message, Throwable cause) {
+ public WrongPasswordRuntimeException(final String message, final Throwable cause) {
super(message, cause);
}
- public WrongPasswordRuntimeException(String message) {
+ public WrongPasswordRuntimeException(final String message) {
super(message);
}
- public WrongPasswordRuntimeException(Throwable cause) {
+ public WrongPasswordRuntimeException(final Throwable cause) {
super(cause);
}
}
\ No newline at end of file
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/pom.xml?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/pom.xml Thu Jul 17 07:52:58 2014
@@ -16,7 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -31,7 +32,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java Thu Jul 17 07:52:58 2014
@@ -38,7 +38,7 @@ public class NTService {
public static void start(final String[] args) {
try {
instance.startImpl(args);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
e.printStackTrace(System.err);
}
}
@@ -51,7 +51,7 @@ public class NTService {
public static void stop(final String[] args) {
try {
instance.stopImpl();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
e.printStackTrace(System.err);
}
}
@@ -84,7 +84,7 @@ public class NTService {
//The process has finished
running.set(false);
- } catch (Exception e) {
+ } catch (final Exception e) {
running.set(false);
throw new RuntimeException("Failed to Bootstrap OpenEJB", e);
}
@@ -101,7 +101,7 @@ public class NTService {
try {
System.out.println("Stopping NTService");
server.stop();
- } catch (Exception e) {
+ } catch (final Exception e) {
//Failed to stop
running.set(true);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java Thu Jul 17 07:52:58 2014
@@ -68,8 +68,8 @@ public class DerbyNetworkService impleme
this.verbose = options.get("verbose", false);
this.host = InetAddress.getByName("0.0.0.0");
System.setProperty(
- "derby.system.home",
- options.get("derby.system.home", SystemInstance.get().getBase().getDirectory().getAbsolutePath())
+ "derby.system.home",
+ options.get("derby.system.home", SystemInstance.get().getBase().getDirectory().getAbsolutePath())
);
}
@@ -94,7 +94,7 @@ public class DerbyNetworkService impleme
if (verbose) {
LOGGER.info("Starting openejb-derbynet with derby " + serverControl.getRuntimeInfo() + " " + serverControl.getSysinfo());
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServiceException(e);
}
}
@@ -106,7 +106,7 @@ public class DerbyNetworkService impleme
}
try {
this.serverControl.shutdown();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServiceException(e);
} finally {
this.serverControl = null;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/test/java/org/apache/openejb/server/derbynet/DerbyNetworkServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/test/java/org/apache/openejb/server/derbynet/DerbyNetworkServiceTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/test/java/org/apache/openejb/server/derbynet/DerbyNetworkServiceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-derbynet/src/test/java/org/apache/openejb/server/derbynet/DerbyNetworkServiceTest.java Thu Jul 17 07:52:58 2014
@@ -45,25 +45,25 @@ public class DerbyNetworkServiceTest {
private static final long RETRY_TIMEOUT = 250;
private long timeoutLeftover = 10000;
- private void waitForDerby(int port) {
+ private void waitForDerby(final int port) {
try {
- Socket socket = new Socket("localhost", port);
+ final Socket socket = new Socket("localhost", port);
socket.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
timeoutLeftover -= RETRY_TIMEOUT;
if (timeoutLeftover < 0) {
Assert.fail("Impossible to connect using port\"" + port + "\". Message: " + e.getMessage());
}
try {
Thread.sleep(RETRY_TIMEOUT);
- } catch (InterruptedException ignore) {
+ } catch (final InterruptedException ignore) {
// no-op
}
waitForDerby(port);
}
}
- private void assertConnection(int port) throws ClassNotFoundException, SQLException {
+ private void assertConnection(final int port) throws ClassNotFoundException, SQLException {
Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
final String connectionStr = "jdbc:derby://localhost:" + port + "/testDB;create=true;user=tomee;password=tomee";
final Connection conn = DriverManager.getConnection(connectionStr);
@@ -87,15 +87,15 @@ public class DerbyNetworkServiceTest {
final int port = NetworkUtil.getNextAvailablePort();
final SimpleServiceManager serviceManager = new SimpleServiceManager(new ServiceFinder() {
@Override
- public Map<String, Properties> mapAvailableServices(Class interfase) throws IOException, ClassNotFoundException {
+ public Map<String, Properties> mapAvailableServices(final Class interfase) throws IOException, ClassNotFoundException {
final Properties properties = new Properties();
properties.setProperty("server", DerbyNetworkService.class.getName());
properties.setProperty("port", port + "");
properties.setProperty("disabled", "false");
properties.put(ServerService.class, DerbyNetworkService.class);
properties.put(
- "derby.system.home",
- new File(SystemInstance.get().getBase().getDirectory(), "target").getAbsolutePath()
+ "derby.system.home",
+ new File(SystemInstance.get().getBase().getDirectory(), "target").getAbsolutePath()
);
final Map<String, Properties> services = new HashMap<String, Properties>();
services.put("derbynet", properties);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/pom.xml?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/pom.xml Thu Jul 17 07:52:58 2014
@@ -19,7 +19,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -61,7 +62,10 @@
<forkMode>pertest</forkMode>
<!-- DEBUG: Uncomment this line and comment out the next -->
<!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar" -Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api. -Dopenejb.classloader.forced-load=org.apache.openejb</argLine>
+ <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"
+ -Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api.
+ -Dopenejb.classloader.forced-load=org.apache.openejb
+ </argLine>
<!--
<systemProperties>
<property>
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java Thu Jul 17 07:52:58 2014
@@ -76,14 +76,14 @@ class AuthRequestHandler extends Request
res.setIdentity(client);
res.setResponseCode(ResponseCodes.AUTH_GRANTED);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
res.setResponseCode(ResponseCodes.AUTH_DENIED);
res.setDeniedCause(t);
} finally {
if (debug) {
try {
logger.debug("AUTH REQUEST: " + req + " -- RESPONSE: " + res);
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
}
}
@@ -102,7 +102,7 @@ class AuthRequestHandler extends Request
try {
res.writeExternal(out);
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.fatal("Could not write AuthenticationResponse to output stream", e);
}
} else {
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java Thu Jul 17 07:52:58 2014
@@ -43,7 +43,7 @@ class ClientObjectFactory implements org
try {
uriString = (props.getProperty("openejb.ejbd.uri", uriString));
this.defaultServerMetaData = new ServerMetaData(new URI(uriString));
- } catch (Exception e) {
+ } catch (final Exception e) {
EjbDaemon.logger.error("Failed to read 'openejb.ejbd.uri': " + uriString, e);
}
}
@@ -68,7 +68,7 @@ class ClientObjectFactory implements org
Object securityIdentity = null;
try {
securityIdentity = call.getEJBRequest().getClientIdentity();
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
}
final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
@@ -98,7 +98,7 @@ class ClientObjectFactory implements org
Object securityIdentity = null;
try {
securityIdentity = call.getEJBRequest().getClientIdentity();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
@@ -119,7 +119,7 @@ class ClientObjectFactory implements org
Object securityIdentity = null;
try {
securityIdentity = call.getEJBRequest().getClientIdentity();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
@@ -141,18 +141,18 @@ class ClientObjectFactory implements org
Object securityIdentity = null;
try {
securityIdentity = call.getEJBRequest().getClientIdentity();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
final EJBMetaDataImpl eMetaData = new EJBMetaDataImpl(null, null,
- beanContext.getPrimaryKeyClass(),
- beanContext.getComponentType().toString(),
- beanContext.getDeploymentID().toString(),
- idCode,
- convert(info.getInterfaceType()),
- info.getInterfaces(),
- beanContext.getAsynchronousMethodSignatures());
+ beanContext.getPrimaryKeyClass(),
+ beanContext.getComponentType().toString(),
+ beanContext.getDeploymentID().toString(),
+ idCode,
+ convert(info.getInterfaceType()),
+ info.getInterfaces(),
+ beanContext.getAsynchronousMethodSignatures());
eMetaData.loadProperties(beanContext.getProperties());
final Object primKey = info.getPrimaryKey();
@@ -194,7 +194,7 @@ class ClientObjectFactory implements org
Object securityIdentity = null;
try {
securityIdentity = call.getEJBRequest().getClientIdentity();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
@@ -207,14 +207,14 @@ class ClientObjectFactory implements org
private EJBMetaDataImpl buildEjbMetaData(final ProxyInfo info, final BeanContext beanContext, final int idCode) {
final EJBMetaDataImpl eMetaData = new EJBMetaDataImpl(beanContext.getHomeInterface(),
- beanContext.getRemoteInterface(),
- beanContext.getPrimaryKeyClass(),
- beanContext.getComponentType().toString(),
- beanContext.getDeploymentID().toString(),
- idCode,
- convert(info.getInterfaceType()),
- info.getInterfaces(),
- beanContext.getAsynchronousMethodSignatures());
+ beanContext.getRemoteInterface(),
+ beanContext.getPrimaryKeyClass(),
+ beanContext.getComponentType().toString(),
+ beanContext.getDeploymentID().toString(),
+ idCode,
+ convert(info.getInterfaceType()),
+ info.getInterfaces(),
+ beanContext.getAsynchronousMethodSignatures());
eMetaData.loadProperties(beanContext.getProperties());
return eMetaData;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClusterRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClusterRequestHandler.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClusterRequestHandler.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClusterRequestHandler.java Thu Jul 17 07:52:58 2014
@@ -67,10 +67,10 @@ public class ClusterRequestHandler exten
try {
req.readExternal(in);
- } catch (IOException e) {
+ } catch (final IOException e) {
res.setFailure(e);
return res;
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
res.setFailure(new IOException().initCause(e));
return res;
}
@@ -110,7 +110,7 @@ public class ClusterRequestHandler exten
try {
res.setMetaData(metaData);
res.writeExternal(out);
- } catch (IOException e) {
+ } catch (final IOException e) {
logger.error("Failed to write to ClusterResponse", e);
throw e;
}
@@ -129,7 +129,7 @@ public class ClusterRequestHandler exten
logger.info("Peer discovered: " + service.toString());
data.add(service);
}
- } catch (URISyntaxException e) {
+ } catch (final URISyntaxException e) {
logger.error("serviceAdded: Invalid service URI format. Expected <group>:<type>:<serverURI> but found '" + uri.toString() + "'");
}
}
@@ -147,7 +147,7 @@ public class ClusterRequestHandler exten
logger.info("Peer removed: " + service.toString());
data.remove(service);
}
- } catch (URISyntaxException e) {
+ } catch (final URISyntaxException e) {
logger.error("serviceAdded: Invalid service URI format. Expected <group>:<type>:<serverURI> but found '" + uri.toString() + "'");
}
}