Changeset 726

Timestamp:

05/02/11 23:00:12 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk/src/main

Files:

• config/jetty.xml (deleted)
• config/users.xml (modified) (1 diff)
• java/uk/ac/cardiff/raptormua/engine/MUAEngine.java (modified) (4 diffs)
• java/uk/ac/cardiff/raptormua/service/MUAProcess.java (modified) (3 diffs)
• java/uk/ac/cardiff/raptormua/service/impl/MUAProcessImpl.java (modified) (4 diffs)
• java/uk/ac/cardiff/raptormua/wsinterface/impl/MultiUnitAggregatorImpl.java (modified) (9 diffs)

raptor-mua/trunk/src/main/config/users.xml

@@ -25 +25 @@
         http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
+    <!-- NOT USED AT PRESENT -->
 
         <bean id="raptorUsers" class=" uk.ac.cardiff.raptormua.model.Users">

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

@@ -19 +19 @@
 package uk.ac.cardiff.raptormua.engine;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -33 +37 @@
 import uk.ac.cardiff.model.wsmodel.Capabilities;
 import uk.ac.cardiff.model.wsmodel.EventPushMessage;
+import uk.ac.cardiff.model.wsmodel.LogFileUpload;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 import uk.ac.cardiff.model.wsmodel.SuggestionValues;
@@ -53 +58 @@
 public class MUAEngine {
 
-        /** Class logger*/
+        /** Class logger */
         private final Logger log = LoggerFactory.getLogger(MUAEngine.class);
 
@@ -204 +209 @@
     }
 
+    /** Use the configured raptor parsing library to store the incomming <code>uploadFiles</code>
+     * 
+     * @param uploadFiles the files to parse and store
+     */
+        public void batchParse(List<LogFileUpload> uploadFiles) {
+                BufferedReader bf = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(uploadFiles.get(0).getData())));
+                
+        }
+
 }

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

@@ -19 +19 @@
 package uk.ac.cardiff.raptormua.service;
 
+import java.util.List;
+
 import org.apache.cxf.binding.soap.SoapFault;
 
@@ -26 +28 @@
 import uk.ac.cardiff.model.wsmodel.Capabilities;
 import uk.ac.cardiff.model.wsmodel.EventPushMessage;
+import uk.ac.cardiff.model.wsmodel.LogFileUpload;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 
@@ -65 +68 @@
          */
         public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) throws SoapFault;
+
+        public boolean batchUpload(List<LogFileUpload> uploadFiles) throws SoapFault;
 }

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

@@ -19 +19 @@
 package uk.ac.cardiff.raptormua.service.impl;
 
+import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -33 +34 @@
 import uk.ac.cardiff.model.wsmodel.Capabilities;
 import uk.ac.cardiff.model.wsmodel.EventPushMessage;
+import uk.ac.cardiff.model.wsmodel.LogFileUpload;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 import uk.ac.cardiff.raptormua.engine.MUAEngine;
@@ -178 +180 @@
                                 return engine.performStatistic(statisticalUnitInformation.getStatisticParameters().getUnitName());
                         } catch (Exception e) {
-                                // TODO either throw as service output, or deal with here
                                 log.error(e.getMessage());
                                 e.printStackTrace();
@@ -190 +191 @@
         }
 
+        /**
+         * Batch upload does not employ a lock on the MUA
+         */
+        @Override
+        public boolean batchUpload(List<LogFileUpload> uploadFiles) throws SoapFault {
+                log.info("Webservice call to parse {} batch log file(s)",uploadFiles.size());
+                for (LogFileUpload logfile : uploadFiles){
+                        log.debug("Log File details: name [{}], MIME type [{}], Length [{}]",new Object[]{logfile.getName(),logfile.getMime(),logfile.getData().length});
+                }
+                engine.batchParse(uploadFiles);
+                return true;
+
+        }
+
 }

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

@@ -19 +19 @@
 package uk.ac.cardiff.raptormua.wsinterface.impl;
 
+import java.util.List;
+
 import javax.jws.WebService;
 
@@ -29 +31 @@
 import uk.ac.cardiff.model.wsmodel.Capabilities;
 import uk.ac.cardiff.model.wsmodel.EventPushMessage;
+import uk.ac.cardiff.model.wsmodel.LogFileUpload;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 import uk.ac.cardiff.raptor.remoting.server.sei.MultiUnitAggregator;
@@ -43 +46 @@
         private MUAProcess processService;
 
-        /* (non-Javadoc)
-         * @see uk.ac.cardiff.raptormua.wsinterface.MultiUnitAggregator#getVersion()
-         */
         public String getVersion() {
                 return "Alpha";
@@ -58 +58 @@
         }
 
-        /* (non-Javadoc)
-         * @see uk.ac.cardiff.sei.MultiUnitAggregator#getCapabilities()
-         */
         public Capabilities getCapabilities() {
                 // TODO Auto-generated method stub
@@ -66 +63 @@
         }
 
-        /* (non-Javadoc)
-         * @see uk.ac.cardiff.sei.MultiUnitAggregator#invokeStatisticalUnit(java.lang.String)
-         */
+
         public AggregatorGraphModel invokeStatisticalUnit(String statisticName) throws SoapFault {
                 return processService.performStatistic(statisticName);
@@ -74 +69 @@
 
 
-        /* (non-Javadoc)
-         * @see uk.ac.cardiff.sei.MultiUnitAggregator#setStatisticalUnit(uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation)
-         */
         @Override
         public void updateStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) throws SoapFault {
@@ -83 +75 @@
         }
 
-        /* (non-Javadoc)
-         * @see uk.ac.cardiff.sei.MultiUnitAggregator#performAdministrativeFunction(uk.ac.cardiff.model.AdministrativeFunction.AdministrativeFunctionType)
-         */
+
         @Override
         public boolean performAdministrativeFunction(AdministrativeFunction function) throws SoapFault {
@@ -91 +81 @@
         }
 
-        /* (non-Javadoc)
-         * @see uk.ac.cardiff.sei.MultiUnitAggregator#addAuthentications(uk.ac.cardiff.model.wsmodel.UAEntryPush)
-         */
+
         @Override
         public void addAuthentications(EventPushMessage pushed) throws SoapFault{
@@ -105 +93 @@
         }
 
+        public boolean batchUpload(List<LogFileUpload> uploadFiles) {
+                return processService.batchUpload(uploadFiles);
+        }
+
 }