Changeset 642

Timestamp:

04/05/11 18:56:17 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-web/trunk/src/main

Files:

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

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

@@ -71 +71 @@
         log.info("Attaching {} and retrieving abilities",entry);
         this.attachedMUA = entry;
-        currentlyAttachedCapabilities = ServiceEndpointClient.discoverMUACapabilities(attachedMUA.getServiceEndpoint());
+        currentlyAttachedCapabilities = ServiceEndpointClient.discoverMUACapabilities(attachedMUA);
     }
 
@@ -103 +103 @@
                 }
             }
-            Capabilities capabilities = ServiceEndpointClient.discoverMUACapabilities(attached.getServiceEndpoint());
+            Capabilities capabilities = ServiceEndpointClient.discoverMUACapabilities(attached);
             if (capabilities!=null && !capabilities.isError()){
                 log.debug("Has retrieved {} statistics", capabilities.getStatisticalServices().size());
@@ -122 +122 @@
      */
     public Capabilities getCapabilities(MUAEntry selectedEndpoint) {
-        return ServiceEndpointClient.discoverMUACapabilities(selectedEndpoint.getServiceEndpoint());
+        return ServiceEndpointClient.discoverMUACapabilities(selectedEndpoint);
     }
 
@@ -135 +135 @@
 
     public AggregatorGraphModel invokeStatisticalUnit(StatisticalUnitInformation selectedStatisticalUnit) {
-        AggregatorGraphModel gmodel = ServiceEndpointClient.invokeStatisticalUnit(getCurrentlyAttached().getServiceEndpoint(), selectedStatisticalUnit.getStatisticParameters().getUnitName());
+        AggregatorGraphModel gmodel = ServiceEndpointClient.invokeStatisticalUnit(getCurrentlyAttached(), selectedStatisticalUnit.getStatisticParameters().getUnitName());
         return gmodel;
 
@@ -141 +141 @@
 
     public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation selectedStatisticalUnit) {
-        AggregatorGraphModel gmodel = ServiceEndpointClient.updateAndinvokeStatisticalUnit(getCurrentlyAttached().getServiceEndpoint(), selectedStatisticalUnit);
+        AggregatorGraphModel gmodel = ServiceEndpointClient.updateAndinvokeStatisticalUnit(getCurrentlyAttached(), selectedStatisticalUnit);
         return gmodel;
 
@@ -173 +173 @@
         log.debug("Updating statistic {} ",model.getSelectedStatisticalUnit().getStatisticalUnitInformation().getStatisticParameters().getUnitName());
         log.debug("Has startDate {}",model.getSelectedStatisticalUnit().getStatisticalUnitInformation().getStatisticParameters().getStartTimeAsDate());
-        ServiceEndpointClient.updateStatisticalUnit(attachedMUA.getServiceEndpoint(),model.getSelectedStatisticalUnit().getStatisticalUnitInformation());
+        ServiceEndpointClient.updateStatisticalUnit(attachedMUA,model.getSelectedStatisticalUnit().getStatisticalUnitInformation());
     }
 
@@ -200 +200 @@
         else
             function.setRequester("UNKNOWN");
-        boolean success = ServiceEndpointClient.invokeAdministrativeFunction(attachedMUA.getServiceEndpoint(), function);
+        boolean success = ServiceEndpointClient.invokeAdministrativeFunction(attachedMUA, function);
         log.debug("Removal successfull {}",success);
         if (!success) model.setProcessingResult("ERROR: Entries did not remove");

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/MUAEntry.java

@@ -10 +10 @@
  *
  */
-public class MUAEntry implements Serializable{
+public class MUAEntry implements Serializable {
 
-        private String serviceEndpoint;
-        private boolean isAttached;
+    private String serviceEndpoint;
+    private boolean isAttached;
 
-        public void setServiceEndpoint(String serviceEndpoint) {
-                this.serviceEndpoint = serviceEndpoint;
-        }
+    /** They public key used to encrypt messages sent to this endpoint */
+    private String publicKey;
 
-        public String getServiceEndpoint() {
-                return serviceEndpoint;
-        }
+    /** The password used to access the public key */
+    private String publicKeyPassword;
 
-        public void setIsAttached(boolean isAttached) {
-                this.isAttached = isAttached;
-        }
+    public void setServiceEndpoint(String serviceEndpoint) {
+        this.serviceEndpoint = serviceEndpoint;
+    }
 
-        public boolean getIsAttached() {
-                return isAttached;
-        }
+    public String getServiceEndpoint() {
+        return serviceEndpoint;
+    }
 
-        public String toString(){
-            StringBuilder result = new StringBuilder();
-            result.append(this.getClass().getName());
-            result.append("Object{");
-            result.append(serviceEndpoint);
-            result.append("}");
-            return result.toString();
-        }
+    public void setIsAttached(boolean isAttached) {
+        this.isAttached = isAttached;
+    }
+
+    public boolean getIsAttached() {
+        return isAttached;
+    }
+
+    public String toString() {
+        StringBuilder result = new StringBuilder();
+        result.append(this.getClass().getName());
+        result.append("Object{");
+        result.append(serviceEndpoint);
+        result.append("}");
+        return result.toString();
+    }
+
+    /**
+     * @param publicKey the publicKey to set
+     */
+    public void setPublicKey(String publicKey) {
+        this.publicKey = publicKey;
+    }
+
+    /**
+     * @return the publicKey
+     */
+    public String getPublicKey() {
+        return publicKey;
+    }
+
+    /**
+     * @param publicKeyPassword the publicKeyPassword to set
+     */
+    public void setPublicKeyPassword(String publicKeyPassword) {
+        this.publicKeyPassword = publicKeyPassword;
+    }
+
+    /**
+     * @return the publicKeyPassword
+     */
+    public String getPublicKeyPassword() {
+        return publicKeyPassword;
+    }
 
 }

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

@@ -1 +1 @@
 package uk.ac.cardiff.raptorweb.sei;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
 import org.apache.cxf.aegis.databinding.AegisDatabinding;
 import org.apache.cxf.binding.soap.SoapFault;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
@@ -19 +31 @@
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 import uk.ac.cardiff.raptor.remoting.server.sei.MultiUnitAggregator;
-
+import uk.ac.cardiff.raptorweb.model.MUAEntry;
 
 /**
@@ -28 +40 @@
  */
 public class ServiceEndpointClient {
-    static Logger log = LoggerFactory.getLogger(ServiceEndpointClient.class);
-
-    /**
-     * 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.
+
+    /** Class logger */
+    private static final Logger log = LoggerFactory.getLogger(ServiceEndpointClient.class);
+
+    /**
+     * 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(String endpoint) {
+    public static Capabilities discoverMUACapabilities(MUAEntry endpoint) {
         Capabilities capabilities = null;
         try {
@@ -45 +57 @@
             factory.setServiceClass(MultiUnitAggregator.class);
             AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint);
+            factory.setAddress(endpoint.getServiceEndpoint());
             factory.getServiceFactory().setDataBinding(databinding);
 
@@ -55 +67 @@
             httpClientPolicy.setReceiveTimeout(2000);
             httpConduit.setClient(httpClientPolicy);
+            httpConduit.setTlsClientParameters(getTlsSettings(endpoint));
             log.debug("Accessing the MUA version " + client.getVersion());
             capabilities = client.getCapabilities();
-            log.debug("Retrieved capabilities from the MUA [{}]",endpoint);
-        }
-        catch (SoapFault e) {
-            log.error("Problem trying to retrieving capabilities from MUA [{}] -> {}", new Object[]{endpoint, e.getMessage()});
-            capabilities = new Capabilities();
-            capabilities.setError(true);
-            capabilities.setErrorMessage(e.getMessage());
-           // e.printStackTrace();
-        }catch (Exception e) {
-            log.error("Problem trying to retrieving capabilities from MUA [{}] -> {}", new Object[]{endpoint, e.getMessage()});
-            capabilities = new Capabilities();
-            capabilities.setError(true);
-            capabilities.setErrorMessage(e.getMessage());
-            //e.printStackTrace();
+            log.debug("Retrieved capabilities from the MUA [{}]", endpoint);
+        } catch (SoapFault e) {
+            log.error("Problem trying to retrieving capabilities from MUA [{}] -> {}", new Object[] { endpoint, e.getMessage() });
+            capabilities = new Capabilities();
+            capabilities.setError(true);
+            capabilities.setErrorMessage(e.getMessage());
+            // e.printStackTrace();
+        } catch (Exception e) {
+            log.error("Problem trying to retrieving capabilities from MUA [{}] -> {}", new Object[] { endpoint, e.getMessage() });
+            capabilities = new Capabilities();
+            capabilities.setError(true);
+            capabilities.setErrorMessage(e.getMessage());
+            // e.printStackTrace();
         }
         return capabilities;
@@ -77 +89 @@
 
     /**
-     * This method sends a <code>StatisticalUnitInformaiton</code> instance to the MultiUnitAggregator <code>endpoint</code>
-     * The <code>StatisicalUnitInformation</code> instance encapsulates the parameters for a single statistical unit.
-     * Allowing the values to be sent back and changed on the MultiUnitAggregator
+     * This method sends a <code>StatisticalUnitInformaiton</code> instance to the MultiUnitAggregator <code>endpoint</code> The
+     * <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
@@ -85 +97 @@
      * @return
      */
-    public static Capabilities updateStatisticalUnit(String endpoint, StatisticalUnitInformation statisticalUnitInformation) {
+    public static Capabilities updateStatisticalUnit(MUAEntry endpoint, StatisticalUnitInformation statisticalUnitInformation) {
         Capabilities capabilities = null;
         try {
@@ -91 +103 @@
             factory.setServiceClass(MultiUnitAggregator.class);
             AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint);
-            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);
-
+            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));
             log.debug("Accessing the MUA version {}", client.getVersion());
             log.debug("Updating statistic {} from the MUA {}", statisticalUnitInformation.getStatisticParameters().getUnitName(), endpoint);
@@ -107 +119 @@
 
         } catch (SoapFault e) {
-            log.error("Problem trying to update statistical unit {} on MUA [{}] -> {}", new Object[]{statisticalUnitInformation.getStatisticParameters().getUnitName(), endpoint, e.getMessage()});
-            capabilities = new Capabilities();
-            capabilities.setError(true);
-            capabilities.setErrorMessage(e.getMessage());
-           // e.printStackTrace();
-        }catch (Exception e) {
-            log.error("Problem trying to update statistical unit {} on MUA [{}] -> {}", new Object[]{statisticalUnitInformation.getStatisticParameters().getUnitName(), endpoint, e.getMessage()});
-            capabilities = new Capabilities();
-            capabilities.setError(true);
-            capabilities.setErrorMessage(e.getMessage());
-           // e.printStackTrace();
+            log.error("Problem trying to update statistical unit {} on MUA [{}] -> {}", new Object[] { statisticalUnitInformation.getStatisticParameters().getUnitName(), endpoint, e.getMessage() });
+            capabilities = new Capabilities();
+            capabilities.setError(true);
+            capabilities.setErrorMessage(e.getMessage());
+            // e.printStackTrace();
+        } catch (Exception e) {
+            log.error("Problem trying to update statistical unit {} on MUA [{}] -> {}", new Object[] { statisticalUnitInformation.getStatisticParameters().getUnitName(), endpoint, e.getMessage() });
+            capabilities = new Capabilities();
+            capabilities.setError(true);
+            capabilities.setErrorMessage(e.getMessage());
+            // e.printStackTrace();
         }
         return capabilities;
@@ -123 +135 @@
     }
 
-
     /**
      * @param selectedStatisticalUnit
      */
-    public static AggregatorGraphModel invokeStatisticalUnit(String endpoint, String selectedStatisticalUnit) {
-        try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint);
-            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);
-
+    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));
             log.debug("Accessing the MUA version " + client.getVersion());
             AggregatorGraphModel gmodel = client.invokeStatisticalUnit(selectedStatisticalUnit);
@@ -148 +159 @@
             return gmodel;
         } catch (SoapFault e) {
-            log.error("Problem trying to invoke statistical unit {} on MUA [{}] -> {}", new Object[]{selectedStatisticalUnit, endpoint, e.getMessage()});
-        } catch (Exception e){
-           //catching general errors, e.g. no connection to endpoint
-            log.error("Problem trying to invoke statistical unit {} on MUA [{}] -> {}", new Object[]{selectedStatisticalUnit, endpoint, e.getMessage()});
+            log.error("Problem trying to invoke statistical unit {} on MUA [{}] -> {}", new Object[] { selectedStatisticalUnit, endpoint, e.getMessage() });
+        } catch (Exception e) {
+            // catching general errors, e.g. no connection to endpoint
+            log.error("Problem trying to invoke statistical unit {} on MUA [{}] -> {}", new Object[] { selectedStatisticalUnit, endpoint, e.getMessage() });
         }
 
@@ -161 +172 @@
      * @param removeall
      */
-    public static boolean invokeAdministrativeFunction(String endpoint, AdministrativeFunction function) {
-        try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(endpoint);
-            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);
-
+    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));
             // client.invokeStatisticalUnit(selectedStatisticalUnit);
-            log.debug("Accessing the MUA version {}",client.getVersion());
+            log.debug("Accessing the MUA version {}", client.getVersion());
             boolean success = client.performAdministrativeFunction(function);
 
             return success;
-        }catch (SoapFault e) {
-            log.error("Problem trying to perform administrative function {} on MUA {} -> {}  ", new Object[]{function.getAdministrativeFunction().toString(), endpoint, e.getMessage()});
+        } catch (SoapFault e) {
+            log.error("Problem trying to perform administrative function {} on MUA {} -> {}  ", new Object[] { function.getAdministrativeFunction().toString(), endpoint, e.getMessage() });
             return false;
-        } catch (Exception e){
-            log.error("Problem trying to perform administrative function {} on MUA {} -> {} ", new Object[]{function.getAdministrativeFunction().toString(), endpoint, e.getMessage()});
-            log.error("Details, {}",e);
+        } catch (Exception e) {
+            log.error("Problem trying to perform administrative function {} on MUA {} -> {} ", new Object[] { function.getAdministrativeFunction().toString(), endpoint, e.getMessage() });
+            log.error("Details, {}", e);
             return false;
         }
 
-
-    }
-
-    public static AggregatorGraphModel updateAndinvokeStatisticalUnit(String serviceEndpoint, StatisticalUnitInformation statisticalUnit) {
-        try {
-            ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-            factory.setServiceClass(MultiUnitAggregator.class);
-            AegisDatabinding databinding = new AegisDatabinding();
-            factory.setAddress(serviceEndpoint);
-            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);
-
+    }
+
+    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));
             log.debug("Accessing the MUA version " + client.getVersion());
             AggregatorGraphModel gmodel = client.updateAndInvokeStatisticalUnit(statisticalUnit);
-            log.debug("Retrieved Graph Model from the MUA [" + serviceEndpoint + "]");
+            log.debug("Retrieved Graph Model from the MUA [" + endpoint.getServiceEndpoint() + "]");
             return gmodel;
         } catch (SoapFault e) {
-            log.error("Problem trying to update and invoke statistical unit {} on MUA with error {}",statisticalUnit.getStatisticParameters().getUnitName(), e.getMessage());
-        }
-        catch (Exception e){
+            log.error("Problem trying to update and invoke statistical unit {} on MUA with error {}", statisticalUnit.getStatisticParameters().getUnitName(), e.getMessage());
+        } catch (Exception e) {
             log.error("Problem trying to update and invoke statistical unit {} on MUA {} ", statisticalUnit.getStatisticParameters().getUnitName(), e.getMessage());
         }
@@ -223 +232 @@
     }
 
+    private static TLSClientParameters getTlsSettings(MUAEntry endpoint) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException {
+
+        TLSClientParameters tls = new TLSClientParameters();
+        tls.setDisableCNCheck(true);// disable URL and CN on cert match
+        KeyStore keyStore = KeyStore.getInstance("JKS");
+        File truststore = new File(endpoint.getPublicKey());
+        keyStore.load(new FileInputStream(truststore), endpoint.getPublicKeyPassword().toCharArray());
+        TrustManagerFactory trustFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustFactory.init(keyStore);
+        TrustManager[] tm = trustFactory.getTrustManagers();
+        tls.setTrustManagers(tm);
+
+        return tls;
+
+    }
+
 }

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

@@ -11 +11 @@
                         <list>
                                 <bean id="cardiffShibMUA" class="uk.ac.cardiff.raptorweb.model.MUAEntry">
-                                        <property name="serviceEndpoint"><value>http://localhost:8080/MUA/MultiUnitAggregator</value></property>
+                                        <property name="serviceEndpoint"><value>https://localhost:8443/MUA/MultiUnitAggregator</value></property>
                                         <property name="isAttached" value="true"></property>
+                                        <property name="publicKey"><value>/Users/philsmart/Documents/Java/RaptorWorkspace/keys/raptor.jks</value></property>
+                    <property name="publicKeyPassword"><value>phil11</value></property>
                                 </bean>
                         </list>