Changeset 599

Timestamp:

03/26/11 18:01:42 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua

Files:

• engine/MUAEngine.java (modified) (4 diffs)
• service/MUAProcess.java (modified) (2 diffs)
• service/impl/MUAProcessImpl.java (modified) (2 diffs)
• wsinterface/impl/MultiUnitAggregatorImpl.java (modified) (2 diffs)

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

@@ -27 +27 @@
 
 import uk.ac.cardiff.model.AdministrativeFunction;
-import uk.ac.cardiff.model.MUAMetadata;
+import uk.ac.cardiff.model.ClientMetadata;
 import uk.ac.cardiff.model.Series;
 import uk.ac.cardiff.model.Graph.AggregatorGraphModel;
 import uk.ac.cardiff.model.wsmodel.Capabilities;
-import uk.ac.cardiff.model.wsmodel.ICAEntryPush;
+import uk.ac.cardiff.model.wsmodel.EventPushMessage;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 import uk.ac.cardiff.model.wsmodel.SuggestionValues;
-import uk.ac.cardiff.model.wsmodel.UAEntryPush;
 import uk.ac.cardiff.raptormua.engine.statistics.Statistic;
 import uk.ac.cardiff.raptormua.engine.statistics.StatisticsHandler;
@@ -57 +56 @@
 
         /* holds metadata about the <code>MUAEngine</code> e.g. name etc. */
-        private MUAMetadata muaMetadata;
+        private ClientMetadata muaMetadata;
 
         public MUAEngine() {
                 log.info("Setup Multi-Unit Aggregator Engine...");
                 log.info("Mulit-Unit Aggregator Engine is running...");
-        }
-
-        public void poll() {
-                log.info("MultiUnit Aggregator Polling Unit Aggregators");
-                for (UAEntry entry : uaRegistry.getUAEntries()) {
-                        Set entries = entry.getAllAuthentications();
-                        // log.debug("Setting: "+entries.size());
-                        getEntryHandler().addEntries(entries);
-                }
-                getEntryHandler().endTransaction();
-
         }
 
@@ -175 +163 @@
         }
 
-        /**
-         * @param muaMetadata
-         *            the muaMetadata to set
-         */
-        public void setMuaMetadata(MUAMetadata muaMetadata) {
-                this.muaMetadata = muaMetadata;
-        }
-
-        /**
-         * @return the muaMetadata
-         */
-        public MUAMetadata getMuaMetadata() {
-                return muaMetadata;
-        }
 
         /**
@@ -206 +180 @@
          * @param pushed
          */
-        public void addAuthentications(UAEntryPush pushed) {
-                log.info("Committing {} entries to the entryHandler", pushed.getEntries().size());
-                entryHandler.addEntries(pushed.getEntries());
+        public void addAuthentications(EventPushMessage pushed) {
+                log.info("Committing {} entries to the entryHandler", pushed.getEvents().size());
+                entryHandler.addEntries(pushed.getEvents());
                 log.info("EntryHandler now contains {} entries", entryHandler.getNumberOfEntries());
 

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/service/MUAProcess.java

@@ -25 +25 @@
 import uk.ac.cardiff.model.Graph.AggregatorGraphModel;
 import uk.ac.cardiff.model.wsmodel.Capabilities;
+import uk.ac.cardiff.model.wsmodel.EventPushMessage;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
-import uk.ac.cardiff.model.wsmodel.UAEntryPush;
 
 /**
@@ -62 +62 @@
          * @param pushed
          */
-        public void addAuthentications(UAEntryPush pushed);
+        public void addAuthentications(EventPushMessage pushed);
 
         /**

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/service/impl/MUAProcessImpl.java

@@ -32 +32 @@
 import uk.ac.cardiff.model.Graph.AggregatorGraphModel;
 import uk.ac.cardiff.model.wsmodel.Capabilities;
+import uk.ac.cardiff.model.wsmodel.EventPushMessage;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
-import uk.ac.cardiff.model.wsmodel.UAEntryPush;
 import uk.ac.cardiff.raptormua.engine.MUAEngine;
 import uk.ac.cardiff.raptormua.service.MUAProcess;
@@ -192 +192 @@
          */
         @Override
-        public void addAuthentications(UAEntryPush pushed) {
+        public void addAuthentications(EventPushMessage pushed) {
                 boolean success = false;
                 if (lockR.tryLock()) {
                         try {
-                                log.info("MUA has received {} entries from {}", pushed.getEntries().size(), pushed.getUaMetaData()
-                                                .getUaName());
+                                log.info("MUA has received {} entries from {}", pushed.getEvents().size(), pushed.getClientMetadata().getClientName());
                                 engine.addAuthentications(pushed);
                                 success = true;

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/wsinterface/impl/MultiUnitAggregatorImpl.java

@@ -28 +28 @@
 import uk.ac.cardiff.model.Graph.AggregatorGraphModel;
 import uk.ac.cardiff.model.wsmodel.Capabilities;
+import uk.ac.cardiff.model.wsmodel.EventPushMessage;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
-import uk.ac.cardiff.model.wsmodel.UAEntryPush;
 import uk.ac.cardiff.raptormua.service.MUAProcess;
 import uk.ac.cardiff.sei.MultiUnitAggregator;
@@ -95 +95 @@
          */
         @Override
-        public void addAuthentications(UAEntryPush pushed) {
+        public void addAuthentications(EventPushMessage pushed) {
             processService.addAuthentications(pushed);