Changeset 668


Ignore:
Timestamp:
04/11/11 23:37:40 (2 years ago)
Author:
philsmart
Message:

removed persistence classes and put them in the client

Location:
raptor-mua/trunk
Files:
6 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • raptor-mua/trunk/pom.xml

    r635 r668  
    282282 
    283283 
    284                 <dependency> 
    285                         <groupId>hibernate</groupId> 
    286                         <artifactId>hibernate</artifactId> 
    287                         <version>3.1rc2</version> 
    288                 </dependency> 
     284 
    289285 
    290286 

  • raptor-mua/trunk/src/main/config/dao-beans.xml

    r632 r668  
    9191 
    9292 
    93         <bean name="dataConnectionImpl" class="uk.ac.cardiff.raptormua.dao.MUADataConnectionImpl"> 
     93        <bean name="dataConnectionImpl" class="uk.ac.cardiff.raptor.store.dao.MUADataConnectionImpl"> 
    9494                <property name="sessionFactory" ref="muaSessionFactory" /> 
    9595        </bean> 

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

    r666 r668  
    125125 
    126126        <!-- Create the entry handler --> 
    127         <bean name="persistantEntryHandler" class="uk.ac.cardiff.raptormua.model.PersistantEntryHandler"> 
     127        <bean name="persistantEntryHandler" class="uk.ac.cardiff.raptor.store.impl.PersistantEntryHandler"> 
    128128                <constructor-arg index="0"><ref bean="dataConnectionImpl"></ref></constructor-arg> 
    129129        </bean> 

  • raptor-mua/trunk/src/main/config/statistical-units.xml

    r632 r668  
    296296        <!--  Support statistical workflows --> 
    297297 
    298         <bean id="SessionLinker" class = "uk.ac.cardiff.raptormua.engine.statistics.SessionLinker"/> 
    299  
    300298        <bean id="percentagePost" class = "uk.ac.cardiff.raptormua.engine.statistics.PercentagePostProcessor"> 
    301299        </bean> 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/MUAEngine.java

    r666 r668  
    3737import uk.ac.cardiff.raptor.event.expansion.AttributeAssociationEngine; 
    3838import uk.ac.cardiff.raptor.remoting.client.EventReleaseClient; 
     39import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
     40import uk.ac.cardiff.raptor.store.EntryHandler; 
    3941import uk.ac.cardiff.raptormua.engine.statistics.Statistic; 
    4042import uk.ac.cardiff.raptormua.engine.statistics.StatisticsHandler; 
    4143import uk.ac.cardiff.raptormua.engine.statistics.StatisticsPostProcessor; 
    42 import uk.ac.cardiff.raptormua.model.EntryHandler; 
    4344import uk.ac.cardiff.raptormua.model.Users; 
    44 import uk.ac.cardiff.raptormua.runtimeutils.ReflectionHelper; 
     45 
    4546 
    4647/** 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/Statistic.java

    r619 r668  
    3636import uk.ac.cardiff.model.wsmodel.MethodParameter; 
    3737import uk.ac.cardiff.model.wsmodel.StatisticParameters; 
     38import uk.ac.cardiff.raptor.store.EntryHandler; 
    3839import uk.ac.cardiff.raptormua.engine.statistics.records.Bucket; 
    3940import uk.ac.cardiff.raptormua.engine.statistics.records.Group; 
    … …  
    4243import uk.ac.cardiff.raptormua.exceptions.PreprocessorException; 
    4344import uk.ac.cardiff.raptormua.exceptions.StatisticalUnitException; 
    44 import uk.ac.cardiff.raptormua.model.EntryHandler; 
    4545import uk.ac.cardiff.raptormua.runtimeutils.EntryClone; 
    4646 
    … …  
    5151public abstract class Statistic { 
    5252 
    53         static Logger log = LoggerFactory.getLogger(Statistic.class); 
     53        /** Class logger */ 
     54        private final Logger log = LoggerFactory.getLogger(Statistic.class); 
    5455 
    5556        private EntryHandler entryHandler; 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/StatisticsHandler.java

    r619 r668  
    3232import uk.ac.cardiff.model.wsmodel.MethodParameter; 
    3333import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation; 
    34 import uk.ac.cardiff.raptormua.model.EntryHandler; 
     34import uk.ac.cardiff.raptor.store.EntryHandler; 
    3535 
    3636/** 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/StatisticsPreProcessor.java

    r619 r668  
    2323 
    2424import uk.ac.cardiff.model.event.Event; 
     25import uk.ac.cardiff.raptor.store.EntryHandler; 
    2526import uk.ac.cardiff.raptormua.exceptions.PreprocessorException; 
    26 import uk.ac.cardiff.raptormua.model.EntryHandler; 
    2727 
    2828/** 
    … …  
    3636         * @throws PreprocessorException 
    3737         */ 
    38         void preProcess(EntryHandler entryHandler) throws PreprocessorException; 
     38        public void preProcess(EntryHandler entryHandler) throws PreprocessorException; 
    3939 
    4040 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/functions/CountEntry.java

    r625 r668  
    1717public class CountEntry extends Statistic{ 
    1818 
    19         static Logger log = LoggerFactory.getLogger(CountEntry.class); 
     19        /** Class logger */ 
     20        private final Logger log = LoggerFactory.getLogger(CountEntry.class); 
    2021 
    2122        public Boolean performStatistic(ArrayList<MethodParameter> methodParams, String sqlWhere) throws StatisticalUnitException { 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/functions/GroupBy.java

    r619 r668  
    1111import uk.ac.cardiff.model.wsmodel.StatisticParameters; 
    1212import uk.ac.cardiff.model.wsmodel.MethodParameter.ParameterType; 
     13import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    1314import uk.ac.cardiff.raptormua.engine.statistics.ObservationSeries; 
    1415import uk.ac.cardiff.raptormua.engine.statistics.Statistic; 
    1516import uk.ac.cardiff.raptormua.engine.statistics.records.Group; 
    1617import uk.ac.cardiff.raptormua.exceptions.StatisticalUnitException; 
    17 import uk.ac.cardiff.raptormua.runtimeutils.ReflectionHelper; 
    1818 
    1919public class GroupBy extends Statistic{ 
    2020         
    21         static Logger log = LoggerFactory.getLogger(GroupByCountDistinct.class); 
     21        /** Class logger */ 
     22        private final Logger log = LoggerFactory.getLogger(GroupByCountDistinct.class); 
    2223 
    2324        /** 
    … …  
    3233         * 
    3334         * @param groupByField 
    34          * @return 
     35         * @return true if the statistic succeeds successfully 
    3536         * @throws StatisticalUnitException 
    3637         */ 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/functions/GroupByCountDistinct.java

    r619 r668  
    1111import uk.ac.cardiff.model.wsmodel.StatisticParameters; 
    1212import uk.ac.cardiff.model.wsmodel.MethodParameter.ParameterType; 
     13import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    1314import uk.ac.cardiff.raptormua.engine.statistics.ObservationSeries; 
    1415import uk.ac.cardiff.raptormua.engine.statistics.Statistic; 
    1516import uk.ac.cardiff.raptormua.engine.statistics.records.Group; 
    1617import uk.ac.cardiff.raptormua.exceptions.StatisticalUnitException; 
    17 import uk.ac.cardiff.raptormua.runtimeutils.ReflectionHelper; 
    1818 
    1919public class GroupByCountDistinct extends Statistic{ 
    2020         
    21         static Logger log = LoggerFactory.getLogger(GroupByCountDistinct.class); 
     21        /** Class logger */ 
     22        private final Logger log = LoggerFactory.getLogger(GroupByCountDistinct.class); 
    2223         
    2324        public Boolean performStatistic(ArrayList<MethodParameter> methodParams, String sqlWhere) throws StatisticalUnitException { 

  • raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/functions/GroupByFrequency.java

    r625 r668  
    1111import uk.ac.cardiff.model.wsmodel.StatisticParameters; 
    1212import uk.ac.cardiff.model.wsmodel.MethodParameter.ParameterType; 
     13import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper; 
    1314import uk.ac.cardiff.raptormua.engine.statistics.ObservationSeries; 
    1415import uk.ac.cardiff.raptormua.engine.statistics.Statistic; 
    1516import uk.ac.cardiff.raptormua.engine.statistics.records.Group; 
    1617import uk.ac.cardiff.raptormua.exceptions.StatisticalUnitException; 
    17 import uk.ac.cardiff.raptormua.runtimeutils.ReflectionHelper; 
     18 
    1819 
    1920public class GroupByFrequency extends Statistic{ 
    2021 
    21         static Logger log = LoggerFactory.getLogger(GroupByFrequency.class); 
     22        /** Class logger */ 
     23        private final Logger log = LoggerFactory.getLogger(GroupByFrequency.class); 
    2224 
    2325 
Note: See TracChangeset for help on using the changeset viewer.