Changeset 702


Ignore:
Timestamp:
04/26/11 18:47:13 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-mua/trunk/src/main
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • raptor-mua/trunk/src/main/config/mua-core.xml

    r697 r702  
    9292                <property name="storageEngine"><ref bean="storageEngine"></ref></property> 
    9393                <property name="muaMetadata"><ref bean="MUAMetadata"></ref></property> 
    94                 <property name="attributeAssociationEngine"><ref bean="attributeAssociationEngine"></ref></property> 
    9594        </bean> 
    9695 
    97         <!--  the attribute association engine --> 
    98         <bean id="attributeAssociationEngine" class="uk.ac.cardiff.raptor.event.expansion.AttributeAssociationEngine"> 
    9996 
    100         </bean> 
    10197 
    10298        <!--  the event release client, for sending events to other MUA's --> 
     
    127123        <bean name="storageEngine" class="uk.ac.cardiff.raptor.store.StorageEngine"> 
    128124        <property name="entryHandler"><ref bean="persistantEntryHandler"/></property> 
     125        <property name="attributeAssociationEngine"><ref bean="attributeAssociationEngine"></ref></property> 
    129126        </bean> 
    130127 
     
    139136          <import resource="event-release.xml"/> 
    140137          <import resource="users.xml" /> 
     138          <import resource="attribute-association.xml"/> 
    141139 
    142140</beans> 
  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/MUAEngine.java

    r675 r702  
    6161        private EventReleaseClient eventReleaseClient; 
    6262 
    63         /** Engine used to associate attributes to existing events in the MUA */ 
    64         private AttributeAssociationEngine attributeAssociationEngine; 
    65  
    6663        //TODO implement user level control on the MUA? 
    6764        private Users users; 
     
    172169                int transactionId = (int)(Math.random()*1000000); 
    173170                log.info("Committing {} entries to the storage engine, with transaction id [{}]", pushed.getEvents().size(),transactionId); 
    174                 storageEngine.addEntriesAsynchronous(transactionId,pushed.getEvents()); 
     171                storageEngine.performAsynchronousEntryStoragePipeline(transactionId,pushed.getEvents()); 
    175172 
    176173        } 
     
    191188            return eventReleaseClient; 
    192189        } 
    193  
    194     /** 
    195      * @param attributeAssociationEngine the attributeAssociationEngine to set 
    196      */ 
    197     public void setAttributeAssociationEngine(AttributeAssociationEngine attributeAssociationEngine) { 
    198         this.attributeAssociationEngine = attributeAssociationEngine; 
    199     } 
    200  
    201     /** 
    202      * @return the attributeAssociationEngine 
    203      */ 
    204     public AttributeAssociationEngine getAttributeAssociationEngine() { 
    205         return attributeAssociationEngine; 
    206     } 
    207190 
    208191    /** 
Note: See TracChangeset for help on using the changeset viewer.