Changeset 1571


Ignore:
Timestamp:
03/14/14 12:04:35 (5 years ago)
Author:
philsmart
Message:
 
Location:
raptor-mua/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • raptor-mua/trunk/pom.xml

    r1549 r1571  
    4343            <groupId>uk.ac.cardiff.raptor</groupId> 
    4444            <artifactId>raptor-parse</artifactId> 
    45             <version>1.1.3-SNAPSHOT</version> 
     45            <version>1.1.3</version> 
    4646        </dependency> 
    4747 
     
    4949            <groupId>uk.ac.cardiff.raptor</groupId> 
    5050            <artifactId>raptor-client</artifactId> 
    51             <version>1.1.6-SNAPSHOT</version> 
     51            <version>1.1.7</version> 
    5252            <exclusions> 
    5353                <exclusion> 
  • raptor-mua/trunk/src/main/conf-default/attribute-association.xml

    r1530 r1571  
    1717                <!--<ref bean="ezproxyPrincipalAttributeAssociationDefinition"/>--> 
    1818                <!--< ref bean="openAthensLaResourceCategoryAttributeAssociationDefinition"/>--> 
    19                 <ref bean="shibResourceCategoryAttributeAssociationDefinition"/> <!--Do NOT disable this--> 
     19                <ref bean="resourceCategoryAttributeAssociationDefinition"/> <!--Do NOT disable this--> 
    2020             </list> 
    2121        </property> 
     
    4646 
    4747    <!-- Association policies to mark resources as internal or external. Do NOT disable this--> 
    48     <bean id="shibResourceCategoryAttributeAssociationDefinition" class="uk.ac.cardiff.raptor.event.expansion.ResourceCategoryAttributeAssociationDefinition"> 
    49         <property name="definiationName"><value>Shib Resource Category Definition</value></property> 
     48    <bean id="resourceCategoryAttributeAssociationDefinition" class="uk.ac.cardiff.raptor.event.expansion.ResourceCategoryAttributeAssociationDefinition"> 
     49        <property name="definiationName"><value>Resource Category Definition</value></property> 
    5050        <property name="dataConnection"><ref bean="dataConnectionImpl"/></property> 
    5151        <property name="enabled"><value>true</value></property> 
    5252        <property name="classToAdd"><value type="java.lang.Class">uk.ac.cardiff.model.event.Event</value></property> 
    53         <property name="associateWithClass"><value>uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value></property> 
    5453    </bean> 
    5554 
  • raptor-mua/trunk/src/main/config/attribute-association.xml

    r1549 r1571  
    1616                <ref bean="shibPrincipalAttributeAssociationDefinition"/> 
    1717                <ref bean="ezproxyPrincipalAttributeAssociationDefinition"/> 
    18                 <ref bean="shibResourceCategoryAttributeAssociationDefinition"/> 
     18                <ref bean="resourceCategoryAttributeAssociationDefinition"/> 
    1919                <ref bean="openAthensLaResourceCategoryAttributeAssociationDefinition"/> 
    2020             </list> 
     
    2323 
    2424    <!-- Association policies to mark resources as internal or external --> 
    25     <bean id="shibResourceCategoryAttributeAssociationDefinition" class="uk.ac.cardiff.raptor.event.expansion.ResourceCategoryAttributeAssociationDefinition"> 
    26         <property name="definiationName"><value>Shib Resource Category Definition</value></property> 
     25    <bean id="resourceCategoryAttributeAssociationDefinition" class="uk.ac.cardiff.raptor.event.expansion.ResourceCategoryAttributeAssociationDefinition"> 
     26        <property name="definiationName"><value>Resource Category Definition</value></property> 
    2727        <property name="dataConnection"><ref bean="dataConnectionImpl"/></property> 
    2828        <property name="enabled"><value>true</value></property> 
    29         <property name="classToAdd"><value type="java.lang.Class">uk.ac.cardiff.model.event.Event</value></property> 
    30         <property name="associateWithClass"><value>uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value></property> 
     29        <property name="classToAdd"><value type="java.lang.Class">uk.ac.cardiff.model.event.Event</value></property>        
    3130    </bean> 
    3231 
Note: See TracChangeset for help on using the changeset viewer.