Changeset 590


Ignore:
Timestamp:
03/25/11 18:57:37 (2 years ago)
Author:
philsmart
Message:
 
Location:
raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/dao/UADataConnection.java

    r361 r590  
    2222import java.util.List; 
    2323 
    24 import uk.ac.cardiff.model.Entry; 
     24import uk.ac.cardiff.model.Event; 
    2525 
    2626/** 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/dao/UADataConnectionImpl.java

    r411 r590  
    3232import org.springframework.orm.hibernate3.HibernateTemplate; 
    3333 
    34 import uk.ac.cardiff.model.Entry; 
     34import uk.ac.cardiff.model.Event; 
    3535 
    3636/** 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/engine/EntryReleaseEngine.java

    r411 r590  
    3030import uk.ac.cardiff.RaptorUA.model.EntryHandler; 
    3131import uk.ac.cardiff.RaptorUA.model.MUAEntry; 
    32 import uk.ac.cardiff.model.Entry; 
     32import uk.ac.cardiff.model.Event; 
    3333import uk.ac.cardiff.model.ICAMetadata; 
    3434import uk.ac.cardiff.model.UAMetadata; 
    … …  
    4747     */ 
    4848    public boolean release(EntryHandler entryHandler, MUARegistry muaRegistry, UAMetadata uaMetaData) { 
    49         Set<Entry> allEntries = entryHandler.getEntries(); 
     49        Set<Event> allEntries = entryHandler.getEntries(); 
    5050        log.debug("Releasing {} entries to approved MUAs",entryHandler.getEntries().size()); 
    5151        boolean releasedtoAll = true; 
    … …  
    7474    } 
    7575 
    76     private UAEntryPush constructEntryPush(UAMetadata uaMetaData, Set<Entry> entries){ 
     76    private UAEntryPush constructEntryPush(UAMetadata uaMetaData, Set<Event> entries){ 
    7777        UAEntryPush pushMessage = new UAEntryPush(); 
    7878        pushMessage.setUaMetaData(uaMetaData); 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/engine/UnitAggregatorEngine.java

    r444 r590  
    3131import uk.ac.cardiff.RaptorUA.model.ICAEntry; 
    3232import uk.ac.cardiff.RaptorUA.model.MemoryEntryHandler; 
    33 import uk.ac.cardiff.model.Entry; 
     33import uk.ac.cardiff.model.Event; 
    3434import uk.ac.cardiff.model.ICAMetadata; 
    3535import uk.ac.cardiff.model.ShibbolethEntry; 
    … …  
    102102        log.info("Outputting All Entries to StdOut"); 
    103103        int count = 0; 
    104         for (Entry entryObject : entryHandler.getEntries()) { 
     104        for (Event entryObject : entryHandler.getEntries()) { 
    105105            if (entryObject instanceof ShibbolethEntry) 
    106106                log.info(count + ". Stored Entry -- " + ((ShibbolethEntry) entryObject)); 
    … …  
    114114     */ 
    115115    public Set getAllAuthentications() { 
    116         LinkedHashSet<Entry> returnedAuths = new LinkedHashSet(); 
    117         for (Entry entry : entryHandler.getEntries()) 
     116        LinkedHashSet<Event> returnedAuths = new LinkedHashSet(); 
     117        for (Event entry : entryHandler.getEntries()) 
    118118            returnedAuths.add(entry); 
    119119 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/engine/sei/ServiceEndpointInterface.java

    r464 r590  
    3232import uk.ac.cardiff.RaptorUA.engine.UnitAggregatorEngine; 
    3333import uk.ac.cardiff.model.AuthenticationEntry; 
    34 import uk.ac.cardiff.model.Entry; 
     34import uk.ac.cardiff.model.Event; 
    3535import uk.ac.cardiff.model.ShibbolethEntry; 
    3636import uk.ac.cardiff.model.UsageEntry; 
    … …  
    6969        Collector client = (Collector) factory.create(); 
    7070        log.debug("Accessing the ICA version "+client.getVersion()); 
    71         Set<Entry> auths = client.getAllAuthentications(); 
     71        Set<Event> auths = client.getAllAuthentications(); 
    7272        log.debug("Retrieved "+auths.size()+" authentications from the ICA ["+endpoint+"]"); 
    7373//      for (Entry ent : auths){// 
    … …  
    138138        Collector client = (Collector) factory.create(); 
    139139        log.debug("Accessing the ICA version "+client.getVersion()); 
    140         Set<Entry> auths = client.getAllUsages(); 
     140        Set<Event> auths = client.getAllUsages(); 
    141141        log.debug("Retrieved "+auths.size()+" usages"); 
    142142//      for (Entry ent : auths){// 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/model/EntryHandler.java

    r444 r590  
    2626import java.util.Set; 
    2727 
    28 import uk.ac.cardiff.model.Entry; 
     28import uk.ac.cardiff.model.Event; 
    2929 
    3030import org.apache.log4j.Logger; 
    … …  
    3636 
    3737 
    38         public void addEntries(Set<Entry> entries); 
     38        public void addEntries(Set<Event> entries); 
    3939 
    40         public Set<Entry> getEntries(); 
     40        public Set<Event> getEntries(); 
    4141 
    42         public void setEntries(Set<Entry> entries); 
     42        public void setEntries(Set<Event> entries); 
    4343 
    4444        public void removeAllEntries(); 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/model/MemoryEntryHandler.java

    r464 r590  
    2727import org.slf4j.LoggerFactory; 
    2828 
    29 import uk.ac.cardiff.model.Entry; 
     29import uk.ac.cardiff.model.Event; 
    3030import uk.ac.cardiff.model.ShibbolethEntry; 
    3131 
    … …  
    3838 
    3939    /* set of all entries stored by this EntryHanlder */ 
    40     Set<Entry> entries; 
     40    Set<Event> entries; 
    4141 
    4242    public MemoryEntryHandler() { 
    43         entries = new LinkedHashSet<Entry>(); 
     43        entries = new LinkedHashSet<Event>(); 
    4444    } 
    4545 
    46     public void addEntries(Set<Entry> entries) { 
     46    public void addEntries(Set<Event> entries) { 
    4747        log.info("Adding " + entries.size() + " entries to the UA"); 
    48         for (Entry entry : entries) { 
     48        for (Event entry : entries) { 
    4949            this.entries.add(entry); 
    5050        } 
    … …  
    6060    } 
    6161 
    62     public void setEntries(Set<Entry> entries) { 
     62    public void setEntries(Set<Event> entries) { 
    6363        this.entries = entries; 
    6464    } 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/model/PersistantEntryHandler.java

    r464 r590  
    3030 
    3131import uk.ac.cardiff.RaptorUA.dao.UADataConnection; 
    32 import uk.ac.cardiff.model.Entry; 
     32import uk.ac.cardiff.model.Event; 
    3333import uk.ac.cardiff.model.ShibbolethEntry; 
    3434 
    … …  
    4646 
    4747    /* set of all entries stored by this EntryHandler */ 
    48     Set<Entry> entries; 
     48    Set<Event> entries; 
    4949 
    5050    public PersistantEntryHandler(UADataConnection dataConnection) { 
    … …  
    6161        Integer rowCount = (Integer) dataConnection.runQueryUnique("select count(*) from Entry", null); 
    6262        log.info("Persistent data store has {} entries", rowCount); 
    63         List<Entry> entriesAsList = dataConnection.runQuery("from Entry", null); 
     63        List<Event> entriesAsList = dataConnection.runQuery("from Entry", null); 
    6464        log.info("UA has loaded " + entriesAsList.size() + " entries from DB backed cache"); 
    65         entries = new LinkedHashSet<Entry>(entriesAsList); 
     65        entries = new LinkedHashSet<Event>(entriesAsList); 
    6666        log.info("Persistant entry handler [{}] started", this); 
    6767    } 
    … …  
    7373     */ 
    7474    @Override 
    75     public void addEntries(Set<Entry> entries) { 
     75    public void addEntries(Set<Event> entries) { 
    7676        log.debug("Current: " + this.getEntries().size() + " in: " + entries.size()); 
    77         for (Entry entry : entries) { 
     77        for (Event entry : entries) { 
    7878            this.getEntries().add(entry); 
    7979        } 
    … …  
    8282    } 
    8383 
    84     public void addEntry(Entry entry) { 
     84    public void addEntry(Event entry) { 
    8585        entries.add(entry); 
    8686 
    … …  
    137137     */ 
    138138    @Override 
    139     public void setEntries(Set<Entry> entries) { 
     139    public void setEntries(Set<Event> entries) { 
    140140        // TODO Auto-generated method stub 
    141141 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/service/impl/UAProcessImpl.java

    r411 r590  
    3131import uk.ac.cardiff.RaptorUA.engine.UnitAggregatorEngine; 
    3232import uk.ac.cardiff.RaptorUA.service.UAProcess; 
    33 import uk.ac.cardiff.model.Entry; 
     33import uk.ac.cardiff.model.Event; 
    3434import uk.ac.cardiff.model.wsmodel.ICAEntryPush; 
    3535 
    … …  
    9898     */ 
    9999    public Set getAllAuthentications() { 
    100         Set authentications = new LinkedHashSet<Entry>(); 
     100        Set authentications = new LinkedHashSet<Event>(); 
    101101        try { 
    102102            if (lockR.tryLock(getTimeout, TimeUnit.MILLISECONDS)) { 

  • raptor-ua/trunk/src/main/java/uk/ac/cardiff/RaptorUA/wsinterface/impl/UnitAggregatorImpl.java

    r464 r590  
    2828 
    2929import uk.ac.cardiff.RaptorUA.service.impl.UAProcessImpl; 
    30 import uk.ac.cardiff.model.Entry; 
     30import uk.ac.cardiff.model.Event; 
    3131import uk.ac.cardiff.model.ShibbolethEntry; 
    3232import uk.ac.cardiff.model.wsmodel.ICAEntryPush; 
Note: See TracChangeset for help on using the changeset viewer.