Changeset 730


Ignore:
Timestamp:
05/02/11 23:01:41 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-client/trunk
Files:
6 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • raptor-client/trunk/pom.xml

    r692 r730  
    3333 
    3434        <!--  Shibboleth V3 dependencies --> 
    35         <dependency> 
     35<!--         <dependency> 
    3636            <groupId>net.shibboleth.idp</groupId> 
    3737            <artifactId>idp-attribute-resolver-api</artifactId> 
     
    4444            <version>3.0-SNAPSHOT</version> 
    4545        </dependency> 
    46  
     46 --> 
     47  
     48        <dependency> 
     49            <groupId>org.opensaml</groupId> 
     50            <artifactId>opensaml</artifactId> 
     51            <version>2.4.0</version> 
     52            <exclusions> 
     53                <exclusion> 
     54                    <artifactId>log4j-over-slf4j</artifactId> 
     55                    <groupId>org.slf4j</groupId> 
     56                </exclusion> 
     57                <exclusion> 
     58                    <artifactId>slf4j-api</artifactId> 
     59                    <groupId>org.slf4j</groupId> 
     60                </exclusion> 
     61                <exclusion> 
     62                    <artifactId>jcl-over-slf4j</artifactId> 
     63                    <groupId>org.slf4j</groupId> 
     64                </exclusion> 
     65            </exclusions> 
     66        </dependency> 
    4767 
    4868        <!-- DONE --> 
     
    146166                </exclusion> 
    147167            </exclusions> 
     168        </dependency> 
     169         
     170        <!--  LDAP Data Connector Libraries --> 
     171         <dependency> 
     172            <groupId>edu.vt.middleware</groupId> 
     173            <artifactId>ldap</artifactId> 
     174            <version>2.8.2</version> 
    148175        </dependency> 
    149176 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/AttributeAssociationDefinition.java

    r713 r730  
    124124                 return true; 
    125125            } catch (AttributeAssociationException e) { 
    126                 log.error("Association error for principal [{}]",principal,e); 
     126                log.error("Association error for principal [{}], {}",principal,e.getMessage()); 
    127127            } catch (InstantiationException e) { 
    128128                log.warn("Could not populate event [{}], {}",event,e.getMessage()); 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/LdapDataConnector.java

    r713 r730  
    3737import javax.net.ssl.TrustManagerFactory; 
    3838 
    39 import net.shibboleth.idp.attribute.Attribute; 
    40 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext; 
    41 import net.shibboleth.idp.attribute.resolver.AttributeResolutionException; 
    42 import net.shibboleth.idp.attribute.resolver.BaseDataConnector; 
    43  
    44 import org.joda.time.DateTime; 
     39 
    4540import org.opensaml.xml.security.x509.X509Credential; 
    4641import org.opensaml.xml.util.DatatypeHelper; 
    4742import org.slf4j.Logger; 
    4843import org.slf4j.LoggerFactory; 
    49 import org.springframework.context.ApplicationEvent; 
    50 import org.springframework.context.ApplicationListener; 
    51  
    52 import uk.ac.cardiff.raptor.event.expansion.AttributeLookup; 
     44 
    5345 
    5446import edu.vt.middleware.ldap.Ldap; 
     
    748740            return ldap.search(searchFilter, returnAttributes); 
    749741        } catch (NamingException e) { 
    750             log.error("An error occured when attempting to search the LDAP: " + ldapConfig.getEnvironment(), e); 
    751             throw new AttributeAssociationException("An error occurred when attempting to search the LDAP"); 
     742            //log.error("An error occured when attempting to search the LDAP: {}, {}",ldapConfig.getEnvironment(), e.getMessage()); 
     743            throw new AttributeAssociationException("An error occurred when attempting to search the LDAP "+e.getMessage()); 
    752744        } catch (Exception e) { 
    753             log.error("Could not retrieve Ldap object from pool", e); 
     745            log.error("Could not retrieve Ldap object from pool, {}", e.getMessage()); 
    754746            throw new AttributeAssociationException( 
    755747                    "An error occurred when attempting to retrieve a LDAP connection from the pool"); 
     
    759751                    ldapPool.returnObject(ldap); 
    760752                } catch (Exception e) { 
    761                     log.error("Could not return Ldap object back to pool", e); 
     753                    log.error("Could not return Ldap object back to pool {}", e.getMessage()); 
    762754                } 
    763755            } 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/server/sei/MultiUnitAggregator.java

    r627 r730  
    1919package uk.ac.cardiff.raptor.remoting.server.sei; 
    2020 
     21import java.util.ArrayList; 
     22import java.util.List; 
     23 
    2124import javax.jws.WebService; 
    2225 
     
    2730import uk.ac.cardiff.model.wsmodel.Capabilities; 
    2831import uk.ac.cardiff.model.wsmodel.EventPushMessage; 
     32import uk.ac.cardiff.model.wsmodel.LogFileUpload; 
    2933import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation; 
    3034 
     
    6165        public void addAuthentications(EventPushMessage pushed) throws SoapFault; 
    6266 
     67        /** Send a batch of log files to the MUA to store */ 
     68        public boolean batchUpload(List<LogFileUpload> uploadFiles); 
     69 
    6370} 
Note: See TracChangeset for help on using the changeset viewer.