Changeset 607 for raptor-client


Ignore:
Timestamp:
03/28/11 18:46:13 (9 years ago)
Author:
philsmart
Message:
 
Location:
raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/CxfServiceEndpointInterface.java

    r605 r607  
    88import org.apache.cxf.aegis.databinding.AegisDatabinding; 
    99import org.apache.cxf.aegis.type.TypeUtil; 
     10import org.apache.cxf.binding.soap.SoapFault; 
    1011import org.apache.cxf.common.classloader.ClassLoaderUtils; 
    1112import org.apache.cxf.frontend.ClientProxyFactoryBean; 
     
    1314import org.slf4j.LoggerFactory; 
    1415 
    15 import uk.ac.cardiff.model.AuthenticationEntry; 
    16 import uk.ac.cardiff.model.ShibbolethEntry; 
     16import uk.ac.cardiff.model.AuthenticationEvent; 
     17import uk.ac.cardiff.model.ShibbolethIdpAuthenticationEvent; 
    1718import uk.ac.cardiff.model.UsageEntry; 
     19import uk.ac.cardiff.model.wsmodel.Capabilities; 
    1820import uk.ac.cardiff.model.wsmodel.EventPushMessage; 
    1921import uk.ac.cardiff.raptor.remoting.client.sei.ServiceEndpointInterface; 
     
    3840 
    3941                        Set<String> overrides = new HashSet<String>(); 
    40                         overrides.add(ShibbolethEntry.class.getName()); 
    41                         overrides.add(AuthenticationEntry.class.getName()); 
     42                        overrides.add(ShibbolethIdpAuthenticationEvent.class.getName()); 
     43                        overrides.add(AuthenticationEvent.class.getName()); 
    4244                        overrides.add(UsageEntry.class.getName()); 
    4345                        databinding.setOverrideTypes(overrides); 
     
    6264                        MultiUnitAggregator client = (MultiUnitAggregator) factory.create(); 
    6365                        log.debug("Accessing the endpoint version " + client.getVersion()); 
    64                         Set<ShibbolethEntry> newEntries = new LinkedHashSet<ShibbolethEntry>(); 
     66                        Set<ShibbolethIdpAuthenticationEvent> newEntries = new LinkedHashSet<ShibbolethIdpAuthenticationEvent>(); 
    6567                        client.addAuthentications(pushed); 
    6668                        log.debug("Sent {} events", pushed.getEvents().size()); 
    6769                        return true; 
    68                 } catch (Exception e) { 
    69                         log.error("Could not send to endpoint [{}] ", endpointURL, e); 
    70                         return false; 
     70                } catch (SoapFault e) { 
     71                    log.error("Could not send events to endpoint [{}] -> {}", new Object[]{endpointURL, e.getMessage()}); 
     72                    return false; 
     73                }catch (Exception e) { 
     74                    log.error("Could not send events to endpoint [{}] -> {}", new Object[]{endpointURL, e.getMessage()}); 
     75                    return false; 
    7176                } 
    7277 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/DefaultServiceEndpointInterfaceImpl.java

    r605 r607  
    44import uk.ac.cardiff.raptor.remoting.client.sei.ServiceEndpointInterface; 
    55 
    6 public class GenericServiceEndpointInterfaceImpl implements ServiceEndpointInterface { 
     6public class DefaultServiceEndpointInterfaceImpl implements ServiceEndpointInterface { 
    77 
    88        @Override 
Note: See TracChangeset for help on using the changeset viewer.