Changeset 605

Timestamp:

03/27/11 23:42:08 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor

Files:

• attribute/filtering/AttrributeFilterEngine.java (moved) (moved from raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/attribute/filtering/AtrributeFilterEngine.java) (1 diff)
• registry/EventReleaseEngine.java (modified) (4 diffs)
• remoting/client/impl/EventReleaseClientImpl.java (modified) (1 diff)
• remoting/client/sei/impl/CxfServiceEndpointInterface.java (moved) (moved from raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/CxfServiceEndpointImpl.java) (1 diff)

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/attribute/filtering/AttrributeFilterEngine.java

@@ -36 +36 @@
  * 
  */
-public class AtrributeFilterEngine {
+public class AttrributeFilterEngine {
 
         /* class logger. */
-        private final Logger log = LoggerFactory.getLogger(AtrributeFilterEngine.class);
+        private final Logger log = LoggerFactory.getLogger(AttrributeFilterEngine.class);
 
         /**

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/registry/EventReleaseEngine.java

@@ -24 +24 @@
 import java.util.Set;
 
-import uk.ac.cardiff.raptor.attribute.filtering.AtrributeFilterEngine;
+import uk.ac.cardiff.raptor.attribute.filtering.AttrributeFilterEngine;
 import uk.ac.cardiff.raptor.remoting.client.sei.ServiceEndpointInterface;
 
@@ -40 +40 @@
 public class EventReleaseEngine {
 
-        private AtrributeFilterEngine attributeFilterEngine;
+        private AttrributeFilterEngine attributeFilterEngine;
         private ServiceEndpointInterface serviceEndpointInterface;
 
@@ -64 +64 @@
                         if (shouldRelease) {
                                 log.debug("Pushing {} entries to the Endpoint [{}]", filteredEntries.size(),endpoint.getServiceEndpoint());
-                                boolean releaseSuccess = serviceEndpointInterface.sendEvents(pushMessage,endpoint.getServiceEndpoint());
+                                boolean releaseSuccess = getServiceEndpointInterface().sendEvents(pushMessage,endpoint.getServiceEndpoint());
                                 log.debug("Release to [{}] succeeded {}", endpoint.getServiceEndpoint(), releaseSuccess);
                                 if (releaseSuccess == false)
@@ -112 +112 @@
         }
 
-        public void setAttributeFilterEngine(AtrributeFilterEngine attributeFilterEngine) {
+        public void setAttributeFilterEngine(AttrributeFilterEngine attributeFilterEngine) {
                 this.attributeFilterEngine = attributeFilterEngine;
         }
 
-        public AtrributeFilterEngine getAttributeFilterEngine() {
+        public AttrributeFilterEngine getAttributeFilterEngine() {
                 return attributeFilterEngine;
         }
 
+        public void setServiceEndpointInterface(ServiceEndpointInterface serviceEndpointInterface) {
+                this.serviceEndpointInterface = serviceEndpointInterface;
+        }
+
+        public ServiceEndpointInterface getServiceEndpointInterface() {
+                return serviceEndpointInterface;
+        }
+
 }

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/impl/EventReleaseClientImpl.java

@@ -23 +23 @@
         @Override
         public boolean release(List<Event> events, ClientMetadata clientMetadata) throws ReleaseFailureException{
-                
-                eventReleaseEngine.release(endpointRegistry, events, clientMetadata);
-                
-                return true;
+                boolean success = eventReleaseEngine.release(endpointRegistry, events, clientMetadata);         
+                return success;
                 
         }

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/CxfServiceEndpointInterface.java

@@ -19 +19 @@
 import uk.ac.cardiff.raptor.remoting.client.sei.ServiceEndpointInterface;
 import uk.ac.cardiff.sei.MultiUnitAggregator;
-import uk.ac.cardiff.sei.UnitAggregator;
 
-public class CxfServiceEndpointImpl implements ServiceEndpointInterface {
-        
+public class CxfServiceEndpointInterface implements ServiceEndpointInterface {
+
         /** Class logger */
-        private final Logger log = LoggerFactory.getLogger(CxfServiceEndpointImpl.class);
+        private final Logger log = LoggerFactory.getLogger(CxfServiceEndpointInterface.class);
 
         @Override
         public boolean sendEvents(EventPushMessage pushed, String endpointURL) {
                 try {
-                    ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-                    factory.setServiceClass(UnitAggregator.class);
-                    AegisDatabinding databinding = new AegisDatabinding();
+                        ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
+                        factory.setServiceClass(MultiUnitAggregator.class);
+                        AegisDatabinding databinding = new AegisDatabinding();
 
-                    org.apache.cxf.aegis.AegisContext context = new org.apache.cxf.aegis.AegisContext();
-                    context.setWriteXsiTypes(true);
+                        org.apache.cxf.aegis.AegisContext context = new org.apache.cxf.aegis.AegisContext();
+                        context.setWriteXsiTypes(true);
 
-                    Set<Class<?>> rootClasses = new HashSet<Class<?>>();
+                        Set<Class<?>> rootClasses = new HashSet<Class<?>>();
 
-                    Set<String> overrides = new HashSet<String>();
-                    overrides.add(ShibbolethEntry.class.getName());
-                    overrides.add(AuthenticationEntry.class.getName());
-                    overrides.add(UsageEntry.class.getName());
-                    databinding.setOverrideTypes(overrides);
+                        Set<String> overrides = new HashSet<String>();
+                        overrides.add(ShibbolethEntry.class.getName());
+                        overrides.add(AuthenticationEntry.class.getName());
+                        overrides.add(UsageEntry.class.getName());
+                        databinding.setOverrideTypes(overrides);
 
-                    for (String typeName : overrides) {
-                        Class c = null;
-                        try {
-                            c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class);
-                        } catch (ClassNotFoundException e) {
-                            throw new DatabindingException("Could not find override type class: " + typeName, e);
+                        for (String typeName : overrides) {
+                                Class c = null;
+                                try {
+                                        c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class);
+                                } catch (ClassNotFoundException e) {
+                                        throw new DatabindingException("Could not find override type class: " + typeName, e);
+                                }
+
+                                rootClasses.add(c);
                         }
 
-                        rootClasses.add(c);
-                    }
+                        context.setRootClasses(rootClasses);
+                        databinding.setAegisContext(context);
 
-                    context.setRootClasses(rootClasses);
-                    databinding.setAegisContext(context);
+                        factory.setAddress(endpointURL);
+                        factory.getServiceFactory().setDataBinding(databinding);
 
-                    factory.setAddress(endpointURL);
-                    factory.getServiceFactory().setDataBinding(databinding);
-
-                    MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
-                    log.debug("Accessing the UA version " + client.getVersion());
-                    Set<ShibbolethEntry> newEntries = new LinkedHashSet<ShibbolethEntry>();
-                    client.addAuthentications(pushed);
-                    log.debug("Sent {} authentications", pushed.getEvents().size());
-                    return true;
+                        MultiUnitAggregator client = (MultiUnitAggregator) factory.create();
+                        log.debug("Accessing the endpoint version " + client.getVersion());
+                        Set<ShibbolethEntry> newEntries = new LinkedHashSet<ShibbolethEntry>();
+                        client.addAuthentications(pushed);
+                        log.debug("Sent {} events", pushed.getEvents().size());
+                        return true;
                 } catch (Exception e) {
-                    log.error("Could not send to endpoint [{}] ", endpointURL, e);
-                    // e.printStackTrace();
-                    return false;
+                        log.error("Could not send to endpoint [{}] ", endpointURL, e);
+                        return false;
                 }
 
-            }
+        }
 }
-
-