cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [23/51] [partial] cxf git commit: Remove all trailing whitespaces
Date Tue, 14 Feb 2017 09:49:28 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
index 0df66ae..718c0bf 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
@@ -32,8 +32,8 @@ public class Server {
     public static void main(String args[]) throws Exception {
         new Server();
         System.out.println("Server ready...");
-        
-        Thread.sleep(5 * 60 * 1000); 
+
+        Thread.sleep(5 * 60 * 1000);
         System.out.println("Server exiting");
         System.exit(0);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
index 97448dc..9a56382 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
@@ -30,18 +30,18 @@ import org.apache.hello_world_soap12_http.types.FaultDetail;
 
 public final class Client {
 
-    private static final QName SERVICE_NAME 
+    private static final QName SERVICE_NAME
         = new QName("http://apache.org/hello_world_soap12_http", "SOAPService");
 
 
     private Client() {
-    } 
+    }
 
     public static void main(String args[]) throws Exception {
-        
-        if (args.length == 0) { 
+
+        if (args.length == 0) {
             System.out.println("please specify wsdl");
-            System.exit(1); 
+            System.exit(1);
         }
 
         URL wsdlURL;
@@ -51,11 +51,11 @@ public final class Client {
         } else {
             wsdlURL = new URL(args[0]);
         }
-        
+
         System.out.println(wsdlURL);
         SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
         Greeter port = ss.getSoapPort();
-        String resp; 
+        String resp;
 
         System.out.println("Invoking sayHi...");
         resp = port.sayHi();
@@ -88,9 +88,9 @@ public final class Client {
             System.out.println("Expected exception: PingMeFault has occurred: " + ex.getMessage());
             FaultDetail detail = ex.getFaultInfo();
             System.out.println("FaultDetail major:" + detail.getMajor());
-            System.out.println("FaultDetail minor:" + detail.getMinor());            
-        }          
-        System.exit(0); 
+            System.out.println("FaultDetail minor:" + detail.getMinor());
+        }
+        System.exit(0);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
index 46ecca4..63f1f64 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
@@ -24,23 +24,23 @@ import org.apache.hello_world_soap12_http.Greeter;
 import org.apache.hello_world_soap12_http.PingMeFault;
 import org.apache.hello_world_soap12_http.types.FaultDetail;
 
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService", 
-                      targetNamespace = "http://apache.org/hello_world_soap12_http", 
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+                      targetNamespace = "http://apache.org/hello_world_soap12_http",
                       endpointInterface = "org.apache.hello_world_soap12_http.Greeter")
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")     
+@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
 @org.apache.cxf.annotations.SchemaValidation
 public class GreeterImpl implements Greeter {
 
-    private static final Logger LOG = 
+    private static final Logger LOG =
         Logger.getLogger(GreeterImpl.class.getPackage().getName());
-    
+
     public String greetMe(String me) {
         LOG.info("Executing operation greetMe");
         System.out.println("Executing operation greetMe");
         System.out.println("Message received: " + me + "\n");
         return "Hello " + me;
     }
-    
+
     public void greetMeOneWay(String me) {
         LOG.info("Executing operation greetMeOneWay");
         System.out.println("Executing operation greetMeOneWay\n");
@@ -52,7 +52,7 @@ public class GreeterImpl implements Greeter {
         System.out.println("Executing operation sayHi\n");
         return "Bonjour";
     }
-    
+
     public void pingMe() throws PingMeFault {
         FaultDetail faultDetail = new FaultDetail();
         faultDetail.setMajor((short)2);
@@ -62,5 +62,5 @@ public class GreeterImpl implements Greeter {
         throw new PingMeFault("PingMeFault raised by server", faultDetail);
     }
 
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
index 9c03f65..aa69ba9 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
@@ -32,7 +32,7 @@ public final class Client {
     public static final QName SERVICE_NAME = new QName("http://apache.org/hello_world_xml_http/wrapped",
             "XMLService");
 
-    public static final QName PORT_NAME = 
+    public static final QName PORT_NAME =
         new QName("http://apache.org/hello_world_xml_http/wrapped", "XMLPort");
 
     private Client() {
@@ -79,7 +79,7 @@ public final class Client {
         } catch (PingMeFault ex) {
             System.out.println("Expected exception: " + ex.getMessage());
         }
-    
+
         System.exit(0);
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
index 544698d..8b44fb9 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
@@ -23,7 +23,7 @@ import org.apache.hello_world_xml_http.wrapped.Greeter;
 import org.apache.hello_world_xml_http.wrapped.PingMeFault;
 import org.apache.hello_world_xml_http.wrapped.types.FaultDetail;
 
-@javax.jws.WebService(serviceName = "XMLService", 
+@javax.jws.WebService(serviceName = "XMLService",
                       portName = "XMLPort",
                       endpointInterface = "org.apache.hello_world_xml_http.wrapped.Greeter",
                       targetNamespace = "http://apache.org/hello_world_xml_http/wrapped")

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
index 7a090e5..68fd102 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
@@ -31,33 +31,33 @@ import org.apache.cxf.BusFactory;
 import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
 
 /**
- * Apache CXF servlet with CDI 1.1 integration support 
+ * Apache CXF servlet with CDI 1.1 integration support
  */
 public class CXFCdiServlet extends CXFNonSpringServlet {
     private static final long serialVersionUID = -2890970731778523861L;
     private boolean busCreated;
-    
+
     @Override @Inject
     public void setBus(final Bus bus) {
         super.setBus(bus);
     }
-    
+
     @Override
     protected void loadBus(ServletConfig servletConfig) {
         Bus bus = null;
-        
-        final BeanManager beanManager = CDI.current().getBeanManager();        
+
+        final BeanManager beanManager = CDI.current().getBeanManager();
         if (beanManager != null) {
             final Set< Bean< ? > > candidates = beanManager.getBeans(CdiBusBean.CXF);
-            
+
             if (!candidates.isEmpty()) {
                 final Bean< ? > candidate = beanManager.resolve(candidates);
-                
-                bus = (Bus)beanManager.getReference(candidate, Bus.class, 
-                    beanManager.createCreationalContext(candidate));                
+
+                bus = (Bus)beanManager.getReference(candidate, Bus.class,
+                    beanManager.createCreationalContext(candidate));
             }
-        } 
-        
+        }
+
         if (bus != null) {
             setBus(bus);
         } else {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
index fe111a5..523701e 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
@@ -31,13 +31,13 @@ import org.apache.cxf.bus.extension.ExtensionManagerBus;
 
 final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
     static final String CXF = "cxf";
-    
+
     private final InjectionTarget<ExtensionManagerBus> injectionTarget;
-    
+
     CdiBusBean(final InjectionTarget<ExtensionManagerBus> injectionTarget) {
         this.injectionTarget = injectionTarget;
     }
-    
+
     @Override
     public Class< ? > getBeanClass() {
         return Bus.class;
@@ -59,20 +59,20 @@ final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
         types.add(Bus.class);
         return types;
     }
-    
+
     @Override
     public ExtensionManagerBus create(final CreationalContext< ExtensionManagerBus > ctx) {
         final ExtensionManagerBus instance = injectionTarget.produce(ctx);
         CXFBusFactory.possiblySetDefaultBus(instance);
         instance.initialize();
-        
+
         injectionTarget.inject(instance, ctx);
         injectionTarget.postConstruct(instance);
         return instance;
     }
 
     @Override
-    public void destroy(final ExtensionManagerBus instance, 
+    public void destroy(final ExtensionManagerBus instance,
             final CreationalContext< ExtensionManagerBus > ctx) {
         injectionTarget.preDestroy(instance);
         injectionTarget.dispose(instance);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
index a417c0f..dfb8d69 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
@@ -29,22 +29,22 @@ import org.apache.cxf.message.Message;
 public class CdiResourceProvider implements ResourceProvider {
     private Object instance;
     private CreationalContext< ? > context;
-    
+
     private final BeanManager beanManager;
     private final Bean< ? > bean;
-    
+
     CdiResourceProvider(final BeanManager beanManager, final Bean< ? > bean) {
         this.beanManager = beanManager;
         this.bean = bean;
     }
-    
+
     @Override
     public Object getInstance(Message m) {
         if (instance == null) {
             context = beanManager.createCreationalContext(bean);
             instance = beanManager.getReference(bean, bean.getBeanClass(), context);
         }
-        
+
         return instance;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 89394d2..51c4f2f 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -52,7 +52,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
 
 /**
- * Apache CXF portable CDI extension to support initialization of JAX-RS resources.  
+ * Apache CXF portable CDI extension to support initialization of JAX-RS resources.
  */
 public class JAXRSCdiResourceExtension implements Extension {
     private boolean hasBus;
@@ -62,7 +62,7 @@ public class JAXRSCdiResourceExtension implements Extension {
     private final List< Bean< ? > > serviceBeans = new ArrayList< Bean< ? > >();
     private final List< Bean< ? > > providerBeans = new ArrayList< Bean< ? > >();
     private final List< Bean< ? extends Feature > > featureBeans = new ArrayList< Bean< ? extends Feature > >();
-    private final List< CreationalContext< ? > > disposableCreationalContexts = 
+    private final List< CreationalContext< ? > > disposableCreationalContexts =
         new ArrayList< CreationalContext< ? > >();
 
     /**
@@ -73,32 +73,32 @@ public class JAXRSCdiResourceExtension implements Extension {
         private List< Object > providers = new ArrayList<>();
         private List< Feature > features = new ArrayList<>();
         private List< CdiResourceProvider > resourceProviders = new ArrayList<>();
-        
+
         public void addProviders(final Collection< Object > others) {
             this.providers.addAll(others);
         }
-        
+
         public void addFeatures(final Collection< Feature > others) {
             this.features.addAll(others);
         }
-        
+
         public void addResourceProvider(final CdiResourceProvider other) {
             this.resourceProviders.add(other);
         }
-        
+
         public List< Object > getProviders() {
             return providers;
         }
-        
+
         public List< Feature > getFeatures() {
             return features;
         }
-        
+
         public List<CdiResourceProvider> getResourceProviders() {
             return resourceProviders;
         }
     }
-    
+
     @SuppressWarnings("unchecked")
     public <T> void collect(@Observes final ProcessBean< T > event) {
         if (event.getAnnotated().isAnnotationPresent(ApplicationPath.class)) {
@@ -120,9 +120,9 @@ public class JAXRSCdiResourceExtension implements Extension {
     public void load(@Observes final AfterDeploymentValidation event, final BeanManager beanManager) {
         // no need of creational context, it only works for app scoped instances anyway
         final Bean<?> busBean = beanManager.resolve(beanManager.getBeans(CdiBusBean.CXF));
-        
+
         bus = (Bus)beanManager.getReference(
-                busBean, 
+                busBean,
                 Bus.class,
                 beanManager.createCreationalContext(busBean));
 
@@ -167,16 +167,16 @@ public class JAXRSCdiResourceExtension implements Extension {
             event.addBean(applicationBean);
         }
     }
-    
+
     /**
-     * Releases created CreationalContext instances 
+     * Releases created CreationalContext instances
      */
     public void release(@Observes final BeforeShutdown event) {
         for (final CreationalContext<?> disposableCreationalContext: disposableCreationalContexts) {
             disposableCreationalContext.release();
         }
     }
-    
+
     /**
      * Create the JAXRSServerFactoryBean from the application and all discovered service and provider instances.
      * @param application application instance
@@ -205,10 +205,10 @@ public class JAXRSCdiResourceExtension implements Extension {
 
         final JAXRSServerFactoryBean instance = ResourceUtils.createApplication(application, false, false, bus);
         final ClassifiedClasses classified = classes2singletons(application, beanManager);
-        
+
         instance.setProviders(classified.getProviders());
         instance.getFeatures().addAll(classified.getFeatures());
-        
+
         for (final CdiResourceProvider resourceProvider: classified.getResourceProviders()) {
             instance.setResourceProvider(resourceProvider.getResourceClass(), resourceProvider);
         }
@@ -224,21 +224,21 @@ public class JAXRSCdiResourceExtension implements Extension {
      * @return classified instances of classes by instance types
      */
     private ClassifiedClasses classes2singletons(final Application application, final BeanManager beanManager) {
-        final ClassifiedClasses classified = new ClassifiedClasses(); 
+        final ClassifiedClasses classified = new ClassifiedClasses();
 
         // now loop through the classes
         Set<Class<?>> classes = application.getClasses();
         if (!classes.isEmpty()) {
             classified.addProviders(loadProviders(beanManager, classes));
             classified.addFeatures(loadFeatures(beanManager, classes));
-            
+
             for (final Bean< ? > bean: serviceBeans) {
                 if (classes.contains(bean.getBeanClass())) {
                     classified.addResourceProvider(new CdiResourceProvider(beanManager, bean));
                 }
             }
         }
-        
+
         return classified;
     }
 
@@ -316,7 +316,7 @@ public class JAXRSCdiResourceExtension implements Extension {
      */
     private List< Feature > loadFeatures(final BeanManager beanManager, Collection<Class<?>> limitedClasses) {
         final List< Feature > features = new ArrayList<>();
-        
+
         for (final Bean< ? extends Feature > bean: featureBeans) {
             if (limitedClasses.isEmpty() || limitedClasses.contains(bean.getBeanClass())) {
                 features.add(
@@ -328,10 +328,10 @@ public class JAXRSCdiResourceExtension implements Extension {
                 );
             }
         }
-        
+
         return features;
     }
-    
+
     /**
      * Look and apply the available JAXRSServerFactoryBean extensions to customize its
      * creation (f.e. add features, providers, assign transport, ...)
@@ -340,20 +340,20 @@ public class JAXRSCdiResourceExtension implements Extension {
      */
     private void customize(final BeanManager beanManager, final JAXRSServerFactoryBean bean) {
         final Collection<Bean<?>> extensionBeans = beanManager.getBeans(JAXRSServerFactoryCustomizationExtension.class);
-        
+
         for (final Bean<?> extensionBean: extensionBeans) {
             final JAXRSServerFactoryCustomizationExtension extension =
                 (JAXRSServerFactoryCustomizationExtension)beanManager.getReference(
-                    extensionBean, 
-                    extensionBean.getBeanClass(), 
-                    beanManager.createCreationalContext(extensionBean) 
+                    extensionBean,
+                    extensionBean.getBeanClass(),
+                    beanManager.createCreationalContext(extensionBean)
                 );
             extension.customize(bean);
         }
     }
-    
+
     /**
-     * Creates and collects the CreationalContext instances for future releasing. 
+     * Creates and collects the CreationalContext instances for future releasing.
      * @param beanManager bean manager instance
      * @param bean bean instance to create CreationalContext for
      * @return CreationalContext instance

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
index a74cdb5..7b5c845 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
@@ -21,8 +21,8 @@ package org.apache.cxf.cdi.extension;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 
 /**
- * Serves as an extension point in order to allow to customize JAX-RS server 
- * factory bean creation (f.e. add features, providers, assign transport, ...) 
+ * Serves as an extension point in order to allow to customize JAX-RS server
+ * factory bean creation (f.e. add features, providers, assign transport, ...)
  * during the CDI beans discovery and initialization.
  */
 public interface JAXRSServerFactoryCustomizationExtension {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
index 4ab2135..5383326 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
@@ -27,7 +27,7 @@ import javax.resource.ResourceException;
  */
 
 public interface CXFConnectionFactory {
-    
+
     /**
      *  Creates a client proxy based on the connection parameter object.
      * @param param,
@@ -37,8 +37,8 @@ public interface CXFConnectionFactory {
      * @throws ResourceException
      */
     Object getConnection(CXFConnectionParam param) throws ResourceException;
-    
-    
+
+
     /**
      * Returns the underlying {@link Bus} for this connection factory. In some
      * J2EE environments, for example Weblogic, the {@link Bus} and dependent
@@ -51,7 +51,7 @@ public interface CXFConnectionFactory {
      * should be safe without having to modify the classpath <code>
      *    org.apache.cxf.Bus = (org.apache.cxf.Bus)connectionFactory.getBus();
      * </code>
-     * 
+     *
      * @return the connection factory&amp;s {@link Bus}
      */
     Object getBus();

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
index ed7be87..dd062d6 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
@@ -32,11 +32,11 @@ public class CXFConnectionParam {
     private QName serviceName;
     private QName portName;
     private String address;
-    
+
     public CXFConnectionParam() {
     }
 
-    public CXFConnectionParam(Class<?> aIface, URL aWsdlLocation, 
+    public CXFConnectionParam(Class<?> aIface, URL aWsdlLocation,
                                        QName aServiceName, QName aPortName) {
         this.iface = aIface;
         this.wsdlLocation = aWsdlLocation;
@@ -68,18 +68,18 @@ public class CXFConnectionParam {
     public boolean equals(java.lang.Object other) {
         boolean result = false;
         if (other instanceof CXFConnectionRequestInfo) {
-            CXFConnectionRequestInfo cri = (CXFConnectionRequestInfo)other; 
-            result = areEquals(iface, cri.getInterface()) 
+            CXFConnectionRequestInfo cri = (CXFConnectionRequestInfo)other;
+            result = areEquals(iface, cri.getInterface())
                      && areEquals(wsdlLocation, cri.getWsdlLocation())
-                     && areEquals(serviceName, cri.getServiceName()) 
+                     && areEquals(serviceName, cri.getServiceName())
                      && areEquals(portName, cri.getPortName())
                      && areEquals(address, cri.getAddress());
         }
         return result;
     }
-    
-    
-  
+
+
+
     public void setAddress(String address) {
         this.address = address;
     }
@@ -95,18 +95,18 @@ public class CXFConnectionParam {
     public void setWsdlLocation(URL wsdlLocation) {
         this.wsdlLocation = wsdlLocation;
     }
-    
+
     public void setInterface(Class<?> aInterface) {
         this.iface = aInterface;
     }
 
-    public int hashCode() {        
+    public int hashCode() {
         if (getServiceName() != null) {
             return getInterface().hashCode() ^ getServiceName().hashCode();
         } else {
             return getInterface().hashCode() ^ (getAddress() != null ? getAddress().hashCode() : 1);
         }
-    }  
+    }
 
     public String toString() {
         StringBuilder buf = new StringBuilder(256);
@@ -121,9 +121,9 @@ public class CXFConnectionParam {
 
     private boolean areEquals(Object obj1, Object obj2) {
         if (obj1 == null) {
-            return null == obj2; 
+            return null == obj2;
         } else {
             return obj1.equals(obj2);
-        }            
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java b/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
index bb96fc2..e19a2f1 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
@@ -30,7 +30,7 @@ public interface Connection {
 
     /**
      * close the connection handle. A caller should not use a closed connection.
-     * 
+     *
      * @throws ResourceException if an error occurs during close.
      */
     void close() throws ResourceException;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
index 8935574..4e8ea43 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
@@ -42,23 +42,23 @@ import java.security.SecureClassLoader;
  * because someone put them on the classpath or in the extensions directory).
  * <P>
  * For these cases, the FireWallClassLoader can be used.
- * 
+ *
  * <PRE>
- * 
+ *
  * System ClassLoader | FireWallClassLoader | User's ClassLoader
- * 
+ *
  * </PRE>
- * 
+ *
  * The FireWallClassLoader is placed between the user's class loader and the
  * parent class loader. It has a set of filters that define what classes are
  * allowed to go through. These filters describe (a groups of) packages, or a
  * specific classes or resources that are allowed through to the parent
  * classloader. Take as example this filter set:
- * 
+ *
  * <pre>
  * [&quot;com.iona.&quot;, &quot;javax.servlet.jsp.&quot;]
  * </pre>
- * 
+ *
  * This will allow requests to any class/resource staring with com.iona. or
  * javax.servlet.jsp. through to the parent classloader and block all other
  * requests.
@@ -77,7 +77,7 @@ public class FireWallClassLoader extends SecureClassLoader {
 
     /**
      * Constructor.
-     * 
+     *
      * @param parent The Parent ClassLoader to use.
      * @param fs A set of filters to let through. The filters and be either in
      *            package form (<CODE>org.omg.</CODE> or <CODE>org.omg.*</CODE>)
@@ -98,7 +98,7 @@ public class FireWallClassLoader extends SecureClassLoader {
 
     /**
      * Constructor.
-     * 
+     *
      * @param parent The Parent ClassLoader to use.
      * @param fs A set of filters to let through. The filters and be either in
      *            package form (<CODE>org.omg.</CODE> or <CODE>org.omg.*</CODE>)
@@ -151,8 +151,8 @@ public class FireWallClassLoader extends SecureClassLoader {
         }
 
         if (!javaCovered) {
-            throw new SecurityException("It's unsafe to construct a " 
-                        + "FireWallClassLoader that does not let the java. " 
+            throw new SecurityException("It's unsafe to construct a "
+                        + "FireWallClassLoader that does not let the java. "
                         + "package through.");
         }
     }
@@ -227,7 +227,7 @@ public class FireWallClassLoader extends SecureClassLoader {
         throw new ClassNotFoundException(name);
     }*/
 
-    
+
     public java.net.URL getResource(String name) {
         if (negativeFNFilters != null) {
             for (int i = 0; i < negativeFNFilters.length; i++) {
@@ -252,7 +252,7 @@ public class FireWallClassLoader extends SecureClassLoader {
     /**
      * Returns the list of filters used by this FireWallClassLoader. The list is
      * a copy of the array internally used.
-     * 
+     *
      * @return The filters used.
      */
     public String[] getFilters() {
@@ -266,7 +266,7 @@ public class FireWallClassLoader extends SecureClassLoader {
     /**
      * Returns the list of negative filters used by this FireWallClassLoader.
      * The list is a copy of the array internally used.
-     * 
+     *
      * @return The filters used.
      */
     public String[] getNegativeFilters() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
index 18facd5..faa5e81 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
@@ -45,11 +45,11 @@ public class PlugInClassLoader extends SecureClassLoader {
     private static final String NEFILTERS_PROPS_FILE = "negativefilters.properties";
     private String jarUrls[] = new String[0];
     private final ProtectionDomain protectionDomain;
-    
+
     private final ClassLoader ploader;
 
-    public PlugInClassLoader(final ClassLoader p) throws IOException {        
-        super(new FireWallClassLoader(p, 
+    public PlugInClassLoader(final ClassLoader p) throws IOException {
+        super(new FireWallClassLoader(p,
                                       getFilterList(p, FILTERS_PROPS_FILE),
                                       getFilterList(p, NEFILTERS_PROPS_FILE)));
         ploader = p;
@@ -61,7 +61,7 @@ public class PlugInClassLoader extends SecureClassLoader {
     private void processJarUrls(String urls[]) {
         for (int i = 0; i < urls.length; i++) {
             if (urls[i].startsWith(ZIP_COLON)) {
-                urls[i] = FILE_COLON + urls[i].substring(ZIP_COLON.length());                              
+                urls[i] = FILE_COLON + urls[i].substring(ZIP_COLON.length());
             }
         }
     }
@@ -69,9 +69,9 @@ public class PlugInClassLoader extends SecureClassLoader {
     private static String[] getFilterList(ClassLoader parent, String propFile) throws IOException {
         Properties filtersProps = getProperties(parent, propFile);
         Iterator<Object> i = filtersProps.keySet().iterator();
-        while (i.hasNext()) {            
-            LOG.config("get Filter " + propFile + "::" + (String)i.next());            
-        }    
+        while (i.hasNext()) {
+            LOG.config("get Filter " + propFile + "::" + (String)i.next());
+        }
         return filtersProps.keySet().toArray(new String[filtersProps.keySet().size()]);
     }
 
@@ -127,7 +127,7 @@ public class PlugInClassLoader extends SecureClassLoader {
         byte bytes[] = null;
 
         for (int i = 0; i < jarUrls.length; i++) {
-            String fullpath = jarUrls[i] + "!/" + path;           
+            String fullpath = jarUrls[i] + "!/" + path;
             try {
                 bytes = PlugInClassLoaderHelper.getResourceAsBytes(fullpath);
 
@@ -150,21 +150,21 @@ public class PlugInClassLoader extends SecureClassLoader {
                 throw new ClassNotFoundException(name);
             } else {
                 return result;
-            }                
+            }
         }
     }
-    
-   
+
+
     protected URL findResource(String name) {
         LOG.fine("findResource: " + name);
         for (int i = 0; i < jarUrls.length; i++) {
-            String fullpath = jarUrls[i] + "!/" + name;         
-              
-            if (PlugInClassLoaderHelper.hasResource(fullpath)) {                
+            String fullpath = jarUrls[i] + "!/" + name;
+
+            if (PlugInClassLoaderHelper.hasResource(fullpath)) {
                 return genURL(fullpath);
             }
         }
-        
+
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
index a88c5ea..c16716f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
@@ -29,10 +29,10 @@ import org.apache.cxf.jca.jarloader.JarLoader;
 
 
 public final class PlugInClassLoaderHelper {
-    private static final Logger LOG = 
+    private static final Logger LOG =
         LogUtils.getL7dLogger(PlugInClassLoaderHelper.class);
     private static Map<String, byte[]> nonClassesMap = new HashMap<String, byte[]>();
-   
+
 
     private PlugInClassLoaderHelper() {
         // singleton
@@ -47,11 +47,11 @@ public final class PlugInClassLoaderHelper {
             return false;
         }
     }
-   
+
     public static byte[] getResourceAsBytes(String name) throws IOException {
         // check nonClassCache for properties etc..
         if (!name.endsWith(".class") && nonClassesMap.containsKey(name)) {
-            return nonClassesMap.get(name);            
+            return nonClassesMap.get(name);
         }
 
         // first check file path directorys, then check jars
@@ -90,7 +90,7 @@ public final class PlugInClassLoaderHelper {
                     if (!name.endsWith(".class")) {
                         nonClassesMap.put(name, bytes);
                     }
-                    return bytes;                    
+                    return bytes;
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
index 0b3df67..8131a44 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
@@ -29,7 +29,7 @@ import org.apache.cxf.common.logging.LogUtils;
 
 
 public final class LoggerHelper {
-    public static final Level DEFAULT_LOG_LEVEL = Level.WARNING;    
+    public static final Level DEFAULT_LOG_LEVEL = Level.WARNING;
     public static final String CONSOLE_HANDLER = "ConsoleHandler";
     public static final String WRITER_HANDLER = "WriterHandler";
     private static String rootLoggerName = "org.apache.cxf";
@@ -60,11 +60,11 @@ public final class LoggerHelper {
 
         }
     }
-    
+
     public static void deleteLoggingOnWriter() {
         Logger cxfLogger = getRootCXFLogger();
         Handler handler = getHandler(cxfLogger, WRITER_HANDLER);
-        
+
         if (handler != null) {
             cxfLogger.removeHandler(handler);
         }
@@ -72,8 +72,8 @@ public final class LoggerHelper {
     }
 
     // true if log output is already going somewhere
-    public static boolean loggerInitialisedOutsideConnector() {       
-        final Handler[] handlers = getConsoleLogger().getHandlers(); //NOPMD        
+    public static boolean loggerInitialisedOutsideConnector() {
+        final Handler[] handlers = getConsoleLogger().getHandlers(); //NOPMD
         return handlers != null && handlers.length > 0;
     }
 
@@ -88,12 +88,12 @@ public final class LoggerHelper {
         return result;
     }
 
-    public static void disableConsoleLogging() {        
+    public static void disableConsoleLogging() {
         final Handler handler = getHandler(getConsoleLogger(), CONSOLE_HANDLER);  //NOPMD
         getConsoleLogger().removeHandler(handler);  //NOPMD
     }
 
-    public static void enableConsoleLogging() {        
+    public static void enableConsoleLogging() {
         if (getHandler(getConsoleLogger(), CONSOLE_HANDLER) == null) {  //NOPMD
             final Handler console = new ConsoleHandler();
             getConsoleLogger().addHandler(console);  //NOPMD
@@ -117,7 +117,7 @@ public final class LoggerHelper {
     public static Logger getRootCXFLogger() {
         return LogUtils.getLogger(LoggerHelper.class, null, getRootLoggerName());
     }
-    
+
     public static Logger getConsoleLogger() {
         return LogUtils.getLogger(LoggerHelper.class, null, "");
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
index be4bb16..0168b08 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
@@ -36,8 +36,8 @@ import javax.security.auth.Subject;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jca.core.logging.LoggerHelper;
 
- 
-public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean 
+
+public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
     implements ManagedConnectionFactory {
 
     private static final long serialVersionUID = 1886331424891906960L;
@@ -67,18 +67,18 @@ public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
     protected abstract void validateReference(AbstractManagedConnectionImpl conn, Subject subject)
         throws ResourceAdapterInternalException;
 
-    @SuppressWarnings("rawtypes") 
+    @SuppressWarnings("rawtypes")
     public ManagedConnection matchManagedConnections(
         Set aMCSet, Subject subject, ConnectionRequestInfo crInfo)
         throws ResourceException {
-        
+
         LOG.log(Level.FINE, "MATCHING_CONNECTIONS",
             new Object[] {Integer.valueOf(aMCSet.size()), crInfo, subject});
 
         for (Iterator iterator = aMCSet.iterator(); iterator.hasNext();) {
             AbstractManagedConnectionImpl conn = (AbstractManagedConnectionImpl)iterator.next();
 
-            LOG.log(Level.FINE, "MATCH_CONNECTION_AGAINST", 
+            LOG.log(Level.FINE, "MATCH_CONNECTION_AGAINST",
                        new Object[] {conn.getConnectionRequestInfo(),
                                      crInfo});
 
@@ -106,7 +106,7 @@ public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
         if (candidate.equals(crInfo) && (subject == null || subject.equals(candidateConn.getSubject()))) {
             try {
                 validateReference(candidateConn, subject);
-                result = true; 
+                result = true;
             } catch (Exception thrown) {
                 result = false;
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
index 848ffbc..845c073 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
@@ -39,19 +39,19 @@ public abstract class AbstractManagedConnectionImpl implements ManagedConnection
     protected PrintWriter printWriter;
     protected ConnectionRequestInfo crinfo;
     protected Subject subject;
-    protected Set<ConnectionEventListener> connectionEventListeners = 
+    protected Set<ConnectionEventListener> connectionEventListeners =
         new HashSet<>();
     private final AbstractManagedConnectionFactoryImpl managedConnectionFactory;
 
-    public AbstractManagedConnectionImpl(AbstractManagedConnectionFactoryImpl managedFactory, 
+    public AbstractManagedConnectionImpl(AbstractManagedConnectionFactoryImpl managedFactory,
         ConnectionRequestInfo crInfo,
         Subject sj) throws ResourceException {
-        
+
         this.managedConnectionFactory = managedFactory;
         this.crinfo = crInfo;
     }
 
-    
+
     public void addConnectionEventListener(ConnectionEventListener aListener) {
         LOG.log(Level.FINE, "ADD_EVENT_LISTENER_CALLED", new Object[] {this, aListener});
         connectionEventListeners.add(aListener);
@@ -89,7 +89,7 @@ public abstract class AbstractManagedConnectionImpl implements ManagedConnection
     public void destroy() throws ResourceException {
         LOG.log(Level.FINE, "DESTROY_CALLED", new Object[] {this});
         connectionEventListeners = new HashSet<>();
-        
+
         LoggerHelper.deleteLoggingOnWriter();
         if (printWriter != null) {
             printWriter.close();

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
index aeadbcb..15fc36a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
@@ -37,13 +37,13 @@ public class ResourceBean implements Serializable {
 
     public static final String DEFAULT_VALUE_STRING = "DEFAULT";
     public static final String LOG_LEVEL = "log.level";
-    
-    public static final String DEFAULT_MONITOR_POLL_INTERVAL = "120";    
+
+    public static final String DEFAULT_MONITOR_POLL_INTERVAL = "120";
     public static final String EJB_SERVICE_PROPERTIES_URL = "ejb.service.properties.url";
     public static final String MONITOR_EJB_SERVICE_PROPERTIES = "monitor.ejb.service.properties";
-    public static final String MONITOR_POLL_INTERVAL = "monitor.poll.interval"; 
+    public static final String MONITOR_POLL_INTERVAL = "monitor.poll.interval";
     public static final String EJB_SERVANT_BASE_URL = "ejb.servant.base.url";
-    
+
     private static final long serialVersionUID = -2373577203597864072L;
 
     static {
@@ -67,8 +67,8 @@ public class ResourceBean implements Serializable {
         if (disable) {
             LoggerHelper.disableConsoleLogging();
         }
-    }    
-   
+    }
+
     public Properties getPluginProps() {
         return pluginProps;
     }
@@ -83,7 +83,7 @@ public class ResourceBean implements Serializable {
         }
     }
 
-    
+
     protected URL getPropsURL(String propsUrl) throws ResourceException {
         URL ret = null;
         if (propsUrl != null) {
@@ -110,6 +110,6 @@ public class ResourceBean implements Serializable {
             throw new ResourceAdapterInternalException(msg, ioe);
         }
     }
-    
+
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
index 6a38260..068908f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
@@ -25,7 +25,7 @@ import org.apache.cxf.common.logging.LogUtils;
 public class UriHandlerInit {
     private static final String PACKAGE_PREFIX = "org.apache.cxf.jca.core";
     private static final Logger LOG = LogUtils.getL7dLogger(UriHandlerInit.class);
-  
+
 
     public UriHandlerInit() {
         initUriHandlers(PACKAGE_PREFIX);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
index 6714137..614a5ab 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
@@ -31,7 +31,7 @@ import javax.resource.spi.ResourceAdapterAssociation;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
 
-public class AssociatedManagedConnectionFactoryImpl 
+public class AssociatedManagedConnectionFactoryImpl
     extends ManagedConnectionFactoryImpl implements ResourceAdapterAssociation {
 
     private static final long serialVersionUID = 4305487562182780773L;
@@ -65,7 +65,7 @@ public class AssociatedManagedConnectionFactoryImpl
     public ResourceAdapter getResourceAdapter() {
         return ra;
     }
-    
+
     /**
      * If outbound-resourceAdapter and the resourceAdapter has same property,
      * the outbound-resourceAdapter property's value would take precedence.
@@ -88,20 +88,20 @@ public class AssociatedManagedConnectionFactoryImpl
         if (ra == null) {
             throw new ResourceAdapterInternalException("ResourceAdapter can not be null");
         }
-        
+
         ((ResourceAdapterImpl)ra).registerBus(getBus());
     }
 
     protected Object getBootstrapContext() {
         return ((ResourceAdapterImpl)ra).getBootstrapContext();
     }
-    
-    //Explicit override these two methods, 
+
+    //Explicit override these two methods,
     //otherwise when deploy rar to weblogic9.1, it would complaint about this.
     public int hashCode() {
         return super.hashCode();
     }
-    
+
     public boolean equals(Object o) {
         return super.equals(o);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
index f114612..9a4704f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
@@ -28,14 +28,14 @@ import org.apache.cxf.connector.CXFConnectionParam;
 
 
 public class CXFConnectionRequestInfo extends CXFConnectionParam implements ConnectionRequestInfo {
-   
+
     public CXFConnectionRequestInfo() {
         super();
     }
-    
-    public CXFConnectionRequestInfo(Class<?> aIface, URL aWsdlLocation, 
+
+    public CXFConnectionRequestInfo(Class<?> aIface, URL aWsdlLocation,
                                        QName aServiceName, QName aPortName) {
         super(aIface, aWsdlLocation, aServiceName, aPortName);
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
index 7b48bc1..b0d2805 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
@@ -23,8 +23,8 @@ import java.lang.reflect.InvocationHandler;
 public interface CXFInvocationHandler extends InvocationHandler {
 
     void setNext(CXFInvocationHandler next);
-    
-    CXFInvocationHandler getNext(); 
 
-    CXFInvocationHandlerData getData(); 
+    CXFInvocationHandler getNext();
+
+    CXFInvocationHandlerData getData();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
index c828a9a..952b613 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
@@ -24,16 +24,16 @@ import javax.security.auth.Subject;
 import org.apache.cxf.Bus;
 
 public interface CXFInvocationHandlerData  {
-  
-    void setTarget(Object t); 
-    Object getTarget(); 
-    
-    void setBus(Bus bus); 
-    Bus getBus(); 
-    
-    void setManagedConnection(CXFManagedConnection managedConnection); 
-    CXFManagedConnection getManagedConnection(); 
+
+    void setTarget(Object t);
+    Object getTarget();
+
+    void setBus(Bus bus);
+    Bus getBus();
+
+    void setManagedConnection(CXFManagedConnection managedConnection);
+    CXFManagedConnection getManagedConnection();
 
     void setSubject(Subject subject);
-    Subject getSubject(); 
+    Subject getSubject();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
index f652937..878ec52 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
@@ -23,7 +23,7 @@ import javax.resource.spi.ManagedConnection;
 
 public interface CXFManagedConnection extends ManagedConnection {
 
-    void close(Object handle) throws ResourceException; 
-    CXFManagedConnectionFactory getManagedConnectionFactory(); 
-    CXFTransaction getCXFTransaction(); 
+    void close(Object handle) throws ResourceException;
+    CXFManagedConnectionFactory getManagedConnectionFactory();
+    CXFTransaction getCXFTransaction();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
index f2df8b9..2e0df4a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
@@ -25,7 +25,7 @@ import javax.resource.spi.ManagedConnectionMetaData;
 
 public class CXFManagedConnectionMetaData implements ManagedConnectionMetaData {
 
-    
+
     public String getEISProductName() throws ResourceException {
         return "WS-based-EIS";
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
index 3bf431a..430a281 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
@@ -27,32 +27,32 @@ import javax.resource.spi.work.WorkListener;
 import org.apache.cxf.common.logging.LogUtils;
 
 /**
- * 
+ *
  */
 public class CXFWorkAdapter implements WorkListener {
-    
+
     public static final long DEFAULT_START_TIME_OUT = 1 * 60 * 1000; // 1 minute
 
     private static final Logger LOG = LogUtils.getL7dLogger(CXFWorkAdapter.class);
-    
+
     public void workAccepted(WorkEvent e) {
         LOG.fine("workAccepted: [" + e.getWork() + "], source is [" + e.getSource() + "]");
     }
 
-    
+
     public void workCompleted(WorkEvent e) {
         LOG.fine("workCompleted: [" + e.getWork() + "], source is [" + e.getSource() + "]");
     }
 
-    
+
     public void workRejected(WorkEvent e) {
         LOG.severe("workRejected: [" + e.getWork() + "], source is [" + e.getSource() + "]");
         LOG.severe("root cause is:" + e.getException().getMessage());
-        
+
         e.getException().printStackTrace();
     }
 
-    
+
     public void workStarted(WorkEvent e) {
         LOG.fine("workStarted: [" + e.getWork() + "], source is [" + e.getSource() + "]");
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
index 4cf62fb..902511a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
@@ -36,8 +36,8 @@ import org.apache.cxf.connector.CXFConnectionFactory;
 import org.apache.cxf.connector.CXFConnectionParam;
 import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
 
-public class ConnectionFactoryImpl implements CXFConnectionFactory, 
-                                              Referenceable, 
+public class ConnectionFactoryImpl implements CXFConnectionFactory,
+                                              Referenceable,
                                               Serializable {
     private static final long serialVersionUID = 3664687493256918163L;
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ConnectionFactoryImpl.class);
@@ -57,26 +57,26 @@ public class ConnectionFactoryImpl implements CXFConnectionFactory,
     public Reference getReference() throws NamingException {
         return reference;
     }
-    
-  
 
-    public Object getBus() { 
+
+
+    public Object getBus() {
         return ((ManagedConnectionFactoryImpl)managedConnectionFactory).getBus();
     }
 
     public Object getConnection(CXFConnectionParam param) throws ResourceException {
-        
+
         if (param.getInterface() == null) {
             throw new ResourceAdapterInternalException(new Message("INTERFACE_IS_NULL", BUNDLE).toString());
         }
-        
+
         if (!param.getInterface().isInterface()) {
-            throw new ResourceAdapterInternalException(new Message("IS_NOT_AN_INTERFACE", 
+            throw new ResourceAdapterInternalException(new Message("IS_NOT_AN_INTERFACE",
                                                                    BUNDLE, param.getInterface()).toString());
         }
-        
+
         CXFConnectionRequestInfo reqInfo = (CXFConnectionRequestInfo) param;
-        
+
         if (connectionManager == null) {
             // non-managed, null Subject
             ManagedConnection connection = managedConnectionFactory.createManagedConnection(null, reqInfo);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
index 9779acc..82a73b4 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
@@ -47,24 +47,24 @@ import org.apache.cxf.jca.servant.EJBServantConfig;
 
 
 public class JCABusFactory {
-    
+
     private static final Logger LOG = LogUtils.getL7dLogger(JCABusFactory.class);
-    
+
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JCABusFactory.class);
-    
+
     private Bus bus;
     private List<Server> servantsCache = new ArrayList<>();
     private ClassLoader appserverClassLoader;
     private ManagedConnectionFactoryImpl mcf;
     private Object raBootstrapContext;
-    
+
 
     public JCABusFactory(ManagedConnectionFactoryImpl aMcf) {
         this.mcf = aMcf;
     }
-    
+
     protected synchronized void init() throws ResourceException {
-        
+
         LOG.info("Initializing the CXF Bus ...");
         new UriHandlerInit();
         ClassLoader original = Thread.currentThread().getContextClassLoader();
@@ -73,10 +73,10 @@ public class JCABusFactory {
 
             // ensure resourceadapter: url handler can be found by URLFactory
             Thread.currentThread().setContextClassLoader(cl);
-            
+
             //TODO Check for the managed connection factory properties
-            //TODO We may need get the configuration file from properties 
-            
+            //TODO We may need get the configuration file from properties
+
             BusFactory bf = BusFactory.newInstance();
             bus = bf.createBus();
             initializeServants();
@@ -92,25 +92,25 @@ public class JCABusFactory {
         }
     }
 
-    
+
     protected void initializeServants() throws ResourceException {
-        if (isMonitorEJBServicePropertiesEnabled()) {            
+        if (isMonitorEJBServicePropertiesEnabled()) {
             LOG.info("Ejb service properties auto-detect enabled. ");
             startPropertiesMonitorWorker();
-        } else {            
+        } else {
             URL propsUrl = mcf.getEJBServicePropertiesURLInstance();
             if (propsUrl != null) {
                 initializeServantsFromProperties(loadProperties(propsUrl));
             }
         }
     }
-    
+
     private void initializeServantsFromProperties(Properties ejbServants) throws ResourceException {
-        
+
         deregisterServants(bus);
         LOG.info("Initializing EJB endpoints from properties file...");
-        
-        try {           
+
+        try {
             Enumeration<?> keys = ejbServants.keys();
             while (keys.hasMoreElements()) {
                 String theJNDIName = (String)keys.nextElement();
@@ -120,7 +120,7 @@ public class JCABusFactory {
                 ejbEndpoint.setEjbServantBaseURL(mcf.getEJBServantBaseURL());
                 ejbEndpoint.setWorkManager(getWorkManager());
                 Server servant = ejbEndpoint.publish();
-                
+
                 synchronized (servantsCache) {
                     if (servant != null) {
                         servantsCache.add(servant);
@@ -131,16 +131,16 @@ public class JCABusFactory {
             e.printStackTrace();
             throw new ResourceException(new Message("FAIL_TO_START_EJB_SERVANTS", BUNDLE).toString(), e);
         }
-        
+
     }
-    
+
 
     private void startPropertiesMonitorWorker() throws ResourceException {
         Integer pollIntervalInteger = mcf.getEJBServicePropertiesPollInterval();
         int pollInterval = pollIntervalInteger.intValue();
-        
+
         LOG.info("Ejb service properties poll interval is: [" + pollInterval + " seconds]");
-        
+
         EJBServicePropertiesMonitorWorker worker = new EJBServicePropertiesMonitorWorker(pollInterval);
         if (getWorkManager() != null) {
             getWorkManager().startWork(worker, CXFWorkAdapter.DEFAULT_START_TIME_OUT, null, worker);
@@ -180,7 +180,7 @@ public class JCABusFactory {
             servantsCache.clear();
         }
     }
-    
+
     protected Properties loadProperties(URL propsUrl) throws ResourceException {
         Properties props = null;
         InputStream istream = null;
@@ -206,7 +206,7 @@ public class JCABusFactory {
 
         return props;
     }
-    
+
 
     protected List<Server> getRegisteredServants() {
         return servantsCache;
@@ -231,18 +231,18 @@ public class JCABusFactory {
     public void setBus(Bus b) {
         bus = b;
     }
-   
+
     public void create(ClassLoader classLoader, Object context) throws ResourceException {
         this.appserverClassLoader = classLoader;
         this.raBootstrapContext = context;
         init();
     }
-    
+
     private class EJBServicePropertiesMonitorWorker extends CXFWorkAdapter implements Work {
         private long previousModificationTime;
         private final int pollIntervalSeconds;
         private final File propsFile;
-        
+
         //The release() method will be called on separate thread while the run() is processing.
         private volatile boolean continuing = true;
 
@@ -265,7 +265,7 @@ public class JCABusFactory {
                 }
             } while (continuing);
         }
-        
+
         public void release() {
             this.continuing = false;
         }
@@ -295,8 +295,8 @@ public class JCABusFactory {
         }
         return null;
     }
-    
-    
 
-    
+
+
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
index 2bcdc38..cfdcf23 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
@@ -38,14 +38,14 @@ import org.apache.cxf.jca.core.resourceadapter.AbstractManagedConnectionFactoryI
 import org.apache.cxf.jca.core.resourceadapter.AbstractManagedConnectionImpl;
 import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
 
-public class ManagedConnectionFactoryImpl 
+public class ManagedConnectionFactoryImpl
     extends AbstractManagedConnectionFactoryImpl
     implements CXFManagedConnectionFactory {
 
     private static final long serialVersionUID = -891927761318109853L;
     private static final Logger LOG = LogUtils.getL7dLogger(ManagedConnectionFactoryImpl.class);
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ManagedConnectionFactoryImpl.class);
-    
+
     protected JCABusFactory jcaBusFactory;
 
     public ManagedConnectionFactoryImpl() {
@@ -61,7 +61,7 @@ public class ManagedConnectionFactoryImpl
     public void setLogLevel(String logLevel) {
         setProperty(LOG_LEVEL, logLevel);
     }
-    
+
     public void setEJBServicePropertiesURL(String name) {
         setProperty(EJB_SERVICE_PROPERTIES_URL, name);
     }
@@ -73,11 +73,11 @@ public class ManagedConnectionFactoryImpl
     public void setEJBServicePropertiesPollInterval(Integer pollInterval) {
         setProperty(MONITOR_POLL_INTERVAL, pollInterval.toString());
     }
-   
+
     public String getLogLevel() {
         return getPluginProps().getProperty(LOG_LEVEL);
     }
-        
+
     public String getEJBServicePropertiesURL() {
         return getPluginProps().getProperty(EJB_SERVICE_PROPERTIES_URL);
     }
@@ -87,18 +87,18 @@ public class ManagedConnectionFactoryImpl
     }
 
     public Integer getEJBServicePropertiesPollInterval() {
-        return Integer.valueOf(getPluginProps().getProperty(MONITOR_POLL_INTERVAL, 
+        return Integer.valueOf(getPluginProps().getProperty(MONITOR_POLL_INTERVAL,
                                                         DEFAULT_MONITOR_POLL_INTERVAL));
     }
-   
+
     public URL getEJBServicePropertiesURLInstance() throws ResourceException {
         return getPropsURL(getEJBServicePropertiesURL());
     }
-    
+
     public String getEJBServantBaseURL() throws ResourceException {
         return getPluginProps().getProperty(EJB_SERVANT_BASE_URL);
     }
-    
+
     public void setEJBServantBaseURL(String url) throws ResourceException {
         setProperty(EJB_SERVANT_BASE_URL, url);
     }
@@ -106,7 +106,7 @@ public class ManagedConnectionFactoryImpl
     // compliance: WL9 checks
     // need to ensure multiple instances with same config properties are equal
     // multiple instances with same config do not make sense to me
-   
+
 
     protected void validateReference(AbstractManagedConnectionImpl conn, javax.security.auth.Subject subj) {
     }
@@ -127,7 +127,7 @@ public class ManagedConnectionFactoryImpl
         return new ConnectionFactoryImpl(this, connMgr);
     }
 
-    public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo) 
+    public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
         throws ResourceException {
         LOG.info("create connection, subject=" + subject + " connReqInfo=" + connReqInfo);
         init(Thread.currentThread().getContextClassLoader());

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
index 06427ee..89d4eaa 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
@@ -43,13 +43,13 @@ import org.apache.cxf.jca.core.resourceadapter.AbstractManagedConnectionImpl;
 import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
 import org.apache.cxf.jca.cxf.handlers.InvocationHandlerFactory;
 
-public class ManagedConnectionImpl 
-    extends AbstractManagedConnectionImpl 
+public class ManagedConnectionImpl
+    extends AbstractManagedConnectionImpl
     implements CXFManagedConnection, Connection {
 
-    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ConnectionFactoryImpl.class);   
+    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ConnectionFactoryImpl.class);
 
-    private InvocationHandlerFactory handlerFactory;    
+    private InvocationHandlerFactory handlerFactory;
     private Object cxfService;
     private boolean connectionHandleActive;
 
@@ -59,8 +59,8 @@ public class ManagedConnectionImpl
     }
 
     public void associateConnection(Object connection) throws ResourceException {
-        try {           
-            CXFInvocationHandler handler = 
+        try {
+            CXFInvocationHandler handler =
                     (CXFInvocationHandler)Proxy.getInvocationHandler(connection);
             Object managedConnection = handler.getData().getManagedConnection();
 
@@ -68,7 +68,7 @@ public class ManagedConnectionImpl
                 handler.getData().setManagedConnection(this);
                 ((ManagedConnectionImpl)managedConnection).disassociateConnectionHandle(connection);
 
-                if (getCXFService() == null) { 
+                if (getCXFService() == null) {
                     // Very unlikely as THIS
                     // managed connection is
                     // already involved in a transaction.
@@ -76,7 +76,7 @@ public class ManagedConnectionImpl
                     connectionHandleActive = true;
                 }
             }
-        } catch (Exception ex) {         
+        } catch (Exception ex) {
             throw new ResourceAdapterInternalException(
                               new Message("ASSOCIATED_ERROR", BUNDLE).toString(), ex);
         }
@@ -100,10 +100,10 @@ public class ManagedConnectionImpl
     public Object getConnection(Subject subject, ConnectionRequestInfo crInfo) throws ResourceException {
 
         Object connection = null;
-        
+
         if (getCXFService() == null) {
             initializeCXFConnection(crInfo, subject);
-            connection = getCXFService();            
+            connection = getCXFService();
         } else {
             if (!connectionHandleActive && this.crinfo.equals(crInfo)) {
                 connection = getCXFService();
@@ -141,14 +141,14 @@ public class ManagedConnectionImpl
             if (requestInfo.getAddress() != null) {
                 factoryBean.setAddress(requestInfo.getAddress());
             }
-            
+
             Object obj = factoryBean.create();
-            
+
             setSubject(subject);
-            
+
             return createConnectionProxy(obj, requestInfo, subject);
         } catch (WebServiceException wse) {
-            throw new ResourceAdapterInternalException(new Message("FAILED_TO_GET_CXF_CONNECTION", 
+            throw new ResourceAdapterInternalException(new Message("FAILED_TO_GET_CXF_CONNECTION",
                                                                    BUNDLE, requestInfo).toString(), wse);
         } finally {
             Thread.currentThread().setContextClassLoader(orig);
@@ -158,25 +158,25 @@ public class ManagedConnectionImpl
     public ManagedConnectionMetaData getMetaData() throws ResourceException {
         return new CXFManagedConnectionMetaData();
     }
-    
-    
+
+
     private boolean isJaxWsServiceInterface(Class<?> cls) {
         if (cls == null) {
             return false;
         }
         return null != cls.getAnnotation(WebService.class);
     }
-    
+
     public boolean isBound() {
         return getCXFService() != null;
     }
 
-    
+
     // Compliance: WL9 checks
     // implemention of Connection method - never used as real Connection impl is
     // a java.lang.Proxy
     public void close() throws ResourceException {
-        //TODO 
+        //TODO
     }
 
     void disassociateConnectionHandle(Object handle) {
@@ -191,10 +191,10 @@ public class ManagedConnectionImpl
 
         Class<?> classes[] = {Connection.class, BindingProvider.class, cri.getInterface()};
 
-        return Proxy.newProxyInstance(cri.getInterface().getClassLoader(), classes, 
+        return Proxy.newProxyInstance(cri.getInterface().getClassLoader(), classes,
                                       createInvocationHandler(obj, subject));
     }
-       
+
     private InvocationHandler createInvocationHandler(Object obj, Subject subject) throws ResourceException {
 
         return getHandlerFactory().createHandlers(obj, subject);
@@ -211,7 +211,7 @@ public class ManagedConnectionImpl
         return ((ManagedConnectionFactoryImpl)getManagedConnectionFactory()).getBus();
     }
 
-    
+
     public void close(Object closingHandle) throws ResourceException {
         if (closingHandle == cxfService) {
             connectionHandleActive = false;
@@ -225,9 +225,9 @@ public class ManagedConnectionImpl
         this.cxfService = null;
         super.destroy();
     }
-   
+
     public CXFTransaction getCXFTransaction() {
-        //TODO should throw the exception  
+        //TODO should throw the exception
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
index 32ba1ec..e41670d 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
@@ -51,7 +51,7 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
     private BootstrapContext ctx;
     private Set<Bus> busCache = new HashSet<>();
     private Map<String, InboundEndpoint> endpoints = new ConcurrentHashMap<String, InboundEndpoint>();
-    
+
     public ResourceAdapterImpl() {
         super();
     }
@@ -59,7 +59,7 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
     public ResourceAdapterImpl(Properties props) {
         super(props);
     }
-    
+
     public void registerBus(Bus bus) {
         LOG.fine("Bus " + bus + " initialized and added to ResourceAdapter busCache");
         busCache.add(bus);
@@ -71,8 +71,8 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
 
     protected void setBusCache(Set<Bus> cache) {
         this.busCache = cache;
-    } 
-   
+    }
+
     public void start(BootstrapContext aCtx) throws ResourceAdapterInternalException {
         LOG.fine("Resource Adapter is starting by appserver...");
         if (aCtx == null) {
@@ -87,14 +87,14 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
             for (Bus bus : busCache) {
                 bus.shutdown(true);
             }
-        }   
-        
+        }
+
         // shutdown all the inbound endpoints
         for (Map.Entry<String, InboundEndpoint> entry : endpoints.entrySet()) {
             try {
                 entry.getValue().shutdown();
             } catch (Exception e) {
-                LOG.log(Level.WARNING, "Failed to stop endpoint " + entry.getKey(), e); 
+                LOG.log(Level.WARNING, "Failed to stop endpoint " + entry.getKey(), e);
             }
         }
         endpoints.clear();
@@ -107,37 +107,37 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
 
     public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as)
         throws ResourceException {
-        
+
         if  (!(as instanceof MDBActivationSpec)) {
             LOG.fine("Ignored unknown activation spec " + as);
             return;
         }
-        
+
         MDBActivationSpec spec = (MDBActivationSpec)as;
         LOG.info("CXF resource adapter is activating " + spec.getDisplayName());
 
         Work work = new MDBActivationWork(spec, mef, endpoints);
-        ctx.getWorkManager().scheduleWork(work);        
+        ctx.getWorkManager().scheduleWork(work);
 
     }
 
     public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-        
+
         if  (!(as instanceof MDBActivationSpec)) {
             LOG.fine("Ignored unknown activation spec " + as);
             return;
         }
-        
+
         MDBActivationSpec spec = (MDBActivationSpec)as;
         LOG.info("CXF resource adapter is deactivating " + spec.getDisplayName());
-        
+
         InboundEndpoint endpoint = endpoints.remove(spec.getDisplayName());
         if (endpoint != null) {
             try {
                 endpoint.shutdown();
             } catch (Exception e) {
-                LOG.log(Level.WARNING, "Failed to stop endpoint " 
-                        + spec.getDisplayName(), e); 
+                LOG.log(Level.WARNING, "Failed to stop endpoint "
+                        + spec.getDisplayName(), e);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
index ded96d8..15b80a4 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
@@ -27,21 +27,21 @@ import javax.resource.spi.work.WorkManager;
 import org.eclipse.jetty.util.thread.ThreadPool;
 
 /**
- * The adapter for using Application Server's thread pool. 
+ * The adapter for using Application Server's thread pool.
  * Just simply override the dispatch method.
  */
 public class WorkManagerThreadPool extends CXFWorkAdapter implements ThreadPool {
-    
+
     private WorkManager workManager;
-    
+
     private boolean isLowOnThreads;
-    
+
     private Runnable theJob;
-    
+
     public WorkManagerThreadPool(WorkManager wm) {
         this.workManager = wm;
     }
-    
+
     public boolean dispatch(Runnable job) {
         try {
             theJob = job;
@@ -53,47 +53,47 @@ public class WorkManagerThreadPool extends CXFWorkAdapter implements ThreadPool
         }
     }
 
-    
+
     public int getIdleThreads() {
         return 0;
     }
 
-    
+
     public int getThreads() {
         return 1;
     }
 
-    
+
     public boolean isLowOnThreads() {
         return isLowOnThreads;
     }
-    
-    
+
+
     void setIsLowOnThreads(boolean isLow) {
         this.isLowOnThreads = isLow;
     }
-    
+
     public void join() throws InterruptedException {
         //Do nothing
     }
-    
+
     public class WorkImpl implements Work {
-        
+
         private Runnable job;
-        
+
         public WorkImpl(Runnable job) {
             this.job = job;
         }
-        
+
         public void run() {
             job.run();
         }
-        
+
         public void release() {
             //empty
         }
     }
-    
+
     @Override
     public void workRejected(WorkEvent e) {
         super.workRejected(e);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
index e451b22..0a3bf94 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
@@ -107,7 +107,7 @@ class CXFInvocationHandlerDataImpl implements CXFInvocationHandlerData {
     private CXFManagedConnection managedConnection;
     private Subject subject;
     private Object target;
-    
+
     public final void setSubject(Subject sub) {
         this.subject = sub;
     }
@@ -133,11 +133,11 @@ class CXFInvocationHandlerDataImpl implements CXFInvocationHandlerData {
     }
 
     public void setTarget(Object t) {
-        this.target = t; 
-        
+        this.target = t;
+
     }
 
-    public Object getTarget() {        
+    public Object getTarget() {
         return target;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
index dfdce6f..82316f2 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
@@ -39,9 +39,9 @@ import org.apache.cxf.jca.cxf.CXFManagedConnection;
 
 
 public class InvocationHandlerFactory {
-    
+
     public static final String JCA_HANDLERS_RESOURCE = "META-INF/cxf-jca-handlers.properties";
-    
+
     private static final Logger LOG = LogUtils.getL7dLogger(InvocationHandlerFactory.class);
 
     final Class<?>[] handlerChainTypes;
@@ -112,9 +112,9 @@ public class InvocationHandlerFactory {
                                                        getResources(JCA_HANDLERS_RESOURCE);
         while (urls.hasMoreElements()) {
             URL url = urls.nextElement();
-            loadProperties(handlersMap, url);            
+            loadProperties(handlersMap, url);
         }
-        
+
         Class<?>[] handlers = new Class[handlersMap.size()];
         String[] handlerClasses = new String[handlersMap.size()];
         handlersMap.values().toArray(handlerClasses);
@@ -124,11 +124,11 @@ public class InvocationHandlerFactory {
         }
         return handlers;
     }
-    
-    
+
+
     private void loadProperties(Map<Long, String> handlersMap, URL url) throws IOException {
         Properties p = new Properties();
-        p.load(url.openStream());       
+        p.load(url.openStream());
         Iterator<Object> keys = p.keySet().iterator();
         while (keys.hasNext()) {
             String key = (String)keys.next();

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
index 7eb7567..e2b9811 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
@@ -28,7 +28,7 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
 
 /**
- * delegates invocations to the target object 
+ * delegates invocations to the target object
  */
 public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
 
@@ -38,8 +38,8 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
         super(data);
     }
 
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { 
-        
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+
         Object ret = null;
         if (!isConnectionCloseMethod(method)) {
             ret = invokeTargetMethod(proxy, method, args);
@@ -48,7 +48,7 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
         }
 
         return ret;
-    } 
+    }
 
 
     private boolean isConnectionCloseMethod(Method m) {
@@ -59,7 +59,7 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
         LOG.fine("calling close on managed connection with handle");
         getData().getManagedConnection().close(handle);
     }
-    
+
     private Object invokeTargetMethod(Object proxy, Method method, Object args[]) throws Throwable {
 
         Object ret = null;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
index 6b1237c..39a3fd6 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
@@ -36,23 +36,23 @@ import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
 public class ProxyInvocationHandler extends CXFInvocationHandlerBase  {
 
     private static final Logger LOG = LogUtils.getL7dLogger(ProxyInvocationHandler.class);
-    
+
     public ProxyInvocationHandler(CXFInvocationHandlerData data) {
         super(data);
-        LOG.fine("ProxyInvocationHandler instance created"); 
+        LOG.fine("ProxyInvocationHandler instance created");
     }
 
 
     public final Object invoke(final Object proxy,
                                final Method method,
                                final Object args[]) throws Throwable {
-       
+
         LOG.fine(this + " on " + method);
         Object o = getData().getManagedConnection().getManagedConnectionFactory();
         ManagedConnectionFactoryImpl mcf = (ManagedConnectionFactoryImpl)o;
         //NOTE reset the inited bus to current ,so CXF-rt can play with JCA setup bus
-        Bus bus = mcf.getBus();        
-        BusFactory.setDefaultBus(bus);        
+        Bus bus = mcf.getBus();
+        BusFactory.setDefaultBus(bus);
         return invokeNext(proxy, method, args);
     }
 }


Mime
View raw message