Changeset 614


Ignore:
Timestamp:
03/28/11 22:15:29 (2 years ago)
Author:
philsmart
Message:
 
Location:
raptor-information-model/trunk/src
Files:
2 added
3 deleted
5 edited
1 copied
12 moved

Legend:

Unmodified
Added
Removed

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/Series.java

    r553 r614  
    2828 
    2929 
    30     public String constructComparisonAsSQL(){ 
     30    public String computeComparisonAsSQL(){ 
    3131        if (comparisonPredicate==null) return null; 
    3232 
    3333        StringBuilder sql = new StringBuilder(); 
    3434        sql.append(comparisonPredicate.getFieldName()); 
    35         if (comparisonPredicate.getCompOp()==CompOp.EQUAL)sql.append("="); 
    36         if (comparisonPredicate.getCompOp()==CompOp.NOT_EQUAL)sql.append("!="); 
     35        if (comparisonPredicate.getCompOp()==CompOp.EQUAL) 
     36            sql.append("="); 
     37        if (comparisonPredicate.getCompOp()==CompOp.NOT_EQUAL) 
     38            sql.append("!="); 
    3739        sql.append("'"+comparisonPredicate.getValue()+"'"); 
    3840 
    39         if (sql.length()==0)return null; 
     41        if (sql.length()==0) 
     42            return null; 
    4043 
    4144        return sql.toString(); 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/AuthenticationEvent.java

    r613 r614  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.model; 
     19package uk.ac.cardiff.model.event; 
     20 
    2021 
    2122/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/AuthenticationFailureEvent.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.event; 
    55 
    66/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/Event.java

    r613 r614  
    1717 * 
    1818 */ 
    19 package uk.ac.cardiff.model; 
     19package uk.ac.cardiff.model.event; 
    2020 
    2121import java.util.Date; 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/EzproxyAuthenticationEvent.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.event; 
    55 
    66/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/EzproxyProxyEvent.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.event; 
    55 
    66/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/OpenathenslaAuthenticationEvent.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.event; 
    55 
    66/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/ProxyEvent.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.event; 
    55 
    66import org.joda.time.DateTime; 
     7 
    78 
    89/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/ShibbolethIdpAuthenticationEvent.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.event; 
    55 
    66import java.util.Arrays; 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/report/AggregatorGraphModel.java

    r613 r614  
    1 package uk.ac.cardiff.model.Graph; 
     1package uk.ac.cardiff.model.report; 
    22 
    33import java.io.Serializable; 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/Capabilities.java

    r603 r614  
    1010import uk.ac.cardiff.model.ClientMetadata; 
    1111import uk.ac.cardiff.model.ServerMetadata; 
    12 import uk.ac.cardiff.model.StatisticParameters.StatisticType; 
     12import uk.ac.cardiff.model.wsmodel.StatisticParameters.StatisticType; 
    1313 
    1414/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/EventPushMessage.java

    r593 r614  
    99 
    1010import uk.ac.cardiff.model.ClientMetadata; 
    11 import uk.ac.cardiff.model.Event; 
     11import uk.ac.cardiff.model.event.Event; 
    1212 
    1313/** 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/StatisticParameters.java

    r613 r614  
    22 * 
    33 */ 
    4 package uk.ac.cardiff.model; 
     4package uk.ac.cardiff.model.wsmodel; 
    55 
    66import java.io.Serializable; 
    … …  
    1818import org.joda.time.format.DateTimeFormatter; 
    1919 
    20 import uk.ac.cardiff.model.Event; 
     20import uk.ac.cardiff.model.Presentation; 
     21import uk.ac.cardiff.model.Series; 
     22import uk.ac.cardiff.model.event.Event; 
    2123import uk.ac.cardiff.model.sql.SQLFilter; 
    22 import uk.ac.cardiff.model.wsmodel.MethodParameter; 
    2324 
    2425/** 
    … …  
    2829public class StatisticParameters implements Serializable{ 
    2930 
    30     /** 
    31      * generated serial ID 
    32      */ 
     31    /** generated serial ID  */ 
    3332    private static final long serialVersionUID = 9135524508369102248L; 
    3433 
    35     static Logger log = LoggerFactory.getLogger(StatisticParameters.class); 
    36  
    37     private static final String outputDateFormat ="dd/MM/yyyy HH:mm:ss";; 
     34    /** Class logger */ 
     35    private final Logger log = LoggerFactory.getLogger(StatisticParameters.class); 
     36 
     37    private static final String OUTPUT_DATE_FORMAT ="dd/MM/yyyy HH:mm:ss";; 
    3838 
    3939    private String unitName; 
    … …  
    138138 
    139139    public String getStartTime() { 
    140         if (startTime!=null)return startTime.toString(outputDateFormat); 
     140        if (startTime!=null)return startTime.toString(OUTPUT_DATE_FORMAT); 
    141141        return null; 
    142142    } 
    … …  
    148148 
    149149    public String getEndTime() { 
    150         if (endTime!=null)return endTime.toString(outputDateFormat); 
     150        if (endTime!=null)return endTime.toString(OUTPUT_DATE_FORMAT); 
    151151        return null; 
    152152    } 
    … …  
    184184 
    185185    public String getStartTimeAsFormattedString() { 
    186         DateTimeFormatter dtf = DateTimeFormat.forPattern(outputDateFormat); 
     186        DateTimeFormatter dtf = DateTimeFormat.forPattern(OUTPUT_DATE_FORMAT); 
    187187        if (getStartTime() != null) 
    188188            return getStartTimeAsDate().toString(dtf); 
    … …  
    192192 
    193193    public String getEndTimeAsFormattedString() { 
    194         DateTimeFormatter dtf = DateTimeFormat.forPattern(outputDateFormat); 
     194        DateTimeFormatter dtf = DateTimeFormat.forPattern(OUTPUT_DATE_FORMAT); 
    195195        if (getEndTime() != null) 
    196196            return getEndTimeAsDate().toString(dtf); 
    … …  
    230230        } else if (date.length()==19){ 
    231231            // assume outputDateFormat 
    232             String format = outputDateFormat; 
     232            String format = OUTPUT_DATE_FORMAT; 
    233233            DateTimeFormatter dtf = DateTimeFormat.forPattern(format); 
    234234            DateTime dt = dtf.parseDateTime(date.substring(0, date.length())); 

  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/StatisticalUnitInformation.java

    r524 r614  
    1212import org.joda.time.format.DateTimeFormatter; 
    1313 
    14 import uk.ac.cardiff.model.StatisticParameters; 
    1514 
    1615/** 

  • raptor-information-model/trunk/src/test/java/uk/ac/cardiff/model/ShibbolethEntryTest.java

    r612 r614  
    1212import org.junit.Test; 
    1313 
     14import uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent; 
     15 
    1416 
    1517/** 
    … …  
    2224    public void testHashCodeEqual(){ 
    2325        ShibbolethIdpAuthenticationEvent entry = new ShibbolethIdpAuthenticationEvent(); 
    24         entry.setAuthNMethod("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
     26        entry.setAuthenticationType("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
    2527        String eventTime ="20101117T184343"; 
    2628        DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss"); 
    … …  
    2830        entry.setEventTime(dt); 
    2931        entry.setMessageProfileId("urn:mace:shibboleth:2.0:profiles:saml2:sso"); 
    30         entry.setPrincipleName("scmps2"); 
     32        entry.setPrincipalName("scmps2"); 
    3133        entry.setRequestBinding("urn:mace:shibboleth:1.0:profiles:AuthnRequest"); 
    3234        entry.setReleasedAttributes(new String[]{"eduPersonScopedAffiliation","eduPersonEntitlement"}); 
    33         entry.setRequestHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
     35        entry.setServiceHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
    3436        entry.setRequestId(""); 
    3537        entry.setRequestPath(""); 
    3638        entry.setResponseBinding("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"); 
    37         entry.setServerHost("https://idp.cardiff.ac.uk/shibboleth"); 
     39        entry.setResourceHost("https://idp.cardiff.ac.uk/shibboleth"); 
    3840 
    3941 
    4042        ShibbolethIdpAuthenticationEvent equalEntry = new ShibbolethIdpAuthenticationEvent(); 
    41         equalEntry.setAuthNMethod("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
     43        equalEntry.setAuthenticationType("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
    4244        eventTime ="20101117T184343"; 
    4345        dtf = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss"); 
    … …  
    4547        equalEntry.setEventTime(dt); 
    4648        equalEntry.setMessageProfileId("urn:mace:shibboleth:2.0:profiles:saml2:sso"); 
    47         equalEntry.setPrincipleName("scmps2"); 
     49        equalEntry.setPrincipalName("scmps2"); 
    4850        equalEntry.setRequestBinding("urn:mace:shibboleth:1.0:profiles:AuthnRequest"); 
    4951        equalEntry.setReleasedAttributes(new String[]{"eduPersonScopedAffiliation","eduPersonEntitlement"}); 
    50         equalEntry.setRequestHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
     52        equalEntry.setServiceHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
    5153        equalEntry.setRequestId(""); 
    5254        equalEntry.setRequestPath(""); 
    5355        equalEntry.setResponseBinding("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"); 
    54         equalEntry.setServerHost("https://idp.cardiff.ac.uk/shibboleth"); 
     56        equalEntry.setResourceHost("https://idp.cardiff.ac.uk/shibboleth"); 
    5557 
    5658        System.out.println("testHashCodeEqual: Entry One Hash ["+entry.hashCode()+"] : Entry Two Hash ["+equalEntry.hashCode()+"] : Are Equal: "+entry.equals(equalEntry)); 
    … …  
    6769    public void testHashCodeNotEqualDate(){ 
    6870        ShibbolethIdpAuthenticationEvent entry = new ShibbolethIdpAuthenticationEvent(); 
    69         entry.setAuthNMethod("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
     71        entry.setAuthenticationType("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
    7072        String eventTime ="20101117T184343"; 
    7173        DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss"); 
    … …  
    7375        entry.setEventTime(dt); 
    7476        entry.setMessageProfileId("urn:mace:shibboleth:2.0:profiles:saml2:sso"); 
    75         entry.setPrincipleName("scmps2"); 
     77        entry.setPrincipalName("scmps2"); 
    7678        entry.setRequestBinding("urn:mace:shibboleth:1.0:profiles:AuthnRequest"); 
    7779        entry.setReleasedAttributes(new String[]{"eduPersonScopedAffiliation","eduPersonEntitlement"}); 
    78         entry.setRequestHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
     80        entry.setServiceHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
    7981        entry.setRequestId(""); 
    8082        entry.setRequestPath(""); 
    8183        entry.setResponseBinding("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"); 
    82         entry.setServerHost("https://idp.cardiff.ac.uk/shibboleth"); 
     84        entry.setResourceHost("https://idp.cardiff.ac.uk/shibboleth"); 
    8385 
    8486 
    8587        ShibbolethIdpAuthenticationEvent equalEntry = new ShibbolethIdpAuthenticationEvent(); 
    86         equalEntry.setAuthNMethod("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
     88        equalEntry.setAuthenticationType("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
    8789        eventTime ="20101117T184342"; //changed 3 to 2 at the end 
    8890        dtf = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss"); 
    … …  
    9092        equalEntry.setEventTime(dt); 
    9193        equalEntry.setMessageProfileId("urn:mace:shibboleth:2.0:profiles:saml2:sso"); 
    92         equalEntry.setPrincipleName("scmps2"); 
     94        equalEntry.setPrincipalName("scmps2"); 
    9395        equalEntry.setRequestBinding("urn:mace:shibboleth:1.0:profiles:AuthnRequest"); 
    9496        equalEntry.setReleasedAttributes(new String[]{"eduPersonScopedAffiliation","eduPersonEntitlement"}); 
    95         equalEntry.setRequestHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
     97        equalEntry.setServiceHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
    9698        equalEntry.setRequestId(""); 
    9799        equalEntry.setRequestPath(""); 
    98100        equalEntry.setResponseBinding("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"); 
    99         equalEntry.setServerHost("https://idp.cardiff.ac.uk/shibboleth"); 
     101        equalEntry.setResourceHost("https://idp.cardiff.ac.uk/shibboleth"); 
    100102 
    101103        System.out.println("testHashCodeNotEqualDate: Entry One Hash ["+entry.hashCode()+"] : Entry Two Hash ["+equalEntry.hashCode()+"] : Are Equal: "+entry.equals(equalEntry)); 
    … …  
    112114    public void testHashCodeNotEqualReleasedAttributes(){ 
    113115        ShibbolethIdpAuthenticationEvent entry = new ShibbolethIdpAuthenticationEvent(); 
    114         entry.setAuthNMethod("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
     116        entry.setAuthenticationType("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
    115117        String eventTime ="20101117T184343"; 
    116118        DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss"); 
    … …  
    118120        entry.setEventTime(dt); 
    119121        entry.setMessageProfileId("urn:mace:shibboleth:2.0:profiles:saml2:sso"); 
    120         entry.setPrincipleName("scmps2"); 
     122        entry.setPrincipalName("scmps2"); 
    121123        entry.setRequestBinding("urn:mace:shibboleth:1.0:profiles:AuthnRequest"); 
    122124        entry.setReleasedAttributes(new String[]{"eduPersonScopedAffiliation","eduPersonEntitlement"}); 
    123         entry.setRequestHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
     125        entry.setServiceHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
    124126        entry.setRequestId(""); 
    125127        entry.setRequestPath(""); 
    126128        entry.setResponseBinding("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"); 
    127         entry.setServerHost("https://idp.cardiff.ac.uk/shibboleth"); 
     129        entry.setResourceHost("https://idp.cardiff.ac.uk/shibboleth"); 
    128130 
    129131 
    130132        ShibbolethIdpAuthenticationEvent equalEntry = new ShibbolethIdpAuthenticationEvent(); 
    131         equalEntry.setAuthNMethod("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
     133        equalEntry.setAuthenticationType("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"); 
    132134        eventTime ="20101117T184343"; 
    133135        dtf = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss"); 
    … …  
    135137        equalEntry.setEventTime(dt); 
    136138        equalEntry.setMessageProfileId("urn:mace:shibboleth:2.0:profiles:saml2:sso"); 
    137         equalEntry.setPrincipleName("scmps2"); 
     139        equalEntry.setPrincipalName("scmps2"); 
    138140        equalEntry.setRequestBinding("urn:mace:shibboleth:1.0:profiles:AuthnRequest"); 
    139141        equalEntry.setReleasedAttributes(new String[]{"eduPersonScopedAffiliation"}); //removed eduPersonEntitlement 
    140         equalEntry.setRequestHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
     142        equalEntry.setServiceHost("https://abc.cardiff.ac.uk/sp/shibboleth"); 
    141143        equalEntry.setRequestId(""); 
    142144        equalEntry.setRequestPath(""); 
    143145        equalEntry.setResponseBinding("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"); 
    144         equalEntry.setServerHost("https://idp.cardiff.ac.uk/shibboleth"); 
     146        equalEntry.setResourceHost("https://idp.cardiff.ac.uk/shibboleth"); 
    145147 
    146148        System.out.println("testHashCodeNotEqualReleasedAttributes: Entry One Hash ["+entry.hashCode()+"] : Entry Two Hash ["+equalEntry.hashCode()+"] : Are Equal: "+entry.equals(equalEntry)); 
Note: See TracChangeset for help on using the changeset viewer.