Changeset 817 for raptor-client


Ignore:
Timestamp:
05/16/11 18:22:50 (9 years ago)
Author:
philsmart
Message:
 
Location:
raptor-client/trunk
Files:
24 edited

Legend:

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

    r808 r817  
    6868        <!-- DONE --> 
    6969 
    70  
    71         <!-- Deep clone library --> 
    72                 <dependency> 
    73                         <groupId>clonable</groupId> 
    74                         <artifactId>cloning</artifactId> 
    75                         <version>1.7</version> 
    76                 </dependency> 
    7770 
    7871        <dependency> 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/attribute/filtering/AttributeFilterException.java

    r790 r817  
    2525public class AttributeFilterException extends Exception { 
    2626 
     27 
     28    /** Generated SeruialUID */ 
     29    private static final long serialVersionUID = -2194640593279397599L; 
    2730 
    2831    /** Constructor. */ 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/attribute/filtering/AttrributeFilterEngine.java

    r802 r817  
    2020 
    2121import java.util.ArrayList; 
    22 import java.util.HashSet; 
    23 import java.util.Iterator; 
    2422import java.util.List; 
    2523 
     
    2725import org.slf4j.LoggerFactory; 
    2826 
    29 import com.rits.cloning.Cloner; 
    30 import com.rits.cloning.CloningException; 
    3127 
    3228import uk.ac.cardiff.model.ServiceMetadata; 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/attribute/filtering/NullAttributeRule.java

    r790 r817  
    2121import uk.ac.cardiff.model.ServiceMetadata; 
    2222import uk.ac.cardiff.model.event.Event; 
    23 import uk.ac.cardiff.raptor.attribute.filtering.match.MatchRule; 
    24 import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    2523 
    2624/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/AttributeAssociationDefinition.java

    r802 r817  
    1919package uk.ac.cardiff.raptor.event.expansion; 
    2020 
    21 import java.util.List; 
    22 import java.util.Map; 
    23  
    2421import org.slf4j.Logger; 
    2522import org.slf4j.LoggerFactory; 
    2623 
    2724import uk.ac.cardiff.model.event.Event; 
    28 import uk.ac.cardiff.raptor.event.expansion.connector.AttributeAssociationException; 
    29 import uk.ac.cardiff.raptor.event.expansion.connector.DataConnector; 
    30 import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
     25 
    3126 
    3227/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/AttributeAssociationEngine.java

    r808 r817  
    2020 
    2121import java.util.List; 
    22 import java.util.Map; 
    2322 
    2423 
     
    2827import uk.ac.cardiff.model.event.Event; 
    2928import uk.ac.cardiff.raptor.event.expansion.connector.AttributeAssociationException; 
    30 import uk.ac.cardiff.raptor.event.expansion.connector.DataConnector; 
    31 import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    3229 
    3330/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/PrincipalAttributeAssociationDefinition.java

    r802 r817  
    2626 
    2727import uk.ac.cardiff.model.event.Event; 
    28 import uk.ac.cardiff.model.resource.ResourceMetadata; 
    2928import uk.ac.cardiff.raptor.event.expansion.connector.AttributeAssociationException; 
    3029import uk.ac.cardiff.raptor.event.expansion.connector.DataConnector; 
    3130import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    32 import uk.ac.cardiff.raptor.store.dao.RaptorDataConnection; 
    3331 
    3432/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/ResourceCategoryAttributeAssociationDefinition.java

    r808 r817  
    1919package uk.ac.cardiff.raptor.event.expansion; 
    2020 
    21 import java.util.List; 
    22 import java.util.Map; 
    2321 
    2422import org.hibernate.exception.DataException; 
     
    2826import uk.ac.cardiff.model.event.Event; 
    2927import uk.ac.cardiff.model.resource.ResourceMetadata; 
    30 import uk.ac.cardiff.raptor.event.expansion.connector.AttributeAssociationException; 
    31 import uk.ac.cardiff.raptor.event.expansion.connector.DataConnector; 
    32 import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    3328import uk.ac.cardiff.raptor.store.dao.RaptorDataConnection; 
    3429 
     
    5651     */ 
    5752    public boolean associate(Event event) { 
    58      
     53 
    5954       ResourceMetadata resourceMetadata = null; 
    6055       Object result =  dataConnection.runQueryUnique("from ResourceMetadata where resourceId=?", new Object[]{event.getResourceId()}); 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/registry/Endpoint.java

    r791 r817  
    2020 
    2121import java.util.List; 
    22 import java.util.Set; 
    2322 
    2423import org.slf4j.Logger; 
     
    2827import uk.ac.cardiff.raptor.attribute.filtering.AttributeFilterPolicy; 
    2928import uk.ac.cardiff.raptor.remoting.policy.PushPolicy; 
    30 import uk.ac.cardiff.raptor.store.dao.RaptorDataConnection; 
    3129 
    3230/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/registry/EndpointRegistry.java

    r790 r817  
    8181 
    8282        public ReleaseInformation loadReleaseInformation(Endpoint endpoint){ 
    83                 List releaseInfoResults = dataConnection.runQuery("from ReleaseInformation where serviceEndpoint=?",new Object[]{endpoint.getServiceEndpoint()}); 
     83                List<?> releaseInfoResults = dataConnection.runQuery("from ReleaseInformation where serviceEndpoint=?",new Object[]{endpoint.getServiceEndpoint()}); 
    8484                if (releaseInfoResults==null){ 
    8585                        log.warn("Loading error...no release information found, blank release information used"); 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/registry/ReleaseInformation.java

    r796 r817  
    2525 
    2626import uk.ac.cardiff.model.event.Event; 
    27 import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    2827 
    2928public class ReleaseInformation { 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/EventReleaseClient.java

    r796 r817  
    2424import uk.ac.cardiff.model.event.Event; 
    2525import uk.ac.cardiff.raptor.registry.Endpoint; 
    26 import uk.ac.cardiff.raptor.registry.EndpointRegistry; 
    2726 
    2827/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/EventReleaseEngine.java

    r802 r817  
    2121import java.util.ArrayList; 
    2222import java.util.Date; 
    23 import java.util.HashSet; 
    24 import java.util.Iterator; 
    2523import java.util.List; 
    2624 
     
    3129import uk.ac.cardiff.raptor.remoting.policy.PushPolicy; 
    3230 
    33 import org.joda.time.DateTime; 
    3431import org.slf4j.Logger; 
    3532import org.slf4j.LoggerFactory; 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/ClientTLSParameters.java

    r672 r817  
    3636import org.apache.cxf.configuration.jsse.TLSClientParameters; 
    3737 
    38 import uk.ac.cardiff.raptor.registry.Endpoint; 
    3938 
    4039/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/CxfServiceEndpointClient.java

    r713 r817  
    1616package uk.ac.cardiff.raptor.remoting.client.sei.impl; 
    1717 
    18 import java.io.File; 
    19 import java.io.FileInputStream; 
    20 import java.security.KeyStore; 
     18 
    2119import java.util.HashSet; 
    22 import java.util.LinkedHashSet; 
    2320import java.util.Set; 
    2421 
    25 import javax.net.ssl.KeyManager; 
    26 import javax.net.ssl.KeyManagerFactory; 
    27 import javax.net.ssl.TrustManager; 
    28 import javax.net.ssl.TrustManagerFactory; 
     22 
    2923 
    3024import org.apache.cxf.aegis.DatabindingException; 
     
    3327import org.apache.cxf.binding.soap.SoapFault; 
    3428import org.apache.cxf.common.classloader.ClassLoaderUtils; 
    35 import org.apache.cxf.configuration.jsse.TLSClientParameters; 
    36 import org.apache.cxf.configuration.security.ClientAuthentication; 
    3729import org.apache.cxf.frontend.ClientProxy; 
    3830import org.apache.cxf.frontend.ClientProxyFactoryBean; 
     
    4436import uk.ac.cardiff.model.event.AuthenticationEvent; 
    4537import uk.ac.cardiff.model.event.EzproxyAuthenticationEvent; 
    46 import uk.ac.cardiff.model.event.EzproxyProxyEvent; 
    4738import uk.ac.cardiff.model.event.OpenathenslaAuthenticationEvent; 
    4839import uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent; 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/policy/EntryNoElapsedTimePushPolicy.java

    r796 r817  
    2222 
    2323import uk.ac.cardiff.model.event.Event; 
    24 import uk.ac.cardiff.raptor.remoting.client.EventReleaseEngine; 
    2524 
    2625/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/policy/PushPolicy.java

    r656 r817  
    2222 
    2323import uk.ac.cardiff.model.event.Event; 
    24 import uk.ac.cardiff.raptor.registry.Endpoint; 
    2524 
    2625/** 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/server/sei/MultiUnitAggregator.java

    r808 r817  
    1919package uk.ac.cardiff.raptor.remoting.server.sei; 
    2020 
    21 import java.util.ArrayList; 
    2221import java.util.List; 
    2322 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/AsynchronousEntryStoragePipeline.java

    r713 r817  
    1919import java.util.concurrent.ExecutorService; 
    2020import java.util.concurrent.Executors; 
    21 import java.util.concurrent.FutureTask; 
    2221 
    2322import org.slf4j.Logger; 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/IncrementalEntryHandler.java

    r808 r817  
    2222package uk.ac.cardiff.raptor.store; 
    2323 
    24 import java.util.Collection; 
    2524import java.util.List; 
    2625import java.util.Set; 
    2726 
    28 import org.hibernate.exception.DataException; 
    2927import org.joda.time.DateTime; 
    3028 
     
    6967         */ 
    7068        public void removeAllEntries(); 
    71          
     69 
    7270        /** 
    7371         * 
    7472         */ 
    7573        public void initialise(); 
    76          
     74 
    7775        /** 
    7876         * 
     
    8078         */ 
    8179        public int getNumberOfEntries(); 
    82          
     80 
    8381        public void removeEventsBefore(DateTime earliestReleaseTime, Set<Integer> latestEqualEntries); 
    8482 
    85         /**  
     83        /** 
    8684         * Rests this <code>IncrementalEntryHandler</code> back to its initial state 
    87          *  
     85         * 
    8886         */ 
    8987        public void reset(); 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/StorageEngine.java

    r802 r817  
    2020 
    2121import java.util.List; 
    22 import java.util.concurrent.TimeUnit; 
    23 import java.util.concurrent.locks.Lock; 
    24 import java.util.concurrent.locks.ReentrantLock; 
    2522 
    2623import org.joda.time.DateTime; 
     
    2926 
    3027import uk.ac.cardiff.model.event.Event; 
    31 import uk.ac.cardiff.model.resource.ResourceMetadata; 
    3228import uk.ac.cardiff.raptor.event.expansion.AttributeAssociationEngine; 
    3329 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/StoreEntriesPipelineTask.java

    r707 r817  
    2525import org.slf4j.LoggerFactory; 
    2626 
    27 import uk.ac.cardiff.model.event.AuthenticationEvent; 
    2827import uk.ac.cardiff.model.event.Event; 
    2928import uk.ac.cardiff.raptor.event.expansion.AttributeAssociationEngine; 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/dao/RaptorDataConnection.java

    r808 r817  
    2424import org.springframework.dao.DataAccessException; 
    2525 
    26 import uk.ac.cardiff.model.event.Event; 
    27  
    2826/** 
    2927 * @author philsmart 
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/impl/PersistantEntryHandler.java

    r808 r817  
    1919package uk.ac.cardiff.raptor.store.impl; 
    2020 
    21 import java.util.ArrayList; 
    2221import java.util.Arrays; 
    2322import java.util.Collection; 
    24 import java.util.Date; 
    2523import java.util.HashSet; 
    2624import java.util.Iterator; 
    27 import java.util.LinkedHashSet; 
    2825import java.util.List; 
    2926import java.util.Set; 
    30 import java.util.concurrent.ExecutorService; 
    31 import java.util.concurrent.Executors; 
    32 import java.util.concurrent.Future; 
    33 import java.util.concurrent.FutureTask; 
    3427 
    3528import org.hibernate.exception.DataException; 
    36 import org.jaxen.function.LastFunction; 
    3729import org.joda.time.DateTime; 
    38 import org.joda.time.LocalDateTime; 
    3930import org.slf4j.Logger; 
    4031import org.slf4j.LoggerFactory; 
     
    4233 
    4334import uk.ac.cardiff.model.event.Event; 
    44 import uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent; 
    45 import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    46 import uk.ac.cardiff.raptor.store.AsynchronousEntryStoragePipeline; 
    4735import uk.ac.cardiff.raptor.store.EntryHandler; 
    48 import uk.ac.cardiff.raptor.store.StoreEntriesPipelineTask; 
    4936import uk.ac.cardiff.raptor.store.dao.RaptorDataConnection; 
    5037import uk.ac.cardiff.raptor.store.dao.StorageException; 
     
    120107              return dataConnection.runQuery(query, parameters, maxNoResults); 
    121108        } 
    122          
     109 
    123110        public void save(Object object) throws StorageException { 
    124111                try{ 
     
    136123                catch (DataException e){ 
    137124                        throw new StorageException("Could not save collection",e); 
    138                 }        
     125                } 
    139126        } 
    140127 
Note: See TracChangeset for help on using the changeset viewer.