Changeset 704


Ignore:
Timestamp:
04/27/11 18:33:43 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-mua/trunk/src/main/config
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • raptor-mua/trunk/src/main/config/attribute-association.xml

    r702 r704  
    1818    <!-- data connector --> 
    1919    <bean id="ldapDataConnector" class="uk.ac.cardiff.raptor.event.expansion.connector.LdapDataConnector"> 
    20         <constructor-arg index="0"><value>zidman12.cf.ac.uk</value></constructor-arg> 
    21          <constructor-arg index="1"><value>o=people</value></constructor-arg> 
    22          <constructor-arg index="2"><value>false</value></constructor-arg> 
    23          <constructor-arg index="3"><value>10</value></constructor-arg> 
    24          <constructor-arg index="4"><value>10</value></constructor-arg> 
     20         <property name="poolMaxIdle"><value>10</value></property> 
     21         <property name="poolInitIdleCapacity"><value>10</value></property> 
     22         <property name="ldapUrl"><value>zidman12.cf.ac.uk</value></property> 
     23         <property name="ldapBaseDn"><value>o=people</value></property> 
     24         <property name="startTls"><value>false</value></property> 
    2525         <property name="principal"><value>cn=srvreg1,o=users</value></property> 
    2626         <property name="principalCredential"><value>1hk27be</value></property> 
    2727         <property name="cacheResults"><value>false</value></property> 
     28        <!-- add the filter here, where [principal] is replaced by the principal extracted per event --> 
     29         <property name="searchFilterTemplate"><value>cn=[principal]</value></property> 
    2830    </bean> 
    2931 
    30     <!-- Properties to set --> 
     32    <!-- Properties to set. PrincipalInformation only has the attributes [school, affiliation] --> 
    3133    <bean id="attributeAssociationDefinition" class="uk.ac.cardiff.raptor.event.expansion.AttributeAssociationDefinition"> 
    3234        <property name="subjectPrincipalField"><value>principalName</value></property> 
     35        <property name="internalModelClass"><value type="java.lang.Class">uk.ac.cardiff.model.event.auxiliary.PrincipalInformation</value></property> 
     36        <property name="lookupAttributes"> 
     37            <list> 
     38                <bean class="uk.ac.cardiff.raptor.event.expansion.AttributeLookup"> 
     39                    <property name="sourceAttributeName"><value>CardiffIDManAffiliation</value></property> 
     40                    <property name="internalAttributeName"><value>affiliation</value></property> 
     41                </bean> 
     42                 <bean class="uk.ac.cardiff.raptor.event.expansion.AttributeLookup"> 
     43                    <property name="sourceAttributeName"><value>CardiffIDManDept</value></property> 
     44                    <property name="internalAttributeName"><value>school</value></property> 
     45                </bean> 
     46            </list> 
     47        </property> 
    3348    </bean> 
    3449 
  • raptor-mua/trunk/src/main/config/dao-beans.xml

    r697 r704  
    2626                                <prop key="hibernate.dialect"> org.hibernate.dialect.PostgreSQLDialect</prop> <!-- database type --> 
    2727                                <prop key="hibernate.show_sql">false</prop>  <!-- outputs the SQL queries used to the standard logger --> 
    28                                 <prop key="hibernate.hbm2ddl.auto">update</prop> <!-- update changes the db if mapping changes, creates the db if none exists, 
     28                                <prop key="hibernate.hbm2ddl.auto">create</prop> <!-- update changes the db if mapping changes, creates the db if none exists, 
    2929                                        in production do not use any of these --> 
    30                                 <!-- Generate hibernate statistics 
    31                                 <prop key="hibernate.generate_statistics">true</prop> --> 
    3230                        </props> 
    3331                </property> 
     
    4038        </bean> 
    4139 
    42         <!-- allows MBEAN stats pass out 
    43  
    44         <bean id="jmxExporter" class="org.springframework.jmx.export.MBeanExporter"> 
    45                 <property name="beans"> 
    46                         <map> 
    47                                 <entry key="Hibernate:name=statistics"> 
    48                                         <ref local="statisticsBean" /> 
    49                                 </entry> 
    50                         </map> 
    51                 </property> 
    52         </bean> 
    53  
    54  
    55         <bean id="statisticsBean" class="org.hibernate.jmx.StatisticsService"> 
    56                 <property name="statisticsEnabled"> 
    57                         <value>true</value> 
    58                 </property> 
    59                 <property name="sessionFactory"> 
    60                         <ref local="muaSessionFactory" /> 
    61                 </property> 
    62         </bean> 
    63         --> 
    6440 
    6541        <bean id="muac3p0DataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" 
Note: See TracChangeset for help on using the changeset viewer.