Changeset 658

Timestamp:

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

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk/src/main

Files:

• config/event-release.xml (modified) (2 diffs)
• config/mua-core.xml (modified) (1 diff)
• config/mua-registry.xml (deleted)
• java/uk/ac/cardiff/raptormua/engine/MUAEngine.java (modified) (1 diff)
• java/uk/ac/cardiff/raptormua/runtimeutils/ReflectionHelper.java (modified) (2 diffs)
• webapp/WEB-INF/dao-beans.xml (deleted)
• webapp/WEB-INF/event-release.xml (deleted)
• webapp/WEB-INF/mua-core.xml (deleted)
• webapp/WEB-INF/mua-registry.xml (deleted)
• webapp/WEB-INF/statistical-units.xml (deleted)
• webapp/WEB-INF/users.xml (deleted)
• webapp/WEB-INF/web.xml (deleted)

raptor-mua/trunk/src/main/config/event-release.xml

@@ -31 +31 @@
                                 <bean id="cardiffRaptorMUA" class="uk.ac.cardiff.raptor.registry.Endpoint">
                                         <property name="serviceEndpoint"><value>http://ipower.insrv.cf.ac.uk:8080/MUA/MultiUnitAggregator</value></property>
-                                        <property name="pushPolicy"><ref bean="genericPushPolicy"></ref></property>
+                                        <property name="pushPolicies">
+                        <list>
+                            <ref bean="entryNoPushPolicy"></ref>
+                        </list>
+                    </property>
                                         <property name="attributeFilterPolicy"><ref bean="removePrincipleFilterPolicy"></ref></property>
                                 </bean>
@@ -40 +44 @@
         <!--  policy for release of events -->
 
-        <bean id="genericPushPolicy" class="uk.ac.cardiff.raptor.remoting.policy.PushPolicy">
+        <bean id="entryNoPushPolicy" class="uk.ac.cardiff.raptor.remoting.policy.EntryNoPushPolicy">
                 <property name="pushOnOrAfterNoEntries"><value>10</value></property>
         </bean>

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

@@ -125 +125 @@
 
           <import resource="dao-beans.xml"/>
-          <import resource="mua-registry.xml" />
           <import resource="statistical-units.xml" />
           <import resource="event-release.xml"/>

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

@@ -100 +100 @@
                 suggestionValues.setPossibleFieldNameValues(ReflectionHelper.getFieldsFromEntrySubClasses());
                 capabilities.setSuggestionValues(suggestionValues);
+                
+                log.debug("Possible values set");
 
                 ArrayList<StatisticalUnitInformation> stats = new ArrayList();
                 for (Statistic entry : su) {
+                        log.debug("Setting statistical unit information as: "+entry.getStatisticParameters().getUnitName());
                         StatisticalUnitInformation information = new StatisticalUnitInformation();
 

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

@@ -39 +39 @@
  */
 public class ReflectionHelper {
-        static Logger log = LoggerFactory.getLogger(ReflectionHelper.class);
+        
+        /** Class logger */
+        private final static Logger log = LoggerFactory.getLogger(ReflectionHelper.class);
 
         public static String determineSubclassForMethods(String methodOne, String methodTwo) {
@@ -194 +196 @@
                 }
                 name = name.replace('.', '/');
-                // Get a File object for the package
-                log.debug("package name: " + name);
+                //log.debug("package name: " + name);
                 URL url = ReflectionHelper.class.getResource(name);
-                log.debug("URL: " + url.getPath().substring(0, url.getPath().indexOf('!')));
+                //log.debug("URL: "+url);
                 if (url != null && url.getPath().contains("!"))
                         return url.getPath().substring(0, url.getPath().indexOf('!'));