You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:27 UTC
[22/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
index 5231747..cb5cc77 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
@@ -21,16 +21,16 @@ package org.apache.cxf.jca.inbound;
/**
*
* DispatchMDBActivationSpec is an {@link javax.resource.spi.ActivationSpec}
- * that activates a CXF service endpoint facade to dispatch call to the target
+ * that activates a CXF service endpoint facade to dispatch call to the target
* Stateless Session Bean.
- *
+ *
*/
public class DispatchMDBActivationSpec extends MDBActivationSpec {
private String targetBeanJndiName;
/**
- * @param targetBeanJndiName
+ * @param targetBeanJndiName
*/
public void setTargetBeanJndiName(String targetBeanJndiName) {
this.targetBeanJndiName = targetBeanJndiName;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
index 3f02803..03ae56d 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
@@ -30,15 +30,15 @@ import org.apache.cxf.message.Exchange;
/**
* DispatchMDBInvoker is executed in the context of a Message Driven Bean
* that dispatches calls to the target Session Bean where the service logic is
- * implemented. The target must be a Stateless Session Bean. Since
- * DispatchMDBInvoker makes EJB local invocation to the target bean, the
+ * implemented. The target must be a Stateless Session Bean. Since
+ * DispatchMDBInvoker makes EJB local invocation to the target bean, the
* Message Driven Bean must be configured to include a local reference to
* the target bean in the deployment descriptor. The advantage of using
- * DispatchMDBInvoker is that no modification to the resource adapter's
+ * DispatchMDBInvoker is that no modification to the resource adapter's
* deployment descriptor (ra.xml) is required to add or remove inbound endpoints.
*/
public class DispatchMDBInvoker extends MDBInvoker {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(DispatchMDBInvoker.class);
private String targetJndiName;
@@ -50,29 +50,29 @@ public class DispatchMDBInvoker extends MDBInvoker {
super(factory);
this.targetJndiName = targetJndiName;
}
-
+
@Override
public Object getServiceObject(Exchange context) {
MessageEndpoint ep = null;
MessageEndpoint epFromMessage = null;
-
+
if (context != null) {
epFromMessage = context.getInMessage().getContent(MessageEndpoint.class);
}
-
+
if (epFromMessage == null) {
ep = getMessageEndpoint();
} else {
ep = epFromMessage;
}
-
+
Object target = null;
if (ep == null) {
LOG.log(Level.SEVERE, "Failed to obtain MessageEndpoint");
return null;
}
-
+
try {
target = ((DispatchMDBMessageListener)ep)
.lookupTargetObject(targetJndiName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
index 87eaeec..10aba8b 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
@@ -20,9 +20,9 @@ package org.apache.cxf.jca.inbound;
/**
- * The DispatchMDBMessageListener is intended to be used as the
- * <messagelistener-type> of an <inbound-resourcesadapter> in the resource
- * adapter's deployment descriptor (ra.xml). The default implementation
+ * The DispatchMDBMessageListener is intended to be used as the
+ * <messagelistener-type> of an <inbound-resourcesadapter> in the resource
+ * adapter's deployment descriptor (ra.xml). The default implementation
* class is {@link DispatchMDBMessageListenerImpl}.
* The benefit of using DispatchMDBMessageListener is that users
* are not required to put the Service Endpoint Interface (SEI) in the resource
@@ -33,7 +33,7 @@ public interface DispatchMDBMessageListener {
/**
* Looks up the target object by JNDI name.
- *
+ *
* @param targetJndiName
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
index d543463..d889a06 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
@@ -25,24 +25,24 @@ import javax.ejb.MessageDrivenContext;
import javax.naming.InitialContext;
/**
- * DispatchMDBMessageListenerImpl supports dispatching of calls to a
+ * DispatchMDBMessageListenerImpl supports dispatching of calls to a
* Stateless Session Bean.
- *
+ *
* DispatchMDBMessageListenerImpl is intended to be used as the <ejb-class> of
* the <message-driven> bean in the resource adaptor's deployment descriptor
- * (ra.xml). When it is used, the <messaging-type> should be set to
+ * (ra.xml). When it is used, the <messaging-type> should be set to
* org.apache.cxf.jca.inbound.DispatchMDBMessageListener. Also, the resource
* adaptor's deployment descriptor should specify the same interface
- * (org.apache.cxf.jca.inbound.DispatchMDBMessageListener) in the
- * <messagelistener-type> in order to activate the inbound facade endpoint.
- * Since the Message Driven Bean is used to activate the inbound
- * endpoint facade by CXF JCA connector, all the required resources (such as,
- * service endpoint interface class, WSDL, or bus configuration) should be put
- * in the same jar with the Message Driven Bean.
+ * (org.apache.cxf.jca.inbound.DispatchMDBMessageListener) in the
+ * <messagelistener-type> in order to activate the inbound facade endpoint.
+ * Since the Message Driven Bean is used to activate the inbound
+ * endpoint facade by CXF JCA connector, all the required resources (such as,
+ * service endpoint interface class, WSDL, or bus configuration) should be put
+ * in the same jar with the Message Driven Bean.
*/
-public class DispatchMDBMessageListenerImpl
+public class DispatchMDBMessageListenerImpl
implements MessageDrivenBean, DispatchMDBMessageListener {
-
+
private static final long serialVersionUID = -8428728265893081763L;
/**
@@ -65,6 +65,6 @@ public class DispatchMDBMessageListenerImpl
public void setMessageDrivenContext(MessageDrivenContext mdc) {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
index 5ce741c..d39c968 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
@@ -23,20 +23,20 @@ import org.apache.cxf.endpoint.Server;
/**
* An inbound endpoint is a CXF service endpoint facade exposed by
- * the JCA connector. Its role is to accept service requests from
- * ordinary CXF clients and forward them to an invoker (running in
+ * the JCA connector. Its role is to accept service requests from
+ * ordinary CXF clients and forward them to an invoker (running in
* the context of the activating message driven bean). The invoker
* either contains the service implementation or dispatches the call
- * to a Stateless Session Bean. This class holds objects that are
- * needed to accomplish the task and provides a shutdown method to
- * clean up the endpoint.
- *
+ * to a Stateless Session Bean. This class holds objects that are
+ * needed to accomplish the task and provides a shutdown method to
+ * clean up the endpoint.
+ *
*/
public class InboundEndpoint {
-
+
private Server server;
private MDBInvoker invoker;
-
+
/**
* @param server the server object that has already been started
* @param invoker the invoker that invoker an EJB
@@ -45,7 +45,7 @@ public class InboundEndpoint {
this.server = server;
this.invoker = invoker;
}
-
+
/**
* @return the invoker
*/
@@ -79,16 +79,16 @@ public class InboundEndpoint {
/**
* Shuts down the endpoint
- *
+ *
* @throws Exception
*/
public void shutdown() throws Exception {
invoker = null;
-
+
if (server != null) {
server.destroy();
server = null;
- }
+ }
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
index 86b6646..ad513d3 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
@@ -25,7 +25,7 @@ import javax.resource.spi.ResourceAdapter;
/**
* MDBActivationSpec is an {@link javax.resource.spi.ActivationSpec} that
- * activates a CXF service endpoint facade. All resource locations are
+ * activates a CXF service endpoint facade. All resource locations are
* relative to the message driven bean jar.
*
*/
@@ -40,18 +40,18 @@ public class MDBActivationSpec implements ActivationSpec {
private String endpointName;
private String serviceName;
private String displayName;
-
+
/**
- * Gets the transport address used by
+ * Gets the transport address used by
* {@link org.apache.cxf.frontend.ServerFactoryBean}.
- *
+ *
* @return the address
*/
public String getAddress() {
return address;
}
- /**
+ /**
* @return the busConfigLocation
*/
public String getBusConfigLocation() {
@@ -66,7 +66,7 @@ public class MDBActivationSpec implements ActivationSpec {
}
/**
- *
+ *
* @return the endpointName
*/
public String getEndpointName() {
@@ -79,7 +79,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
* Comma separated schema locations
- *
+ *
* @return the schemaLocations
*/
public String getSchemaLocations() {
@@ -88,10 +88,10 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- * Gets the service endpoint interface classname.
- *
+ * Gets the service endpoint interface classname.
+ *
* The class should be available in the Message Driven Bean jar.
- *
+ *
* @return the serviceInterfaceClass
*/
public String getServiceInterfaceClass() {
@@ -107,7 +107,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- *
+ *
* @return the wsdlLocation
*/
public String getWsdlLocation() {
@@ -116,9 +116,9 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- * Sets the transport address used by
+ * Sets the transport address used by
* {@link org.apache.cxf.frontend.ServerFactoryBean}.
- *
+ *
* @param address the address to set
*/
public void setAddress(String address) {
@@ -127,7 +127,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- *
+ *
* @param busConfigLocation the busConfigLocation to set
*/
public void setBusConfigLocation(String busConfigLocation) {
@@ -138,7 +138,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
* A unique name that is readable to human and it is to
* identify an inbound endpoint within a application server.
- *
+ *
* @param displayName the displayName to set
*/
public void setDisplayName(String displayName) {
@@ -158,7 +158,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
* Comma separated schema locations
- *
+ *
* @param schemaLocations the schemaLocations to set
*/
public void setSchemaLocations(String schemaLocations) {
@@ -181,7 +181,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- *
+ *
* @param wsdlLocation the wsdlLocation to set
*/
public void setWsdlLocation(String wsdlLocation) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
index 0b7168a..cc63164 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
@@ -44,14 +44,14 @@ import org.apache.cxf.service.model.EndpointInfo;
/**
*
- * MDBActivationWork is a type of {@link Work} that is executed by
+ * MDBActivationWork is a type of {@link Work} that is executed by
* {@link javax.resource.spi.work.WorkManager}. MDBActivationWork
* starts an CXF service endpoint to accept inbound calls for
* the JCA connector.
- *
+ *
*/
public class MDBActivationWork implements Work {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(MDBActivationWork.class);
private static final String MESSAGE_LISTENER_METHOD = "lookupTargetObject";
private static final String MESSAGE_ENDPOINT_FACTORY = "MessageEndpointFactory";
@@ -62,8 +62,8 @@ public class MDBActivationWork implements Work {
private Map<String, InboundEndpoint> endpoints;
- public MDBActivationWork(MDBActivationSpec spec,
- MessageEndpointFactory endpointFactory,
+ public MDBActivationWork(MDBActivationSpec spec,
+ MessageEndpointFactory endpointFactory,
Map<String, InboundEndpoint> endpoints) {
this.spec = spec;
this.endpointFactory = endpointFactory;
@@ -81,9 +81,9 @@ public class MDBActivationWork implements Work {
MDBInvoker invoker = createInvoker();
MessageEndpoint mep = invoker.getMessageEndpoint();
if (mep == null) {
- return;
+ return;
}
-
+
ClassLoader savedClassLoader = null;
try {
@@ -98,10 +98,10 @@ public class MDBActivationWork implements Work {
}
}
}
-
+
/**
* @param endpoint
- * @param classLoader
+ * @param classLoader
*/
private void activate(MDBInvoker invoker, ClassLoader classLoader) {
Class<?> serviceClass = null;
@@ -110,28 +110,28 @@ public class MDBActivationWork implements Work {
serviceClass = Class.forName(spec.getServiceInterfaceClass(),
false, classLoader);
} catch (ClassNotFoundException e) {
- LOG.severe("Failed to activate service endpoint "
- + spec.getDisplayName()
+ LOG.severe("Failed to activate service endpoint "
+ + spec.getDisplayName()
+ " due to unable to endpoint listener.");
return;
- }
+ }
}
-
+
Bus bus = null;
if (spec.getBusConfigLocation() != null) {
URL url = classLoader.getResource(spec.getBusConfigLocation());
if (url == null) {
- LOG.warning("Unable to get bus configuration from "
+ LOG.warning("Unable to get bus configuration from "
+ spec.getBusConfigLocation());
- } else {
+ } else {
bus = new SpringBusFactory().createBus(url);
}
}
-
+
if (bus == null) {
bus = BusFactory.getDefaultBus();
}
-
+
Method method = null;
try {
@@ -143,18 +143,18 @@ public class MDBActivationWork implements Work {
}
Server server = createServer(bus, serviceClass, invoker);
-
+
if (server == null) {
LOG.severe("Failed to create CXF facade service endpoint.");
return;
}
-
+
EndpointInfo ei = server.getEndpoint().getEndpointInfo();
ei.setProperty(MESSAGE_ENDPOINT_FACTORY, endpointFactory);
ei.setProperty(MDB_TRANSACTED_METHOD, method);
server.start();
-
+
// save the server for clean up later
endpoints.put(spec.getDisplayName(), new InboundEndpoint(server, invoker));
}
@@ -169,49 +169,49 @@ public class MDBActivationWork implements Work {
} else {
factory = new ServerFactoryBean();
}
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Creating a server using " + factory.getClass().getName());
}
-
+
if (serviceClass != null) {
factory.setServiceClass(serviceClass);
}
-
- if (spec.getWsdlLocation() != null) {
+
+ if (spec.getWsdlLocation() != null) {
factory.setWsdlLocation(spec.getWsdlLocation());
}
-
+
if (spec.getAddress() != null) {
factory.setAddress(spec.getAddress());
}
-
+
factory.setBus(bus);
-
+
if (spec.getEndpointName() != null) {
factory.setEndpointName(QName.valueOf(spec.getEndpointName()));
}
-
+
if (spec.getSchemaLocations() != null) {
factory.setSchemaLocations(getListOfString(spec.getSchemaLocations()));
}
-
+
if (spec.getServiceName() != null) {
factory.setServiceName(QName.valueOf(spec.getServiceName()));
}
-
+
factory.setInvoker(invoker);
// Don't start the server yet
factory.setStart(false);
-
+
Server retval = null;
if (factory instanceof JaxWsServerFactoryBean) {
retval = createServerFromJaxwsEndpoint((JaxWsServerFactoryBean)factory);
} else {
retval = factory.create();
}
-
+
return retval;
}
@@ -219,17 +219,17 @@ public class MDBActivationWork implements Work {
* Creates a server from EndpointImpl so that jaxws-endpoint config can be injected.
*/
private Server createServerFromJaxwsEndpoint(JaxWsServerFactoryBean factory) {
-
+
@SuppressWarnings("resource")
EndpointImpl endpoint = new EndpointImpl(factory.getBus(), null, factory);
-
+
endpoint.setWsdlLocation(factory.getWsdlURL());
endpoint.setImplementorClass(factory.getServiceClass());
endpoint.setEndpointName(factory.getEndpointName());
endpoint.setServiceName(factory.getServiceName());
endpoint.setInvoker(factory.getInvoker());
endpoint.setSchemaLocations(factory.getSchemaLocations());
-
+
return endpoint.getServer(factory.getAddress());
}
@@ -241,7 +241,7 @@ public class MDBActivationWork implements Work {
if (str == null) {
return null;
}
-
+
return Arrays.asList(str.split(","));
}
@@ -252,7 +252,7 @@ public class MDBActivationWork implements Work {
private MDBInvoker createInvoker() {
MDBInvoker answer = null;
if (spec instanceof DispatchMDBActivationSpec) {
- answer = new DispatchMDBInvoker(endpointFactory,
+ answer = new DispatchMDBInvoker(endpointFactory,
((DispatchMDBActivationSpec)spec).getTargetBeanJndiName());
} else {
answer = new MDBInvoker(endpointFactory);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
index 8e5e440..cdf71f5 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
@@ -29,12 +29,12 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.invoker.AbstractInvoker;
/**
- * An invoker that supports direct Message Driven Bean invocation.
- * It get invoked in the context of the Message Driven Bean that
- * activates the CXF service endpoint facade. Applications that put
- * service implementation inside the Message Driven Bean that activates
- * the inbound endpoint facade should choose this invoker. It is
- * more straightforward and faster than {@link DispatchMBDInvoker} but
+ * An invoker that supports direct Message Driven Bean invocation.
+ * It get invoked in the context of the Message Driven Bean that
+ * activates the CXF service endpoint facade. Applications that put
+ * service implementation inside the Message Driven Bean that activates
+ * the inbound endpoint facade should choose this invoker. It is
+ * more straightforward and faster than {@link DispatchMBDInvoker} but
* it requires to modify resource adapter's deployment descriptor (ra.xml)
* as the <messaging-type> needs to be set to the Service Endpoint Interface
* (SEI) class.
@@ -43,7 +43,7 @@ public class MDBInvoker extends AbstractInvoker {
private static final Logger LOG = LogUtils.getL7dLogger(MDBInvoker.class);
private static final int MAX_ATTEMPTS = 5;
private static final long RETRY_SLEEP = 2000;
-
+
private final MessageEndpointFactory endpointFactory;
/**
@@ -68,7 +68,7 @@ public class MDBInvoker extends AbstractInvoker {
public Object getServiceObject(Exchange context) {
return getMessageEndpoint();
}
-
+
public void releaseServiceObject(final Exchange context, Object obj) {
if (obj instanceof MessageEndpoint) {
MessageEndpoint mep = (MessageEndpoint)obj;
@@ -95,7 +95,7 @@ public class MDBInvoker extends AbstractInvoker {
}
}
}
-
+
return ep;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
index 3d75bdd..22cc445 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
@@ -54,7 +54,7 @@ public final class JarLoader {
return getBytesFromInputStream(is, -1);
}
- public static synchronized Map<?, ?> getJarContents(String path)
+ public static synchronized Map<?, ?> getJarContents(String path)
throws MalformedURLException, IOException {
if (!archives.containsKey(path)) {
loadArchive(path);
@@ -76,9 +76,9 @@ public final class JarLoader {
// This byte array has now been exploded into a Map so the raw bytes are
// no longer needed, replace the entry with the exploded Map
//
- Map<String, Object> parentMap =
+ Map<String, Object> parentMap =
CastUtils.cast((Map<?, ?>)archives.get(buildPartialName(nameComponents, i)));
- Map<?, ?> archiveMap =
+ Map<?, ?> archiveMap =
(Map<?, ?>)archives.get(buildPartialName(nameComponents, i + 1));
parentMap.put(nameComponents.get(i), archiveMap);
@@ -133,13 +133,13 @@ public final class JarLoader {
List<String> nameComponents = tokenizePathComponents(name);
Map<String, Object> map = null;
- if (nameComponents.size() == 1) {
+ if (nameComponents.size() == 1) {
map = readZipStream((new URL(getRootArchiveName(name))).openStream());
} else {
- Map<?, ?> parentMap
+ Map<?, ?> parentMap
= (Map<?, ?>)archives.get(buildPartialName(nameComponents, nameComponents.size() - 1));
byte bytes[] = (byte[])(parentMap.get(nameComponents.get(nameComponents.size() - 1)));
-
+
if (null == bytes) {
// unexpected, classpath entry in error, referenced jar is not in the archive
throw new IOException(
@@ -160,8 +160,8 @@ public final class JarLoader {
for (ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
if (ze.isDirectory()) {
- map.put(ze.getName(), ze.getName());
- } else {
+ map.put(ze.getName(), ze.getName());
+ } else {
byte bytes[] = getBytesFromInputStream(zis, ze.getSize());
map.put(ze.getName(), bytes);
}
@@ -171,15 +171,15 @@ public final class JarLoader {
}
private static byte[] getBytesFromInputStream(InputStream is, long size) throws IOException {
-
+
byte chunk[] = new byte[((size > CHUNK_SIZE) && (size < MAX_CHUNK_SIZE)) ? (int)size : CHUNK_SIZE];
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
for (int i = is.read(chunk, 0, chunk.length); i != -1; i = is.read(chunk, 0, chunk.length)) {
- baos.write(chunk, 0, i);
+ baos.write(chunk, 0, i);
}
-
+
return baos.toByteArray();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
index 90bf47e..80d58c2 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
@@ -25,23 +25,23 @@ package org.apache.cxf.jca.outbound;
*/
public interface CXFConnection {
-
+
/**
* Retrieves a service object to invoke. The serviceInterface class must
* match the serviceClass in the CXFConnectionSpec that is used to
* obtain this CXFConnection. Application should not continue to use the service
* object after the the connection has been closed by calling {@link #close()}.
- *
+ *
* @param <T>
* @param serviceClass
* @return service object
* @throws Exception
*/
<T> T getService(Class<T> serviceClass) throws Exception;
-
+
/**
* Closes the connection handle. A caller should not use a closed connection.
- *
+ *
* @throws Exception if an error occurs during close.
*/
void close() throws Exception;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
index 06064d7..ffdab73 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
@@ -26,21 +26,21 @@ import javax.resource.ResourceException;
/**
* Provides methods to create a {@link CXFConnection} object that provides access
- * to a Web Service defined from the supplied specifications. A CXFConnectionFactory
- * is returned from an environment naming context JNDI lookup by the Application
+ * to a Web Service defined from the supplied specifications. A CXFConnectionFactory
+ * is returned from an environment naming context JNDI lookup by the Application
* Server.
*/
public interface CXFConnectionFactory extends Serializable, Referenceable {
-
+
/**
- * Creates a CXFConnection object which allows access to CXF web service based on
- * the CXFConnectionSpec object. Required CXFConnectionSpec fields are wsdlURL,
- * serviceClass, endpointName, and serviceName. Each connection returned by this
- * method MUST be closed by calling the {@link CXFConnection#close()} when it is no
- * longer needed.
- *
+ * Creates a CXFConnection object which allows access to CXF web service based on
+ * the CXFConnectionSpec object. Required CXFConnectionSpec fields are wsdlURL,
+ * serviceClass, endpointName, and serviceName. Each connection returned by this
+ * method MUST be closed by calling the {@link CXFConnection#close()} when it is no
+ * longer needed.
+ *
* @param spec
- * @return CXFConnection
+ * @return CXFConnection
* @throws ResourceException
*/
CXFConnection getConnection(CXFConnectionSpec spec) throws ResourceException;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
index 1bc611a..b20a4d7 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
@@ -31,14 +31,14 @@ import org.apache.commons.lang.ObjectUtils;
* a {@link CXFConnection}.
*/
public class CXFConnectionSpec implements ConnectionRequestInfo {
-
+
private Class<?> serviceClass;
private URL wsdlURL;
private URL busConfigURL;
private QName serviceName;
private QName endpointName;
private String address;
-
+
/**
* @return the serviceClass
*/
@@ -111,8 +111,8 @@ public class CXFConnectionSpec implements ConnectionRequestInfo {
public void setAddress(String address) {
this.address = address;
}
-
- // Required by JCA Spec
+
+ // Required by JCA Spec
public boolean equals(Object other) {
if (other != null && !this.getClass().isAssignableFrom(other.getClass())) {
return false;
@@ -121,62 +121,62 @@ public class CXFConnectionSpec implements ConnectionRequestInfo {
if (!(other instanceof CXFConnectionSpec)) {
return false;
}
-
+
CXFConnectionSpec that = (CXFConnectionSpec)other;
-
+
if (!ObjectUtils.equals(that.getWsdlURL(), wsdlURL)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getBusConfigURL(), busConfigURL)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getServiceClass(), serviceClass)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getServiceName(), serviceName)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getEndpointName(), endpointName)) {
return false;
}
-
+
return ObjectUtils.equals(that.getAddress(), address);
}
// Required by JCA Spec
public int hashCode() {
int retval = 0;
-
+
if (wsdlURL != null) {
retval += wsdlURL.hashCode(); //NOSONAR
}
-
+
if (busConfigURL != null) {
retval += busConfigURL.hashCode(); //NOSONAR
}
-
+
if (serviceClass != null) {
retval += serviceClass.hashCode();
}
-
+
if (serviceName != null) {
retval += serviceName.hashCode();
}
-
+
if (endpointName != null) {
retval += endpointName.hashCode();
}
-
+
if (address != null) {
retval += address.hashCode();
}
-
+
return retval;
-
+
}
public String toString() {
@@ -189,5 +189,5 @@ public class CXFConnectionSpec implements ConnectionRequestInfo {
buf.append(",address=" + address);
return buf.toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
index b0f6f39..50dae9d 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
@@ -40,7 +40,7 @@ public class CXFManagedConnectionMetaData implements ManagedConnectionMetaData {
return "Apache CXF";
}
-
+
public String getEISProductVersion() throws ResourceException {
return "2.0";
}
@@ -52,7 +52,7 @@ public class CXFManagedConnectionMetaData implements ManagedConnectionMetaData {
return -1;
}
-
+
public String getUserName() throws ResourceException {
return userName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
index 9e8c1c1..e183432 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
@@ -42,7 +42,7 @@ public class ConnectionFactoryImpl implements CXFConnectionFactory {
}
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public Reference getReference() throws NamingException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
index c187da0..e5ee5c3 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
@@ -32,7 +32,7 @@ import javax.resource.spi.ManagedConnectionFactory;
import org.apache.cxf.common.logging.LogUtils;
/**
- * Default Connection Manager which does not support connection pool.
+ * Default Connection Manager which does not support connection pool.
* Connection will be destroyed upon closing by application.
*/
public class DefaultConnectionManager implements ConnectionManager, ConnectionEventListener {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
index 19f7e8b..ba4bd07 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
@@ -40,24 +40,24 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.logging.LoggerHelper;
import org.apache.cxf.jca.cxf.ResourceAdapterImpl;
-public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
+public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
ResourceAdapterAssociation {
private static final long serialVersionUID = -5294527634981120642L;
private static final Logger LOG = LogUtils.getL7dLogger(ManagedConnectionFactoryImpl.class);
-
+
private String busConfigURL;
private PrintWriter printWriter;
private ResourceAdapter resourceAdapter;
-
- private ConnectionManager defaultConnectionManager =
+
+ private ConnectionManager defaultConnectionManager =
new DefaultConnectionManager();
static {
// first use of log, default init if necessary
LoggerHelper.init();
}
-
+
/* --------------------------------------------------------------------
* Bean Properties
*/
@@ -68,8 +68,8 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
public String getBusConfigURL() {
return busConfigURL;
}
-
-
+
+
/* --------------------------------------------------------------------
* ManagedConnectionFactory methods
*/
@@ -79,17 +79,17 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
}
return new ConnectionFactoryImpl(this, defaultConnectionManager);
}
-
- public Object createConnectionFactory(ConnectionManager connMgr)
+
+ public Object createConnectionFactory(ConnectionManager connMgr)
throws ResourceException {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("Create connection factory by app server connMgr " + connMgr);
}
- return new ConnectionFactoryImpl(this,
+ return new ConnectionFactoryImpl(this,
connMgr == null ? defaultConnectionManager : connMgr);
}
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
throws ResourceException {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("Create managed connection subject=" + subject + "connReqInfo="
@@ -97,7 +97,7 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
}
return new ManagedConnectionImpl(this, connReqInfo, subject);
}
-
+
// hashCode method is required by JCA 1.5 because on properties
public int hashCode() {
int retval = 0;
@@ -105,10 +105,10 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (busConfigURL != null) {
retval += busConfigURL.hashCode();
}
-
+
return retval;
}
-
+
// equals method is required by JCA 1.5 because on properties
public boolean equals(Object o) {
if (o != null && !this.getClass().isAssignableFrom(o.getClass())) {
@@ -118,12 +118,12 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (!(o instanceof ManagedConnectionFactoryImpl)) {
return false;
}
-
+
ManagedConnectionFactoryImpl that = (ManagedConnectionFactoryImpl)o;
-
+
return ObjectUtils.equals(that.getBusConfigURL(), busConfigURL);
}
-
+
public PrintWriter getLogWriter() throws ResourceException {
return printWriter;
}
@@ -136,8 +136,8 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
printWriter = aPrintWriter;
LoggerHelper.initializeLoggingOnWriter(printWriter);
}
-
- public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") Set mcs, Subject subject,
+
+ public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") Set mcs, Subject subject,
ConnectionRequestInfo reqInfo) throws ResourceException {
if (LOG.isLoggable(Level.FINER)) {
@@ -153,18 +153,18 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (!(obj instanceof ManagedConnectionImpl)) {
continue;
}
-
+
ManagedConnectionImpl mc = (ManagedConnectionImpl)obj;
-
+
if (!ObjectUtils.equals(busConfigURL,
mc.getManagedConnectionFactoryImpl().getBusConfigURL())) {
continue;
}
-
+
if (!ObjectUtils.equals(reqInfo, mc.getRequestInfo())) {
continue;
}
-
+
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("found matched connection " + mc);
}
@@ -172,7 +172,7 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
}
return null;
}
-
+
/* --------------------------------------------------------------------
* ResourceAdapterAssociation methods
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
index c516728..bf584f7 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
@@ -64,21 +64,21 @@ import org.apache.cxf.jca.core.logging.LoggerHelper;
*/
public class ManagedConnectionImpl implements ManagedConnection {
private static final Logger LOG = LogUtils.getL7dLogger(ManagedConnectionImpl.class);
-
- private Set<ConnectionEventListener> listeners =
+
+ private Set<ConnectionEventListener> listeners =
Collections.synchronizedSet(new HashSet<>());
-
- private Map<Object, Subject> handles =
+
+ private Map<Object, Subject> handles =
Collections.synchronizedMap(new HashMap<Object, Subject>());
private PrintWriter printWriter;
-
+
private ManagedConnectionFactoryImpl mcf;
private ConnectionRequestInfo connReqInfo;
private boolean isClosed;
private Bus bus;
private Object associatedHandle;
private Object clientProxy;
-
+
public ManagedConnectionImpl(ManagedConnectionFactoryImpl mcf,
ConnectionRequestInfo connReqInfo, Subject subject) {
this.mcf = mcf;
@@ -88,7 +88,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
/* -------------------------------------------------------------------
* ManagedConnection Methods
*/
-
+
public void addConnectionEventListener(ConnectionEventListener listener) {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("add listener : " + listener);
@@ -116,7 +116,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("destroy");
}
-
+
Client client = ClientProxy.getClient(clientProxy);
client.destroy();
@@ -132,24 +132,24 @@ public class ManagedConnectionImpl implements ManagedConnection {
LOG.finer("get handle for subject=" + subject + " cxRequestInfo="
+ cxRequestInfo);
}
-
+
if (isClosed) {
throw new ResourceException("connection has been closed");
}
-
+
// check request info
if (!connReqInfo.equals(cxRequestInfo)) {
throw new ResourceException("connection request info: " + cxRequestInfo
+ " does not match " + connReqInfo);
}
-
+
CXFConnectionSpec spec = (CXFConnectionSpec)cxRequestInfo;
Object handle = createConnectionHandle(spec);
handles.put(handle, subject);
associatedHandle = handle;
return handle;
-
+
}
public LocalTransaction getLocalTransaction() throws ResourceException {
@@ -179,7 +179,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
LoggerHelper.initializeLoggingOnWriter(printWriter);
}
}
-
+
/* -------------------------------------------------------------------
* Public Methods
*/
@@ -187,15 +187,15 @@ public class ManagedConnectionImpl implements ManagedConnection {
public ConnectionRequestInfo getRequestInfo() {
return connReqInfo;
}
-
+
public ManagedConnectionFactoryImpl getManagedConnectionFactoryImpl() {
return mcf;
}
-
+
/* -------------------------------------------------------------------
* Private Methods
*/
-
+
private void sendEvent(final ConnectionEvent coEvent) {
synchronized (listeners) {
Iterator<ConnectionEventListener> iterator = listeners.iterator();
@@ -205,7 +205,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
}
}
- private void sendEventToListener(ConnectionEventListener listener,
+ private void sendEventToListener(ConnectionEventListener listener,
ConnectionEvent coEvent) {
if (coEvent.getId() == ConnectionEvent.CONNECTION_CLOSED) {
listener.connectionClosed(coEvent);
@@ -226,53 +226,53 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (coEvent.getId() == ConnectionEvent.CONNECTION_ERROR_OCCURRED) {
listener.connectionErrorOccurred(coEvent);
}
-
+
}
-
+
private String getUserName() {
if (associatedHandle != null) {
Subject subject = handles.get(associatedHandle);
if (subject != null) {
return subject.toString();
}
- }
+ }
return null;
-
+
}
private Object createConnectionHandle(final CXFConnectionSpec spec) {
-
- Class<?> interfaces[] = {CXFConnection.class, BindingProvider.class,
+
+ Class<?> interfaces[] = {CXFConnection.class, BindingProvider.class,
spec.getServiceClass()};
- return Proxy.newProxyInstance(spec.getServiceClass().getClassLoader(),
+ return Proxy.newProxyInstance(spec.getServiceClass().getClassLoader(),
interfaces, new ConnectionInvocationHandler(
createClientProxy(spec), spec));
}
-
+
private synchronized Object createClientProxy(final CXFConnectionSpec spec) {
if (clientProxy == null) {
validateConnectionSpec(spec);
ClientProxyFactoryBean factory = null;
-
+
if (EndpointUtils.hasWebServiceAnnotation(spec.getServiceClass())) {
factory = new JaxWsProxyFactoryBean();
} else {
factory = new ClientProxyFactoryBean();
}
-
+
factory.setBus(getBus(spec.getBusConfigURL()));
factory.setServiceClass(spec.getServiceClass());
factory.getServiceFactory().setEndpointName(spec.getEndpointName());
factory.getServiceFactory().setServiceName(spec.getServiceName());
factory.getServiceFactory().setWsdlURL(spec.getWsdlURL());
-
+
if (spec.getAddress() != null) {
factory.setAddress(spec.getAddress());
}
-
+
configureObject(spec.getEndpointName().toString() + ".jaxws-client.proxyFactory", factory);
-
+
clientProxy = factory.create();
}
@@ -283,15 +283,15 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (spec.getServiceClass() == null) {
throw new IllegalArgumentException("no serviceClass in connection spec");
}
-
+
if (spec.getEndpointName() == null) {
throw new IllegalArgumentException("no endpointName in connection spec");
}
-
+
if (spec.getServiceName() == null) {
throw new IllegalArgumentException("no serviceName in connection spec");
}
-
+
if (spec.getWsdlURL() == null) {
throw new IllegalArgumentException("no wsdlURL in connection spec");
}
@@ -303,7 +303,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
configurer.configureBean(name, instance);
}
}
-
+
private synchronized Bus getBus(URL busConfigLocation) {
if (bus == null) {
if (busConfigLocation != null) {
@@ -312,11 +312,11 @@ public class ManagedConnectionImpl implements ManagedConnection {
}
bus = new SpringBusFactory().createBus(busConfigLocation);
} else if (mcf.getBusConfigURL() != null) {
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Create bus from URL " + mcf.getBusConfigURL());
}
-
+
URL url = null;
try {
url = new URL(mcf.getBusConfigURL());
@@ -327,8 +327,8 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (url != null) {
bus = new SpringBusFactory().createBus(url);
}
- }
-
+ }
+
if (bus == null) {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Create default bus");
@@ -342,7 +342,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
private class ConnectionInvocationHandler implements InvocationHandler {
private Object target;
private CXFConnectionSpec spec;
-
+
ConnectionInvocationHandler(Object target, CXFConnectionSpec spec) {
this.target = target;
this.spec = spec;
@@ -350,37 +350,37 @@ public class ManagedConnectionImpl implements ManagedConnection {
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
-
+
if (LOG.isLoggable(Level.FINEST)) {
LOG.finest("invoke connection spec:" + spec + " method=" + method);
}
-
+
if ("hashCode".equals(method.getName())) {
return method.invoke(Proxy.getInvocationHandler(proxy), args);
}
-
+
if ("equals".equals(method.getName())) {
// These are proxies. We don't really care if their targets are equal.
- // We do care if these are the same proxy instances that we created.
- // Therefore, if their proxy and invocation handler are consistent,
+ // We do care if these are the same proxy instances that we created.
+ // Therefore, if their proxy and invocation handler are consistent,
// we believe they are equal.
boolean result = false;
try {
result = proxy == args[0] && this == Proxy.getInvocationHandler(args[0]);
} catch (Exception e) {
// ignore and assume not equal
- }
+ }
return result;
}
-
+
if ("toString".equals(method.getName())) {
return "ManagedConnection: " + spec;
}
-
+
if (!handles.containsKey(proxy)) {
throw new IllegalArgumentException("Stale connection");
}
-
+
if ("getService".equals(method.getName())) {
return handleGetServiceMethod(proxy, method, args);
} else if ("close".equals(method.getName())) {
@@ -395,25 +395,25 @@ public class ManagedConnectionImpl implements ManagedConnection {
Object[] args) {
if (!spec.getServiceClass().equals(args[0])) {
- throw new IllegalArgumentException("serviceClass "
+ throw new IllegalArgumentException("serviceClass "
+ args[0] + " does not match " + spec.getServiceClass());
- }
-
+ }
+
return target;
}
-
+
private Object handleCloseMethod(Object proxy, Method method,
- Object[] args) {
-
+ Object[] args) {
+
handles.remove(proxy);
associatedHandle = null;
ConnectionEvent event = new ConnectionEvent(ManagedConnectionImpl.this,
ConnectionEvent.CONNECTION_CLOSED);
event.setConnectionHandle(proxy);
sendEvent(event);
-
+
return null;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
index 71fb54e..cb3494e 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
@@ -44,63 +44,63 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
public class EJBEndpoint {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(EJBEndpoint.class);
-
+
private static final int DEFAULT_HTTP_PORT = 80;
-
+
private static final String HTTPS_PREFIX = "https";
-
+
private EJBServantConfig config;
-
+
private Context jndiContext;
-
+
private EJBHome ejbHome;
-
+
private String ejbServantBaseURL;
-
+
private WorkManager workManager;
-
+
public EJBEndpoint(EJBServantConfig ejbConfig) {
this.config = ejbConfig;
}
-
+
public Server publish() throws Exception {
jndiContext = new InitialContext();
Object obj = jndiContext.lookup(config.getJNDIName());
ejbHome = (EJBHome) PortableRemoteObject.narrow(obj, EJBHome.class);
-
+
Class<?> interfaceClass = Class.forName(getServiceClassName());
boolean isJaxws = isJaxWsServiceInterface(interfaceClass);
ServerFactoryBean factory = isJaxws ? new JaxWsServerFactoryBean() : new ServerFactoryBean();
factory.setServiceClass(interfaceClass);
-
+
if (config.getWsdlURL() != null) {
factory.getServiceFactory().setWsdlURL(config.getWsdlURL());
}
-
+
factory.setInvoker(new EJBInvoker(ejbHome));
-
- String baseAddress = isNotNull(getEjbServantBaseURL()) ? getEjbServantBaseURL()
+
+ String baseAddress = isNotNull(getEjbServantBaseURL()) ? getEjbServantBaseURL()
: getDefaultEJBServantBaseURL();
String address = baseAddress + "/" + config.getJNDIName();
factory.setAddress(address);
-
+
if (address.length() >= 5 && HTTPS_PREFIX.equalsIgnoreCase(address.substring(0, 5))) {
throw new UnsupportedOperationException("EJBEndpoint creation by https protocol is unsupported");
}
-
+
if (getWorkManager() != null) {
setWorkManagerThreadPoolToJetty(factory.getBus(), baseAddress);
}
-
+
Server server = factory.create();
LOG.info("Published EJB Endpoint of [" + config.getJNDIName() + "] at [" + address + "]");
-
+
return server;
}
-
-
+
+
protected void setWorkManagerThreadPoolToJetty(Bus bus, String baseAddress) {
JettyHTTPServerEngineFactory engineFactory = bus.getExtension(JettyHTTPServerEngineFactory.class);
int port = getAddressPort(baseAddress);
@@ -110,19 +110,19 @@ public class EJBEndpoint {
JettyHTTPServerEngine engine = new JettyHTTPServerEngine();
engine.setThreadPool(new WorkManagerThreadPool(getWorkManager()));
engine.setPort(port);
-
+
List<JettyHTTPServerEngine> engineList = new ArrayList<>();
engineList.add(engine);
engineFactory.setEnginesList(engineList);
}
-
+
public String getServiceClassName() throws Exception {
String packageName = PackageUtils.parsePackageName(config.getServiceName().getNamespaceURI(), null);
- String interfaceName = packageName + "."
+ String interfaceName = packageName + "."
+ config.getJNDIName().substring(0, config.getJNDIName().length() - 4);
return interfaceName;
}
-
+
public String getDefaultEJBServantBaseURL() throws Exception {
String hostName = "";
try {
@@ -133,7 +133,7 @@ public class EJBEndpoint {
}
return "http://" + hostName + ":9999";
}
-
+
public int getAddressPort(String address) {
int index = address.lastIndexOf(":");
int end = address.lastIndexOf("/");
@@ -142,10 +142,10 @@ public class EJBEndpoint {
}
if (end < index) {
return Integer.parseInt(address.substring(index + 1));
- }
+ }
return Integer.parseInt(address.substring(index + 1, end));
}
-
+
private static boolean isJaxWsServiceInterface(Class<?> cls) {
if (cls == null) {
return false;
@@ -160,7 +160,7 @@ public class EJBEndpoint {
public void setEjbServantBaseURL(String ejbServantBaseURL) {
this.ejbServantBaseURL = ejbServantBaseURL;
}
-
+
private static boolean isNotNull(String value) {
return value != null && !"".equals(value.trim());
}
@@ -172,7 +172,7 @@ public class EJBEndpoint {
public void setWorkManager(WorkManager workManager) {
this.workManager = workManager;
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
index d689a2b..2039ec1 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
@@ -28,13 +28,13 @@ import org.apache.cxf.service.invoker.AbstractInvoker;
public class EJBInvoker extends AbstractInvoker {
-
+
private static final Object[] EMPTY_OBJECT = new Object[0];
-
+
private EJBHome home;
-
+
private Method createMethod;
-
+
public EJBInvoker(EJBHome home) {
this.home = home;
try {
@@ -46,8 +46,8 @@ public class EJBInvoker extends AbstractInvoker {
throw new IllegalArgumentException("Unable to initialize invoker: " + ex);
}
}
-
-
+
+
@Override
public Object getServiceObject(Exchange context) {
Object ejbObject = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
index 7c24aa4..9d3c46b 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
@@ -25,13 +25,13 @@ import javax.xml.namespace.QName;
public class EJBServantConfig {
-
+
private String jndiName;
-
+
private QName serviceName;
-
+
private String wsdlURL;
-
+
public EJBServantConfig(String jndiName, String value) {
this.jndiName = jndiName;
StringTokenizer st = new StringTokenizer(value, "@", true);
@@ -48,9 +48,9 @@ public class EJBServantConfig {
}
}
}
-
+
}
-
+
public String getJNDIName() {
return jndiName;
}
@@ -74,8 +74,8 @@ public class EJBServantConfig {
public void setWsdlURL(String wsdlURL) {
this.wsdlURL = wsdlURL;
}
-
-
+
+
private QName getServiceName(String sname) {
StringTokenizer st = new StringTokenizer(sname, "}", false);
String namespace = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
index 23914e6..7b5b017 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
@@ -34,18 +34,18 @@ public class FireWallClassLoaderTest extends Assert {
public FireWallClassLoaderTest() {
}
-
+
@Test
public void testJavaLangStringAlt() throws Exception {
ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(), new String[] {"java.*"});
Class<?> c1 = c.loadClass("java.lang.String");
assertNotNull("Should have returned a class here", c1);
}
-
+
@Test
public void testJavaLangStringBlock() throws Exception {
- ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(),
- new String[] {},
+ ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(),
+ new String[] {},
new String[] {"java.lang.String"});
try {
c.loadClass("java.lang.String");
@@ -86,7 +86,7 @@ public class FireWallClassLoaderTest extends Assert {
}
fail("Should not have found the " + urlConn.getClass().getName() + " class");
}
-
+
@Test
public void testSecurityException() {
try {
@@ -94,7 +94,7 @@ public class FireWallClassLoaderTest extends Assert {
} catch (SecurityException se) {
return;
}
- fail("Constructing a FireWallClassLoader that does not pass through java."
+ fail("Constructing a FireWallClassLoader that does not pass through java."
+ " should cause a SecurityException.");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index 7a7c235..48936b5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -37,8 +37,8 @@ public class PlugInClassLoaderTest extends Assert {
private static final Logger LOG = LogUtils.getLogger(PlugInClassLoaderTest.class);
private static boolean debug;
PlugInClassLoader plugInClassLoader;
-
-
+
+
@Before
public void setUp() throws Exception {
@@ -100,14 +100,14 @@ public class PlugInClassLoaderTest extends Assert {
throws Exception {
String className = "javax.resource.ResourceException";
// ensure it is available
- getClass().getClassLoader().loadClass(className);
+ getClass().getClassLoader().loadClass(className);
try {
Class<?> claz = plugInClassLoader.loadClass(className);
assertEquals("That should be same classloader ", claz.getClassLoader(),
getClass().getClassLoader());
-
+
} catch (ClassNotFoundException ex) {
- fail("Do not Expect ClassNotFoundException");
+ fail("Do not Expect ClassNotFoundException");
}
}
@@ -119,7 +119,7 @@ public class PlugInClassLoaderTest extends Assert {
URL url = resultClass.getResource("dummy.txt");
LOG.info("URL: " + url);
assertTrue("bad url: " + url, url.toString().startsWith("classloader:"));
-
+
InputStream configStream = url.openStream();
assertNotNull("stream must not be null. ", configStream);
@@ -142,15 +142,15 @@ public class PlugInClassLoaderTest extends Assert {
URL url = resultClass.getResource("/META-INF/MANIFEST.MF");
LOG.info("URL: " + url);
assertTrue("bad url: " + url, url.toString().startsWith("classloader:"));
-
+
InputStream configStream = url.openStream();
assertNotNull("stream must not be null. ", configStream);
assertTrue("unexpected stream class: " + configStream.getClass(),
configStream instanceof java.io.ByteArrayInputStream);
-
+
byte[] bytes = new byte[21];
configStream.read(bytes, 0, bytes.length);
-
+
String result = IOUtils.newStringFromBytes(bytes);
LOG.fine("dummy.txt contents: " + result);
assertTrue("unexpected dummy.txt contents:" + result, result.indexOf("Manifest-Version: 1.0") != -1);
@@ -176,5 +176,5 @@ public class PlugInClassLoaderTest extends Assert {
URL url = plugInClassLoader.findResource("foo!/bar/");
assertNull("url must be null. ", url);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 892e31b..9c88d02 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -46,7 +46,7 @@ public class LoggerHelperTest extends Assert {
public void testEnableDisableConsoleLogging() {
Logger rootLogger = LogUtils.getLogger(this.getClass(), null, "");
Handler handler;
-
+
/*Handler handler = LoggerHelper.getHandler(rootLogger, LoggerHelper.CONSOLE_HANDLER);
assertNotNull("default console appender is there", handler);*/
@@ -104,5 +104,5 @@ public class LoggerHelperTest extends Assert {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
index 75b16e9..abf4d38 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
@@ -75,7 +75,7 @@ public class DummyManagedConnectionImpl extends AbstractManagedConnectionImpl {
con = o;
}
/*
- public CXFManagedConnectionFactory getManagedConnectionFactory() {
+ public CXFManagedConnectionFactory getManagedConnectionFactory() {
return (CXFManagedConnectionFactory)theManagedConnectionFactory();
- } */
+ } */
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index c19e219..4df0f58 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -28,16 +28,16 @@ import org.junit.Test;
public class HandlerTest extends Assert {
- Handler h;
-
-
+ Handler h;
+
+
@Before
- public void setUp() throws ClassNotFoundException {
+ public void setUp() throws ClassNotFoundException {
h = new Handler();
- }
-
+ }
+
@Test
- public void testGetStreamToThisResource() throws Exception {
+ public void testGetStreamToThisResource() throws Exception {
String urlpath = HandlerTest.class.getName().replace('.', '/') + ".class";
String urls = "resourceadapter:" + urlpath;
URL res = new URL(null, urls, h);
@@ -47,7 +47,7 @@ public class HandlerTest extends Assert {
@Test
- public void testGetStreamToNonExistantResourceThrows() throws Exception {
+ public void testGetStreamToNonExistantResourceThrows() throws Exception {
String path = "some gobbledy rubbish/that/does/not/exist";
String urls = "resourceadapter:" + path;
URL res = new URL(null, urls, h);
@@ -60,7 +60,7 @@ public class HandlerTest extends Assert {
}
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index b6f92fe..68b03f8 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -122,7 +122,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Test
public void testGetSetLogWriter() throws Exception {
- PrintWriter writer = EasyMock.createMock(PrintWriter.class);
+ PrintWriter writer = EasyMock.createMock(PrintWriter.class);
writer.write(EasyMock.isA(String.class));
EasyMock.expectLastCall().anyTimes();
writer.flush();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index cc9795f..c2f443a 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class ManagedConnectionImplTest extends Assert {
private DummyManagedConnectionImpl mc;
-
+
@Before
public void setUp() throws Exception {
mc = new DummyManagedConnectionImpl(null, null, null);
@@ -47,7 +47,7 @@ public class ManagedConnectionImplTest extends Assert {
assertTrue(mc.getLogWriter() == writer);
writer.close();
EasyMock.expectLastCall();
- EasyMock.replay(writer);
+ EasyMock.replay(writer);
mc.destroy();
EasyMock.verify(writer);
@@ -83,7 +83,7 @@ public class ManagedConnectionImplTest extends Assert {
@Test
public void testGetMetaData() throws Exception {
try {
- mc.getMetaData();
+ mc.getMetaData();
} catch (NotSupportedException expected) {
fail("Got the Exception here");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index b107e0c..159da3c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -29,21 +29,21 @@ import org.junit.Test;
public class ResourceAdapterInternalExceptionTest extends Assert {
- private static final Logger EXCEPTION_LOGGER =
+ private static final Logger EXCEPTION_LOGGER =
LogUtils.getLogger(ResourceAdapterInternalException.class);
- private Level logLevel;
+ private Level logLevel;
- @Before
- public void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
logLevel = EXCEPTION_LOGGER.getLevel();
EXCEPTION_LOGGER.setLevel(Level.SEVERE);
- }
-
+ }
+
@After
public void tearDown() throws Exception {
EXCEPTION_LOGGER.setLevel(logLevel);
}
-
+
@Test
public void testMessage() {
final String msg = "msg1";
@@ -65,7 +65,7 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
assertTrue(e.toString().indexOf(msg) != -1);
assertTrue(e.toString().indexOf("reason") == -1);
assertEquals(e.getMessage(), msg);
- assertNull(e.getCause());
+ assertNull(e.getCause());
}
@Test
@@ -94,7 +94,7 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
assertTrue(e.toString().indexOf(msg) != -1);
assertTrue(e.toString().indexOf("reason") != -1);
assertTrue(e.toString().indexOf(causeMsg) != -1);
- assertEquals(e.getCause(), cause);
+ assertEquals(e.getCause(), cause);
}
@@ -104,11 +104,11 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
final String causeMsg = "cause";
Exception cause = new RuntimeException(causeMsg);
- javax.resource.spi.ResourceAdapterInternalException re =
+ javax.resource.spi.ResourceAdapterInternalException re =
new ResourceAdapterInternalException(
- msg,
+ msg,
new java.lang.reflect.InvocationTargetException(cause));
-
+
assertTrue(re.toString().indexOf(msg) != -1);
assertTrue(re.toString().indexOf("reason") != -1);
assertTrue(re.toString().indexOf(causeMsg) != -1);
@@ -122,14 +122,14 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
final String causeMsg = "cause";
java.lang.Throwable cause = new java.lang.UnknownError(causeMsg);
- ResourceAdapterInternalException re =
+ ResourceAdapterInternalException re =
new ResourceAdapterInternalException(
msg,
new java.lang.reflect.InvocationTargetException(cause));
assertEquals(re.getCause(), cause);
}
-
+
@Test
public void testGetLinkedExceptionReturnNullIfNoCause() throws Exception {
ResourceAdapterInternalException re = new ResourceAdapterInternalException("ex");
@@ -149,5 +149,5 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
ResourceAdapterInternalException re = new ResourceAdapterInternalException("ex", cause);
assertEquals("get same exception", cause, re.getLinkedException());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
index 4d617cc..0c748db 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
@@ -31,6 +31,6 @@ public class ResourceBeanTest extends Assert {
ResourceBean rb = new ResourceBean();
rb.setDisableConsoleLogging(true);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
index 4027980..6932961 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
@@ -28,7 +28,7 @@ public class UriHandlerInitTest extends Assert {
private static final String PROP_NAME = "java.protocol.handler.pkgs";
private static final String PKG_ADD = "do.do";
-
+
@Test
public void testAppendToProp() {
final Properties properties = System.getProperties();
@@ -53,8 +53,8 @@ public class UriHandlerInitTest extends Assert {
}
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
index 1e295d9..c038625 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
@@ -33,11 +33,11 @@ import org.easymock.EasyMock;
import org.junit.Test;
public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectionFactoryImplTest {
-
-
+
+
@Test
public void testSetResourceAdapter() throws Exception {
- TestableAssociatedManagedConnectionFactoryImpl mci =
+ TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
ResourceAdapterImpl rai = new ResourceAdapterImpl();
mci.setResourceAdapter(rai);
@@ -70,7 +70,7 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
}
/*
public void testBusInitializedAndRegisteredToResourceAdapter() throws ResourceException, Exception {
- DummyBus.reset();
+ DummyBus.reset();
System.setProperty("test.bus.class", DummyBus.class.getName());
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
@@ -82,14 +82,14 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
Thread.currentThread().setContextClassLoader(mci.getClass().getClassLoader());
Class dummyBusClass = Class.forName(DummyBus.class.getName(), true, mci.getClass()
- .getClassLoader());
+ .getClassLoader());
Method initializeCount = dummyBusClass.getMethod("getInitializeCount", new Class[]{});
- ConnectionManager cm =
+ ConnectionManager cm =
(ConnectionManager)EasyMock.createMock(
Class.forName(ConnectionManager.class.getName(), true, mci.getClass().getClassLoader()));
mci.createConnectionFactory(cm);
- assertEquals("bus should be initialized once", 1,
+ assertEquals("bus should be initialized once", 1,
initializeCount.invoke(null, new Object[]{}));
assertEquals("bus registered once after first call", 1, rai.registeredCount);
} finally {
@@ -105,7 +105,7 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
-
+
assertEquals("before associate, one props", 0, mci.getPluginProps().size());
assertTrue("before associate, key1 not set", !mci.getPluginProps().containsKey("key1"));
@@ -115,7 +115,7 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
assertTrue("after associate, key1 is set", mci.getPluginProps().containsKey("key1"));
}
-
+
protected ManagedConnectionFactoryImpl createManagedConnectionFactoryImpl() {
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
@@ -146,5 +146,5 @@ class DummyResourceAdapterImpl extends ResourceAdapterImpl {
class TestableAssociatedManagedConnectionFactoryImpl extends AssociatedManagedConnectionFactoryImpl {
private static final long serialVersionUID = -1077391534536084071L;
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index 75e4703..29f62ed 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class CXFConnectionRequestInfoTest extends Assert {
-
+
@Test
public void testCXFConnectionRequestInfoEquals() throws Exception {
@@ -89,5 +89,5 @@ public class CXFConnectionRequestInfoTest extends Assert {
}
-
+
}