Changeset 1486


Ignore:
Timestamp:
04/15/13 11:58:40 (7 years ago)
Author:
philsmart
Message:
 
Location:
raptor-client/trunk
Files:
5 edited

Legend:

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

    r1478 r1486  
    6363            <groupId>uk.ac.cardiff.raptor</groupId> 
    6464            <artifactId>raptor-information-model</artifactId> 
    65             <version>1.1.2</version> 
     65            <version>1.1.3-SNAPSHOT</version> 
    6666            <exclusions> 
    6767                <exclusion> 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/AttributeAssociationEngine.java

    r1181 r1486  
    5151     */ 
    5252    public void associateAttributes(final List<Event> events) throws AttributeAssociationException { 
     53 
    5354        for (BaseAttributeAssociationDefinition attributeAssociationDefinition : attributeAssociationDefinitions) { 
    5455            log.info("Attribute Association Definition [{}], is enabled [{}]", 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/CxfServiceEndpointClient.java

    r1445 r1486  
    2020import java.util.List; 
    2121import java.util.Set; 
     22 
     23import javax.annotation.PostConstruct; 
    2224 
    2325import org.apache.cxf.aegis.DatabindingException; 
     
    5456    private List<Class<? extends Event>> allowedClassTypes; 
    5557 
     58    @PostConstruct 
     59    public void initialise() { 
     60        log.warn("The allowed class types is null. This *may* prevent this instance from releasing events. Possibly set this in the event-release config file."); 
     61    } 
     62 
    5663    @Override 
    5764    public boolean sendEvents(EventPushMessage pushed, Endpoint endpoint) { 
     
    6168            AegisDatabinding databinding = new AegisDatabinding(); 
    6269 
    63             org.apache.cxf.aegis.AegisContext context = 
    64                     new org.apache.cxf.aegis.AegisContext(); 
     70            org.apache.cxf.aegis.AegisContext context = new org.apache.cxf.aegis.AegisContext(); 
    6571            context.setWriteXsiTypes(true); 
    6672 
     
    7884                    c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class); 
    7985                } catch (ClassNotFoundException e) { 
    80                     throw new DatabindingException("Could not find override type class: " 
    81                             + typeName, e); 
     86                    throw new DatabindingException("Could not find override type class: " + typeName, e); 
    8287                } 
    8388                rootClasses.add(c); 
     
    97102 
    98103            if (getTlsParameters() != null) 
    99                 httpConduit.setTlsClientParameters(getTlsParameters() 
    100                         .getTlsClientParameters()); 
     104                httpConduit.setTlsClientParameters(getTlsParameters().getTlsClientParameters()); 
    101105 
    102106            log.debug("Accessing the endpoint version " + client.getVersion()); 
     
    106110            return true; 
    107111        } catch (SoapFault e) { 
    108             log.error("Could not send events to endpoint [{}]", 
    109                     endpoint.getServiceEndpoint(), e); 
     112            log.error("Could not send events to endpoint [{}]", endpoint.getServiceEndpoint(), e); 
    110113            return false; 
    111114        } catch (Exception e) { 
    112             log.error("Could not send events to endpoint [{}]", 
    113                     endpoint.getServiceEndpoint(), e); 
     115            log.error("Could not send events to endpoint [{}]", endpoint.getServiceEndpoint(), e); 
    114116            return false; 
    115117        } 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/server/sei/MultiUnitAggregator.java

    r1173 r1486  
    2727import uk.ac.cardiff.model.resource.ResourceMetadata; 
    2828import uk.ac.cardiff.model.wsmodel.Capabilities; 
     29import uk.ac.cardiff.model.wsmodel.DynamicStatisticalUnitInformation; 
    2930import uk.ac.cardiff.model.wsmodel.EventPushMessage; 
    3031import uk.ac.cardiff.model.wsmodel.LogFileUpload; 
    3132import uk.ac.cardiff.model.wsmodel.LogFileUploadResult; 
     33import uk.ac.cardiff.model.wsmodel.StatisticFunctionType; 
    3234import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation; 
    3335 
     
    123125    public void saveResourceMetadata(List<ResourceMetadata> resourceMetadata); 
    124126 
     127    /** 
     128     * Allows the dynamic (runtime) instantiation, configuration and invocation of a statistical function. 
     129     *  
     130     * @param dynamicStatisticalInformation 
     131     * @return 
     132     */ 
     133    public AggregatorGraphModel invokeStatisticalUnitDynamically( 
     134            DynamicStatisticalUnitInformation dynamicStatisticalInformation); 
     135 
     136    /** 
     137     * Returns the statistical information for the <code>statisticType</code> input. Does this by dynamically 
     138     * constructing the BaseStatistic and sending its parameters back. 
     139     *  
     140     * @param statisticType 
     141     * @return 
     142     */ 
     143    public StatisticalUnitInformation getStatisticalUnitInformation(StatisticFunctionType statisticType); 
     144 
    125145} 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/runtimeutils/ReflectionHelper.java

    r1424 r1486  
    534534            return result; 
    535535        } catch (Throwable e) { 
    536             log.error("Field name '" + fieldname + "' does not match internal model attribute [{}]", e.getMessage()); 
     536            log.error("Field name '" + fieldname + "' does not match internal model attribute [{}]", e.getMessage(), e); 
    537537 
    538538        } 
Note: See TracChangeset for help on using the changeset viewer.