Changeset 659

Timestamp:

04/07/11 23:27:30 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-web/trunk/src/main

Files:

• java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java (modified) (9 diffs)
• java/uk/ac/cardiff/raptorweb/sei/ServiceEndpointClient.java (modified) (9 diffs)
• webapp/WEB-INF/config/web-setup.xml (modified) (1 diff)

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java

@@ -31 +31 @@
  */
 public class RaptorWebEngine {
-    static Logger log = LoggerFactory.getLogger(RaptorWebEngine.class);
-
-    /* the registry which holds information about all MUAs injected from the xml file*/
+    
+    /** Class Logger */
+    private final Logger log = LoggerFactory.getLogger(RaptorWebEngine.class);
+
+    /** the registry which holds information about all MUAs injected from the xml file*/
     private MUARegistry registry;
 
-    /* constructs downloadable reports from that currently displayed*/
+    /** constructs downloadable reports from that currently displayed*/
     private ReportHandler reportHandler;
 
-    /* holds the currently attached MUA */
+    /** holds the currently attached MUA */
     private MUAEntry attachedMUA;
 
-    /* holds the capabilities and statistical information for the currently attached MUA */
+    /** holds the capabilities and statistical information for the currently attached MUA */
     private Capabilities currentlyAttachedCapabilities;
 
-    /* holds basic metadata about this particular RaptorWeb engine instance*/
+    /** holds basic metadata about this particular RaptorWeb engine instance*/
     private ServerMetadata webMetadata;
-
+    
+    /** The client used to set up, connect to, action and return results from the attached MUA*/
+    private ServiceEndpointClient serviceEndpointClient;
+
+    /**
+     * Constructor, pass the service endpoint client so initialisation on certain getters can be performed.
+     *
+     * @param serviceEndpointClient
+     */
+    private RaptorWebEngine(ServiceEndpointClient serviceEndpointClient){
+        //TODO initialise all values after spring bean creation,
+        this.serviceEndpointClient = serviceEndpointClient;
+    }
 
     /**
@@ -71 +85 @@
         log.info("Attaching {} and retrieving abilities",entry);
         this.attachedMUA = entry;
-        currentlyAttachedCapabilities = ServiceEndpointClient.discoverMUACapabilities(attachedMUA);
+        currentlyAttachedCapabilities = serviceEndpointClient.discoverMUACapabilities(attachedMUA);
     }
 
@@ -103 +117 @@
                 }
             }
-            Capabilities capabilities = ServiceEndpointClient.discoverMUACapabilities(attached);
+            Capabilities capabilities = serviceEndpointClient.discoverMUACapabilities(attached);
             if (capabilities!=null && !capabilities.isError()){
                 log.debug("Has retrieved {} statistics", capabilities.getStatisticalServices().size());
@@ -122 +136 @@
      */
     public Capabilities getCapabilities(MUAEntry selectedEndpoint) {
-        return ServiceEndpointClient.discoverMUACapabilities(selectedEndpoint);
+        return serviceEndpointClient.discoverMUACapabilities(selectedEndpoint);
     }
 
@@ -135 +149 @@
 
     public AggregatorGraphModel invokeStatisticalUnit(StatisticalUnitInformation selectedStatisticalUnit) {
-        AggregatorGraphModel gmodel = ServiceEndpointClient.invokeStatisticalUnit(getCurrentlyAttached(), selectedStatisticalUnit.getStatisticParameters().getUnitName());
+        AggregatorGraphModel gmodel = serviceEndpointClient.invokeStatisticalUnit(getCurrentlyAttached(), selectedStatisticalUnit.getStatisticParameters().getUnitName());
         return gmodel;
 
@@ -141 +155 @@
 
     public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation selectedStatisticalUnit) {
-        AggregatorGraphModel gmodel = ServiceEndpointClient.updateAndinvokeStatisticalUnit(getCurrentlyAttached(), selectedStatisticalUnit);
+        AggregatorGraphModel gmodel = serviceEndpointClient.updateAndinvokeStatisticalUnit(getCurrentlyAttached(), selectedStatisticalUnit);
         return gmodel;
 
@@ -173 +187 @@
         log.debug("Updating statistic {} ",model.getSelectedStatisticalUnit().getStatisticalUnitInformation().getStatisticParameters().getUnitName());
         log.debug("Has startDate {}",model.getSelectedStatisticalUnit().getStatisticalUnitInformation().getStatisticParameters().getStartTimeAsDate());
-        ServiceEndpointClient.updateStatisticalUnit(attachedMUA,model.getSelectedStatisticalUnit().getStatisticalUnitInformation());
+        serviceEndpointClient.updateStatisticalUnit(attachedMUA,model.getSelectedStatisticalUnit().getStatisticalUnitInformation());
     }
 
@@ -200 +214 @@
         else
             function.setRequester("UNKNOWN");
-        boolean success = ServiceEndpointClient.invokeAdministrativeFunction(attachedMUA, function);
+        boolean success = serviceEndpointClient.invokeAdministrativeFunction(attachedMUA, function);
         log.debug("Removal successfull {}",success);
         if (!success) model.setProcessingResult("ERROR: Entries did not remove");
@@ -221 +235 @@
     }
 
+    public void setServiceEndpointClient(ServiceEndpointClient serviceEndpointClient) {
+        this.serviceEndpointClient = serviceEndpointClient;
+    }
+
+    public ServiceEndpointClient getServiceEndpointClient() {
+        return serviceEndpointClient;
+    }
+
 
 }

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/sei/ServiceEndpointClient.java

@@ -33 +33 @@
 
 /**
- *
- *
+ * 
+ * 
  * @author philsmart
- *
- *         Instances of this class are responsible for retrieving data from a service endpoint. This class should not be static
- *         and should not recreate the Client for every request.
- *
+ * 
+ *         Instances of this class are responsible for retrieving data from a service endpoint. This class should not be static and should not recreate the
+ *         Client for every request.
+ * 
  */
 public class ServiceEndpointClient {
 
     /** Class logger */
-    private static final Logger log = LoggerFactory.getLogger(ServiceEndpointClient.class);
+    private final Logger log = LoggerFactory.getLogger(ServiceEndpointClient.class);
 
     /** Raptor specific TLS parameters class, that can return cxf TLSParameters */
-    private static ClientTLSParameters tlsParameters;
-
-    public static MultiUnitAggregator getEndpointConnection(MUAEntry endpoint) throws UnrecoverableKeyException, KeyStoreException, NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException {
+    private ClientTLSParameters tlsParameters;
+
+    public MultiUnitAggregator getEndpointConnection(MUAEntry endpoint) throws UnrecoverableKeyException, KeyStoreException, NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException {
         ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
         factory.setServiceClass(MultiUnitAggregator.class);
@@ -61 +61 @@
         HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
         httpClientPolicy.setConnectionTimeout(1000);
-        httpClientPolicy.setReceiveTimeout(2000);
+        httpClientPolicy.setReceiveTimeout(20000);
         httpConduit.setClient(httpClientPolicy);
 
-        if (tlsParameters!=null)
+        if (tlsParameters != null)
             httpConduit.setTlsClientParameters(tlsParameters.getTlsClientParameters());
 
@@ -73 +73 @@
      * Method to determine and return the <code>Capabilities</code> of a MultiUnitAggregator. This method uses a hard set connection timeout of 10 miliseconds,
      * and a receive timeout of 20 smilieconds, under the assumption that the capabilities of a MultiUnitAggregator can be sent inside small XML documents.
-     *
+     * 
      * @param endpoint
      * @return
      */
-    public static Capabilities discoverMUACapabilities(MUAEntry endpoint) {
+    public Capabilities discoverMUACapabilities(MUAEntry endpoint) {
         Capabilities capabilities = null;
         try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint.getServiceEndpoint());
-            factory.getServiceFactory().setDataBinding(databinding);
-
-            MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
-            org.apache.cxf.endpoint.Client cl = ClientProxy.getClient(client);
-            HTTPConduit httpConduit = (HTTPConduit) cl.getConduit();
-            HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
-            httpClientPolicy.setConnectionTimeout(1000);
-            httpClientPolicy.setReceiveTimeout(2000);
-            httpConduit.setClient(httpClientPolicy);
-            httpConduit.setTlsClientParameters(getTlsSettings(endpoint));
+            MultiUnitAggregator client = getEndpointConnection(endpoint);
             log.debug("Accessing the MUA version " + client.getVersion());
             capabilities = client.getCapabilities();
@@ -102 +89 @@
             capabilities.setError(true);
             capabilities.setErrorMessage(e.getMessage());
-            // e.printStackTrace();
+             e.printStackTrace();
         } catch (Exception e) {
             log.error("Problem trying to retrieving capabilities from MUA [{}] -> {}", new Object[] { endpoint, e.getMessage() });
@@ -108 +95 @@
             capabilities.setError(true);
             capabilities.setErrorMessage(e.getMessage());
-            // e.printStackTrace();
+             e.printStackTrace();
         }
         return capabilities;
@@ -118 +105 @@
      * <code>StatisicalUnitInformation</code> instance encapsulates the parameters for a single statistical unit. Allowing the values to be sent back and
      * changed on the MultiUnitAggregator
-     *
+     * 
      * @param endpoint
      * @param statisticalUnitInformation
      * @return
      */
-    public static Capabilities updateStatisticalUnit(MUAEntry endpoint, StatisticalUnitInformation statisticalUnitInformation) {
+    public Capabilities updateStatisticalUnit(MUAEntry endpoint, StatisticalUnitInformation statisticalUnitInformation) {
         Capabilities capabilities = null;
         try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint.getServiceEndpoint());
-            factory.getServiceFactory().setDataBinding(databinding);
-
-            MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
-            org.apache.cxf.endpoint.Client cl = ClientProxy.getClient(client);
-            HTTPConduit httpConduit = (HTTPConduit) cl.getConduit();
-            HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
-            httpClientPolicy.setConnectionTimeout(100000);
-            httpClientPolicy.setReceiveTimeout(200000);
-            httpConduit.setClient(httpClientPolicy);
-            httpConduit.setTlsClientParameters(getTlsSettings(endpoint));
+            MultiUnitAggregator client = getEndpointConnection(endpoint);
             log.debug("Accessing the MUA version {}", client.getVersion());
             log.debug("Updating statistic {} from the MUA {}", statisticalUnitInformation.getStatisticParameters().getUnitName(), endpoint);
@@ -164 +138 @@
      * @param selectedStatisticalUnit
      */
-    public static AggregatorGraphModel invokeStatisticalUnit(MUAEntry endpoint, String selectedStatisticalUnit) {
-        try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint.getServiceEndpoint());
-            factory.getServiceFactory().setDataBinding(databinding);
-            MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
-
-            org.apache.cxf.endpoint.Client cl = ClientProxy.getClient(client);
-            HTTPConduit httpConduit = (HTTPConduit) cl.getConduit();
-            HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
-            httpClientPolicy.setConnectionTimeout(100000);
-            httpClientPolicy.setReceiveTimeout(200000);
-            httpConduit.setClient(httpClientPolicy);
-            httpConduit.setTlsClientParameters(getTlsSettings(endpoint));
+    public AggregatorGraphModel invokeStatisticalUnit(MUAEntry endpoint, String selectedStatisticalUnit) {
+        try {
+            MultiUnitAggregator client = getEndpointConnection(endpoint);
             log.debug("Accessing the MUA version " + client.getVersion());
             AggregatorGraphModel gmodel = client.invokeStatisticalUnit(selectedStatisticalUnit);
@@ -198 +159 @@
      * @param removeall
      */
-    public static boolean invokeAdministrativeFunction(MUAEntry endpoint, AdministrativeFunction function) {
-        try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint.getServiceEndpoint());
-            factory.getServiceFactory().setDataBinding(databinding);
-            MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
-
-            org.apache.cxf.endpoint.Client cl = ClientProxy.getClient(client);
-            HTTPConduit httpConduit = (HTTPConduit) cl.getConduit();
-            HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
-            httpClientPolicy.setConnectionTimeout(100000);
-            httpClientPolicy.setReceiveTimeout(200000);
-            httpConduit.setClient(httpClientPolicy);
-            httpConduit.setTlsClientParameters(getTlsSettings(endpoint));
+    public boolean invokeAdministrativeFunction(MUAEntry endpoint, AdministrativeFunction function) {
+        try {
+            MultiUnitAggregator client = getEndpointConnection(endpoint);
             // client.invokeStatisticalUnit(selectedStatisticalUnit);
             log.debug("Accessing the MUA version {}", client.getVersion());
@@ -230 +178 @@
     }
 
-    public static AggregatorGraphModel updateAndinvokeStatisticalUnit(MUAEntry endpoint, StatisticalUnitInformation statisticalUnit) {
-        try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint.getServiceEndpoint());
-            factory.getServiceFactory().setDataBinding(databinding);
-            MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
-
-            org.apache.cxf.endpoint.Client cl = ClientProxy.getClient(client);
-            HTTPConduit httpConduit = (HTTPConduit) cl.getConduit();
-            HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
-            httpClientPolicy.setConnectionTimeout(100000);
-            httpClientPolicy.setReceiveTimeout(200000);
-            httpConduit.setClient(httpClientPolicy);
-            httpConduit.setTlsClientParameters(getTlsSettings(endpoint));
+    public AggregatorGraphModel updateAndinvokeStatisticalUnit(MUAEntry endpoint, StatisticalUnitInformation statisticalUnit) {
+        try {
+            MultiUnitAggregator client = getEndpointConnection(endpoint);
             log.debug("Accessing the MUA version " + client.getVersion());
             AggregatorGraphModel gmodel = client.updateAndInvokeStatisticalUnit(statisticalUnit);

raptor-web/trunk/src/main/webapp/WEB-INF/config/web-setup.xml

@@ -24 +24 @@
                 <property name="reportHandler"><ref bean="reportHandler"></ref></property>
                 <property name="webMetadata"><ref bean="webMetadata"></ref></property>
+        <constructor-arg index="0"><ref bean="serviceEndpointClient"/></constructor-arg>
         </bean>
+    
+    <bean id="serviceEndpointClient" class="uk.ac.cardiff.raptorweb.sei.ServiceEndpointClient">
+         <property name="tlsParameters">
+           <bean class="uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParameters">
+                 <property name="trustStoreLocation"><value>/Users/philsmart/Documents/Java/RaptorWorkspace/keys/mua-public.jks</value></property>
+                 <property name="trustStorePassword"><value>phil11</value></property>
+                 <property name="keyStoreLocation"><value>/Users/philsmart/Documents/Java/RaptorWorkspace/keys/raptor-ica.jks</value></property>
+                 <property name="keyStorePassword"><value>phil11</value></property>
+           </bean>
+       </property>
+    </bean>
 
         <!-- MUA Metadata -->