Changeset 444

Timestamp:

01/14/11 13:59:08 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-ua/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/uk/ac/cardiff/RaptorUA/engine/UnitAggregatorEngine.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/RaptorUA/model/EntryHandler.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/RaptorUA/model/MemoryEntryHandler.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/RaptorUA/model/PersistantEntryHandler.java (modified) (8 diffs)
• src/main/webapp/WEB-INF/beans.xml (modified) (1 diff)

raptor-ua/trunk/pom.xml

@@ -54 +54 @@
                         <artifactId>spring</artifactId>
                         <version>2.0.5</version>
+                        <exclusions>
+                                <exclusion>
+                                        <artifactId>servlet-api</artifactId>
+                                        <groupId>javax.servlet</groupId>
+                                </exclusion>
+                        </exclusions>
                 </dependency>
                 <dependency>

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

@@ -76 +76 @@
     public void setEntryHandler(EntryHandler entryHandler) {
         this.entryHandler = entryHandler;
+        entryHandler.initialise();
     }
 

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

@@ -44 +44 @@
         public void removeAllEntries();
 
-        /**
-         *
-         */
         public void endTransaction();
 
+        public void initialise();
+
 }

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

@@ -86 +86 @@
 
         }
+
+        /* (non-Javadoc)
+         * @see uk.ac.cardiff.RaptorUA.model.EntryHandler#initialise()
+         */
+        @Override
+        public void initialise() {
+            // TODO Auto-generated method stub
+
+        }
 }

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

@@ -24 +24 @@
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
@@ -38 +39 @@
 
     /* class logger */
-    static Logger log = Logger.getLogger(PersistantEntryHandler.class);
-
+    static Logger log = LoggerFactory.getLogger(PersistantEntryHandler.class);
 
     /* data connection used to persist entries */
@@ -47 +47 @@
     Set<Entry> entries;
 
-
-
     public PersistantEntryHandler(UADataConnection dataConnection) {
         this.setDataConnection(dataConnection);
 
+
+    }
+
+    /**
+     * Initialises the entry handler. In particular, loads all entries from the main datastore, through the <code>dataConnection</code> instance.
+     */
+    public void initialise() {
+        log.info("Persistant entry handler [{}] initialising", this);
+        Integer rowCount = (Integer) dataConnection.runQueryUnique("select count(*) from Entry", null);
+        log.info("Persistent data store has {} entries", rowCount);
         List<Entry> entriesAsList = dataConnection.runQuery("from Entry", null);
-        log.info("UA has loaded "+entriesAsList.size()+" entries from DB backed cache");
+        log.info("UA has loaded " + entriesAsList.size() + " entries from DB backed cache");
         entries = new LinkedHashSet<Entry>(entriesAsList);
+        log.info("Persistant entry handler [{}] started", this);
     }
 
@@ -66 +75 @@
         log.debug("Current: " + this.getEntries().size() + " in: " + entries.size());
         for (Entry entry : entries) {
-                this.getEntries().add(entry);
+            this.getEntries().add(entry);
         }
         log.debug("Total No. of Entries " + this.getEntries().size());
@@ -72 +81 @@
     }
 
-    public void addEntry(Entry entry){
-            entries.add(entry);
+    public void addEntry(Entry entry) {
+        entries.add(entry);
 
     }
@@ -110 +119 @@
         dataConnection.deleteAllEntries(entries);
         entries.clear();
-        //entryInformation.setLatestEntryTime(null);
+        // entryInformation.setLatestEntryTime(null);
     }
-
 
     public void setDataConnection(UADataConnection dataConnection) {
@@ -122 +130 @@
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     *
      * @see uk.ac.cardiff.RaptorUA.model.EntryHandler#setEntries(java.util.Set)
      */
@@ -131 +141 @@
     }
 
-
-
-
-
 }

raptor-ua/trunk/src/main/webapp/WEB-INF/beans.xml

@@ -77 +77 @@
         <bean name="uaEngine" class="uk.ac.cardiff.RaptorUA.engine.UnitAggregatorEngine">
                 <property name="muaRegistry"><ref bean="muaRegistry"></ref></property>
-                <property name="entryHandler"><ref bean="persistantEntryHandler"></ref></property>
+                <property name="entryHandler"><ref bean="memoryEntryHandler"></ref></property>
                 <property name="uaMetadata"><ref bean="UAMetadata"></ref></property>
         </bean>